diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 88b11c25c..76c662ee4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,22 +10,20 @@ jobs: # This statement avoids failures in another instance (another compiler) to cancel this run # it also prevents canceling the run using the cancel button on the github website # another form (if: success() || failure()) should allow the cancel button to work but tests with that form didnt act as expected - if: always() + if: ${{ ! cancelled() }} env: CC: mpicc FC: mpifort CXX: mpicxx CIME_MODEL: cesm CIME_DRIVER: nuopc - # Since self runners can only run one step at a time this needs statement is not required - # needs: setup runs-on: hpc-runner defaults: run: shell: bash {0} steps: - name: Run ${{ inputs.compiler }} tests - # Allows the next step to run even if this one fails + # Allows the check status step to run even if this one fails continue-on-error: true run: | pwd @@ -45,4 +43,4 @@ jobs: fi # tests pass, clean up rm -fr *.${GITHUB_RUN_ID}${{ inputs.compiler }} - exit 0 \ No newline at end of file + exit 0 diff --git a/.github/workflows/derecho.yaml b/.github/workflows/derecho.yaml index 287940bd0..2cbbbbf1e 100644 --- a/.github/workflows/derecho.yaml +++ b/.github/workflows/derecho.yaml @@ -25,6 +25,8 @@ jobs: build: strategy: + # run all matrix members even if one fails + fail-fast: false matrix: compiler: [gnu, intel, intel-oneapi, nvhpc] uses: ./.github/workflows/build.yaml diff --git a/.github/workflows/preview_namelist.yaml b/.github/workflows/preview_namelist.yaml new file mode 100644 index 000000000..c29b49fbb --- /dev/null +++ b/.github/workflows/preview_namelist.yaml @@ -0,0 +1,56 @@ +on: + push: + branches: [ master, cesm3.0-alphabranch ] + pull_request: + branches: [ master, cesm3.0-alphabranch ] + +jobs: + preview_namelists: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + # Lots of python versions, pare down if we don't support a version + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + config: + - {"compset": "BLT1850", "res": "ne30pg3_t232"} # fully coupled + - {"compset": "C_JRA", "res": "TL319_t232"} # ocean only + - {"compset": "C1850MARBL_JRA", "res": "TL319_t232"} # ocean only, with BGC + - {"compset": "DTEST", "res": "TL319_t232"} # ice only + - {"compset": "I1850Clm60SpCru", "res": "f10_f10_mg37"} # land only + - {"compset": "QPC6HIST", "res": "f09_f09_mg17"} # atm only + - {"compset": "T1850Gg", "res": "f09_g17_gris4"} # glc only + steps: + - uses: actions/checkout@v4 + + - name: Setup python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + + - name: Set up non-python environment (need xmllint and a fake ESMF make file) + run: | + git config --global user.email "testing@github.actions" + git config --global user.name "Github Actions Testing" + echo "ESMFMKFILE=$HOME/esmf.mk" >> ${GITHUB_ENV} + echo "ESMF_VERSION_MAJOR=8" > ${HOME}/esmf.mk + echo "ESMF_VERSION_MINOR=8" >> ${HOME}/esmf.mk + sudo apt-get install libxml2-utils + sudo apt-get install subversion + + - name: Checkout CESM + run: | + $GITHUB_WORKSPACE/bin/git-fleximod update + + - name: Get WW3 grid data + # WW3 data needs to be prestaged for buildnml to work correctly + run: | + svn co https://svn-ccsm-inputdata.cgd.ucar.edu/trunk/inputdata/wav/ww3 /home/runner/cesm/inputdata/wav/ww3 + + - name: Create new cases, run case.setup, and then preview namelists + run: | + cd $GITHUB_WORKSPACE/cime/scripts + ./create_newcase --run-unsupported --mach ubuntu-latest --compset ${{ matrix.config.compset }} --res ${{ matrix.config.res }} --case $GITHUB_WORKSPACE/cases/${{ matrix.config.compset }}_${{ matrix.python-version }} + cd $GITHUB_WORKSPACE/cases/${{ matrix.config.compset }}_${{ matrix.python-version }} + ./case.setup + ./preview_namelists diff --git a/.gitmodules b/.gitmodules index 40a0297a6..2943501f0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,7 +30,7 @@ path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = ccs_config_cesm1.0.12 + fxtag = ccs_config_cesm1.0.15 fxrequired = ToplevelRequired [submodule "cime"] @@ -73,7 +73,7 @@ url = https://github.com/ESCOMP/CESM_CICE fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE fxrequired = ToplevelRequired - fxtag = cesm3_cice6_5_0_14 + fxtag = cesm3_cice6_6_0_2 [submodule "mom"] path = components/mom diff --git a/ccs_config b/ccs_config index 1ebe59402..26aacc140 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 1ebe59402bc19881a6d711084e27bdbe6c69149c +Subproject commit 26aacc1403c01f44df4ab05d275c0fccd5ae3dce diff --git a/cime b/cime index 29aa60f99..85922c028 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 29aa60f999caa6c57f754ef123a4a235724777de +Subproject commit 85922c028ff8a5b9f5573888f4240cdc4b8104a3 diff --git a/components/cam b/components/cam index 47dd341f8..f429ebf6e 160000 --- a/components/cam +++ b/components/cam @@ -1 +1 @@ -Subproject commit 47dd341f83afc1e1faf28fd4cb6e463629db4c19 +Subproject commit f429ebf6eb615e0df8fab0efbc964629519195f1 diff --git a/components/cdeps b/components/cdeps index 4165d0657..0750c9175 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit 4165d0657d6f60e8dba650e9a1771a1344972b76 +Subproject commit 0750c9175395d3ba3bf8eba65703dee230d08572 diff --git a/components/cice b/components/cice index eebe30a55..604b66adc 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit eebe30a55c114ac8456774e422f721d7504911e0 +Subproject commit 604b66adc0a381000099e93429a1d6e1613eb0db diff --git a/components/cism b/components/cism index c84cc9f5b..41843ef8f 160000 --- a/components/cism +++ b/components/cism @@ -1 +1 @@ -Subproject commit c84cc9f5b3103766a35d0a7ddd5e9dbd7deae762 +Subproject commit 41843ef8fed91fcf60e2ea217c4f6f2ee5133c5d diff --git a/components/clm b/components/clm index 6d8dad82e..f437651ee 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 6d8dad82ed98a0e51e315d42991459386dc2da96 +Subproject commit f437651ee449789af9325882bb0acc09576c9411 diff --git a/components/cmeps b/components/cmeps index 959e9a0b1..4b636c6f7 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 959e9a0b1aa3c602de4674f0553875efa8f6c1b6 +Subproject commit 4b636c6f794ca02d854d15c620e26644751b449b diff --git a/components/mizuroute b/components/mizuroute index 2ff305a02..362bee329 160000 --- a/components/mizuroute +++ b/components/mizuroute @@ -1 +1 @@ -Subproject commit 2ff305a0292cb06789de6cfea7ad3cc0d6173493 +Subproject commit 362bee329bd6bf1fd45c8f36e006b9c4294bb8ca diff --git a/components/mosart b/components/mosart index e2ffe0000..a246344e9 160000 --- a/components/mosart +++ b/components/mosart @@ -1 +1 @@ -Subproject commit e2ffe00004cc416cfc8bcfae2a949474075c1d1f +Subproject commit a246344e9b28e4bb42313749094fa20d45e2b212 diff --git a/components/rtm b/components/rtm index b3dfcfbba..a2cd8249e 160000 --- a/components/rtm +++ b/components/rtm @@ -1 +1 @@ -Subproject commit b3dfcfbba58c151ac5a6ab513b3515ef3deff798 +Subproject commit a2cd8249e40e8c61d68fe13145c4cf9d5e098f68 diff --git a/share b/share index 3dd7edb12..c5e7603c2 160000 --- a/share +++ b/share @@ -1 +1 @@ -Subproject commit 3dd7edb12d3fc109914f922f3131711cf0d7fbd4 +Subproject commit c5e7603c29ea5e2fe93ca16d88bc9c7f16175bcd diff --git a/tools/CUPiD b/tools/CUPiD index 5cad93329..04ba5ebc2 160000 --- a/tools/CUPiD +++ b/tools/CUPiD @@ -1 +1 @@ -Subproject commit 5cad933293165959621ba282a42f3b54945415ea +Subproject commit 04ba5ebc21a0137785c17a63a6f9540195aa57af