From 9911c0ddd31253114ee6ba0082ec15f3d4c9e00b Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Wed, 20 Nov 2024 12:55:07 -0700 Subject: [PATCH 01/17] Github Action script to run preview_namelists Fails in python 3.9 for G and B compsets because CICE's buildnml relies on glob.glob API introduced in 3.10. Fails all 3.12 and 3.13 tests because distutils has been removed from the standard library. --- .github/workflows/preview_namelist.yaml | 51 +++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .github/workflows/preview_namelist.yaml diff --git a/.github/workflows/preview_namelist.yaml b/.github/workflows/preview_namelist.yaml new file mode 100644 index 000000000..1f1c5f4fb --- /dev/null +++ b/.github/workflows/preview_namelist.yaml @@ -0,0 +1,51 @@ +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@v4 + 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 + + + - name: Checkout CESM + run: | + $GITHUB_WORKSPACE/bin/git-fleximod update + + - 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 From c9eb3023e57522554c22b9b737dd384b8db60fca Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Fri, 22 Nov 2024 10:43:47 -0700 Subject: [PATCH 02/17] Use setup-python@v5, not @v4 --- .github/workflows/preview_namelist.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview_namelist.yaml b/.github/workflows/preview_namelist.yaml index 1f1c5f4fb..2f21ec9ae 100644 --- a/.github/workflows/preview_namelist.yaml +++ b/.github/workflows/preview_namelist.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} From fd49cd96c9f1723c37d4926a27e15e80741e4341 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 4 Dec 2024 13:51:39 -0700 Subject: [PATCH 03/17] messing with derecho workflow --- .github/workflows/build.yaml | 4 ++-- components/cice | 2 +- components/clm | 2 +- components/mosart | 2 +- components/rtm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 88b11c25c..ebe873059 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,7 +18,7 @@ jobs: 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 + needs: setup runs-on: hpc-runner defaults: run: @@ -45,4 +45,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/components/cice b/components/cice index eebe30a55..f283ede80 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit eebe30a55c114ac8456774e422f721d7504911e0 +Subproject commit f283ede80acd88eff6967f399223f7177c179065 diff --git a/components/clm b/components/clm index 6d8dad82e..1d824b8c2 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 6d8dad82ed98a0e51e315d42991459386dc2da96 +Subproject commit 1d824b8c2eb95159d8e247ca7c71cd177223de59 diff --git a/components/mosart b/components/mosart index e2ffe0000..99b425e61 160000 --- a/components/mosart +++ b/components/mosart @@ -1 +1 @@ -Subproject commit e2ffe00004cc416cfc8bcfae2a949474075c1d1f +Subproject commit 99b425e618a31d077935a0774141aa9bf48fcc13 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 From 4b24ca9f1e84bf5951d99d95b1788f856442e21f Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 4 Dec 2024 13:56:54 -0700 Subject: [PATCH 04/17] needs statement broke test --- .github/workflows/build.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ebe873059..342fb425f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -17,8 +17,6 @@ jobs: 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: From 2a9a2b4f53ee82b5195f3420021b079aea3e8e83 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 4 Dec 2024 15:44:35 -0700 Subject: [PATCH 05/17] try this if form --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 342fb425f..f8d8aa608 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,7 +10,7 @@ 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 From 4110abd009ca450d106866ce459d2e0335f60aac Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 5 Dec 2024 08:06:02 -0700 Subject: [PATCH 06/17] try updating cice --- .gitmodules | 4 ++-- components/cice | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7eda906fd..cb48fd21b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -70,10 +70,10 @@ [submodule "cice"] path = components/cice - url = https://github.com/ESCOMP/CESM_CICE + url = https://github.com/jedwards4b/CESM_CICE fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE fxrequired = ToplevelRequired - fxtag = cesm_cice6_6_0_1 + fxtag = 80d5e61 [submodule "mom"] path = components/mom diff --git a/components/cice b/components/cice index f283ede80..80d5e6168 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit f283ede80acd88eff6967f399223f7177c179065 +Subproject commit 80d5e6168f0eab97e84a46a1f1e18aef244e8efc From 4b131ca8f88796d0faa06149c528e0529b02d398 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 5 Dec 2024 09:43:41 -0700 Subject: [PATCH 07/17] try moving continue on error flag --- .github/workflows/build.yaml | 2 -- .github/workflows/derecho.yaml | 2 ++ .gitmodules | 2 +- components/cice | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f8d8aa608..ad4d288d5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,8 +23,6 @@ jobs: shell: bash {0} steps: - name: Run ${{ inputs.compiler }} tests - # Allows the next step to run even if this one fails - continue-on-error: true run: | pwd cd cime/scripts diff --git a/.github/workflows/derecho.yaml b/.github/workflows/derecho.yaml index 287940bd0..43d56141b 100644 --- a/.github/workflows/derecho.yaml +++ b/.github/workflows/derecho.yaml @@ -27,6 +27,8 @@ jobs: strategy: matrix: compiler: [gnu, intel, intel-oneapi, nvhpc] + # Allows the next step to run even if this one fails + continue-on-error: true uses: ./.github/workflows/build.yaml with: compiler: ${{ matrix.compiler }} diff --git a/.gitmodules b/.gitmodules index cb48fd21b..81fdd3fa5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,7 +73,7 @@ url = https://github.com/jedwards4b/CESM_CICE fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE fxrequired = ToplevelRequired - fxtag = 80d5e61 + fxtag = f450b48 [submodule "mom"] path = components/mom diff --git a/components/cice b/components/cice index 80d5e6168..f450b48c2 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit 80d5e6168f0eab97e84a46a1f1e18aef244e8efc +Subproject commit f450b48c2bf4e797e9a9a4cc2f8cf0a74289a9a1 From 5fed00cadbc85acc2ba40c784ae90175496d3923 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 5 Dec 2024 10:04:13 -0700 Subject: [PATCH 08/17] try fail-fast option --- .github/workflows/build.yaml | 2 ++ .github/workflows/derecho.yaml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ad4d288d5..76c662ee4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,6 +23,8 @@ jobs: shell: bash {0} steps: - name: Run ${{ inputs.compiler }} tests + # Allows the check status step to run even if this one fails + continue-on-error: true run: | pwd cd cime/scripts diff --git a/.github/workflows/derecho.yaml b/.github/workflows/derecho.yaml index 43d56141b..2cbbbbf1e 100644 --- a/.github/workflows/derecho.yaml +++ b/.github/workflows/derecho.yaml @@ -25,10 +25,10 @@ jobs: build: strategy: + # run all matrix members even if one fails + fail-fast: false matrix: compiler: [gnu, intel, intel-oneapi, nvhpc] - # Allows the next step to run even if this one fails - continue-on-error: true uses: ./.github/workflows/build.yaml with: compiler: ${{ matrix.compiler }} From fe500cb9bea716814ada86c34d2bd8a20241d7ff Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 5 Dec 2024 15:24:12 -0700 Subject: [PATCH 09/17] more changes for nvhpc --- .gitmodules | 4 ++-- ccs_config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 81fdd3fa5..d236deb77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,9 +28,9 @@ [submodule "ccs_config"] path = ccs_config - url = https://github.com/ESMCI/ccs_config_cesm.git + url = https://github.com/jedwards4b/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = ccs_config_cesm1.0.12 + fxtag = 5f62c8d3 fxrequired = ToplevelRequired [submodule "cime"] diff --git a/ccs_config b/ccs_config index 1ebe59402..5f62c8d3f 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 1ebe59402bc19881a6d711084e27bdbe6c69149c +Subproject commit 5f62c8d3f23fce06e31d845c0be7657a800f9da5 From c818219eee7e59c2a479a9b4b481d293cdd17939 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 6 Dec 2024 07:05:01 -0700 Subject: [PATCH 10/17] update ccs_config --- .gitmodules | 4 ++-- ccs_config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d236deb77..48e9a2220 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,9 +28,9 @@ [submodule "ccs_config"] path = ccs_config - url = https://github.com/jedwards4b/ccs_config_cesm.git + url = https://github.com/ESMCI/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = 5f62c8d3 + fxtag = ccs_config_cesm1.0.14 fxrequired = ToplevelRequired [submodule "cime"] diff --git a/ccs_config b/ccs_config index 5f62c8d3f..2455e8634 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 5f62c8d3f23fce06e31d845c0be7657a800f9da5 +Subproject commit 2455e8634366719a8a5526d588085a838d537258 From b2033282cb5f9f7b2e27cc7e2ea04b0ef26dab28 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 6 Dec 2024 07:25:27 -0700 Subject: [PATCH 11/17] backout change in derecho modules --- .gitmodules | 2 +- ccs_config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 48e9a2220..63cb004c6 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.14 + fxtag = ccs_config_cesm1.0.15 fxrequired = ToplevelRequired [submodule "cime"] diff --git a/ccs_config b/ccs_config index 2455e8634..26aacc140 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 2455e8634366719a8a5526d588085a838d537258 +Subproject commit 26aacc1403c01f44df4ab05d275c0fccd5ae3dce From 956738605bde70ec86466614f88edf3b640c185f Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 6 Dec 2024 09:54:30 -0700 Subject: [PATCH 12/17] update cice tag --- .gitmodules | 4 ++-- components/cice | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 63cb004c6..9f477d7a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -70,10 +70,10 @@ [submodule "cice"] path = components/cice - url = https://github.com/jedwards4b/CESM_CICE + url = https://github.com/ESCOMP/CESM_CICE fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE fxrequired = ToplevelRequired - fxtag = f450b48 + fxtag = cesm3_cice6_6_0_1 [submodule "mom"] path = components/mom diff --git a/components/cice b/components/cice index f450b48c2..f283ede80 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit f450b48c2bf4e797e9a9a4cc2f8cf0a74289a9a1 +Subproject commit f283ede80acd88eff6967f399223f7177c179065 From d27463c9c4f778bf3e42d12720c5f932e9844100 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 6 Dec 2024 16:04:50 -0700 Subject: [PATCH 13/17] try again for cice fix --- .gitmodules | 2 +- components/cice | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9f477d7a0..a7ce17f19 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,7 +73,7 @@ url = https://github.com/ESCOMP/CESM_CICE fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE fxrequired = ToplevelRequired - fxtag = cesm3_cice6_6_0_1 + fxtag = cesm3_cice6_6_0_2 [submodule "mom"] path = components/mom diff --git a/components/cice b/components/cice index f283ede80..604b66adc 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit f283ede80acd88eff6967f399223f7177c179065 +Subproject commit 604b66adc0a381000099e93429a1d6e1613eb0db From d05cefd09dc644eba375ce286b1cc8fcd00c02b8 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Wed, 18 Dec 2024 10:45:31 -0700 Subject: [PATCH 14/17] cesm3_0_alpha05b update WW3 tag. --- .gitmodules | 2 +- ChangeLog | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 370f42cef..40a0297a6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -114,7 +114,7 @@ path = components/ww3 url = https://github.com/ESCOMP/WW3_interface fxDONOTUSEurl = https://github.com/ESCOMP/WW3_interface - fxtag = main_0.0.14 + fxtag = main_0.0.16 fxrequired = ToplevelRequired [submodule "mizuroute"] diff --git a/ChangeLog b/ChangeLog index a9f338995..5dc80431a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,247 @@ +============================================================== +Tag name: cesm3_0_alpha05b +Originator(s): CSEG +Date: 17th December 2024 +One-line Summary: CLM answer changes + +components/cam https://github.com/ESCOMP/CAM/cam6_4_047 ** +components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm3_cice6_5_0_14 -- +cime https://github.com/ESMCI/cime/tree/cime6.1.46 ** +share https://github.com/ESCOMP/CESM_share/tree/share1.1.5 -- +ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.12 ** +components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.25 ** +components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.57 -- +components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_002 -- +components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.3.014 ** +components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240822 -- +components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.3 -- +components/mom https://github.com/ESCOMP/MOM_interface/mi_241122 ** +components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_1_05 ** +components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_83 ** +components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/main_0.0.16 ** +libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_3 -- +libraries/mpi-serial https://github.com/ESMCI/mpi-serial/tree/MPIserial_2.5.0 -- +tools/CUPiD https://github.com/NCAR/CUPiD/tree/v0.1.1 -- + +cam + Courtney Peverley 2024-11-19 - cam6_4_047 - components/cam (cesm3_0_alpha05b) + https://github.com/ESCOMP/CAM/tags/cam6_4_047 + + update config component to handle new compset names + + answer-changing for chemistry configurations + + +ccs_config + James Edwards 2024-11-08 - ccs_config_cesm1.0.10 - ccs_config (cesm3_0_alpha05b) + https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_cesm1.0.10 + + Update inputdata servers removing ftp and replacing with wget https. + Fix issue with nag compiler on izumi + + + Chris Fischer 2024-12-11 - ccs_config_1.0.12 - ccs_config (cesm3_0_alpha05b) + https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_1.0.12 + + ccs_config_1.0.12: Changes for compsets, grids and compilers on derecho + ccs_config_1.0.11: Add memory usage variables for use on derecho + + +cime + Chris Fischer 2024-12-11 - cime6.1.46 - cime (cesm3_0_alpha05b) + https://github.com/ESMCI/cime/tags/cime6.1.46 + + Fixes compare_xml method for env_batch + + + James Edwards 2024-11-12 - cime6.1.45 - cime (cesm3_0_alpha05b) + https://github.com/ESMCI/cime/tags/cime6.1.44 + + cime6.1.45:Minor change to include timing files in case git repository. + Update cprnc to latest tag. + cime6.1.44: Ignore same file errors. + cime6.1.43: Fix logic for multi driver. + cime6.1.42: Skip three files when staging refcase files to avoid a rmtree error. + cime6.1.41: Remove unused GPU options for CESM. + cime6.1.40: If batch script is already executable, don't chmod it. + cime6.1.39: Updates MVK SystemTest to be configurable via testmod. + cime6.1.38: Correct the message about location of copy. + cime6.1.37: Correct the cmake path for configuring tools like fortran_unit_tests. + cime6.1.36: Add mem variables. + cime6.1.35: Clarify prereq option in case.submit. + + + Chris Fischer 2024-10-10 - cime6.1.34 - cime (cesm3_0_alpha05b) + https://github.com/ESMCI/cime/tags/cime6.1.34 + + cime6.1.34: Do not report memcomp if no baseline exists + cime6.1.33: Remove GPU options from the Python workflow and move them to XML files for CESM + Depends on cmeps1.0.22 and ccs_config_cesm1.0.8 + cime6.1.32: Fixes test status reporting errors during successful baseline comparison + cime6.1.31: Remove distutils + cime6.1.30: Refine the git interface to handle no git and old git + + +clm + Adrianna Foster 2024-11-09 - ctsm5.3.010 - components/clm (cesm3_0_alpha05b) + https://github.com/ESCOMP/ctsm/tags/Merge b4b-dev to main + + Various quality of life improvements, parameter file modifications + + + Adrianna Foster 2024-11-13 - ctsm5.3.012 - components/clm (cesm3_0_alpha05b) + https://github.com/ESCOMP/ctsm/tags/FATE API update to accommodate fire refactor; FATES tag update + + FATE API update to accommodate fire refactor; FATES tag update + + Brings FATES up to latest tag; updates API to accommodate + refactor to FATES-side fire model. Round-off differences in + FATES compsets with fire and NLCOMP diffs for some FATES + configurations. + + + Erik Kluzek 2024-10-08 - ctsm5.3.006 - components/clm (cesm3_0_alpha05b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.3.X5 + + Merge b4b-dev to main-dev + Various fixes and cleanup for failing tests in beta03 + + + Erik Kluzek 2024-11-26 - ctsm5.3.014 - components/clm (cesm3_0_alpha05b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.3.014 + + Brings in a list of changes to get more tests passing. + This is a general cleanup tag from the cesm3_0_beta03/04 + tags from the chill deadline that allowed several fails + to pass through. + + It includes updating the standalone submodules to be based + around cesm3_0_beta04 + + Depends on: + ccs_config_cesm1.0.10 + cime6.1.37 + + + Erik Kluzek 2024-11-15 - ctsm5.3.013 - components/clm (cesm3_0_alpha05b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.3.013 + + Merge b4b-dev to main development + + Update git-fleximod + Add two new default fields to h0 history files + A few other changes + + + Sam Rabin 2024-11-11 - ctsm5.3.011 - components/clm (cesm3_0_alpha05b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.3.011 + + Fix handling of finidat with cold starts + + + Sam Rabin 2024-10-21 - ctsm5.3.009 - components/clm (cesm3_0_alpha05b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.3.009 + + Minor change to testing of Matrix CN capability + + + Erik Kluzek 2024-10-21 - ctsm5.3.008 - components/clm (cesm3_0_alpha05b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.3.008 + + Update needed for PPE work + + Changes answers in a small way, but larger than roundoff + + + Erik Kluzek 2024-10-24 - ctsm5.2.007 - components/clm (cesm3_0_alpha05b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.007 + + Clm60 finidat updates for ne30, f09, f19 grids + + +cmeps + Chris Fischer 2024-12-10 - cmeps1.0.25 - src/drivers/nuopc/ (cesm3_0_alpha05b) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.25 + + cmeps1.0.25: Add memory usage variables for use on derecho + cmeps1.0.24: Make xgrid the default aoflux_grid when atm and ocn are running on different grids + cmeps1.0.23: Fix logic for adding psfc to aoflux_in + + + Chris Fischer 2024-11-11 - cmeps1.0.22 - src/drivers/nuopc/ (cesm3_0_alpha05b) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.22 + + cmeps1.0.22: Update XML variables for GPU configurations + cmeps1.0.21: buildnml was setting variable samegrid_wav_ocn but namelist_definintion_drv.xml was looking for samegrid_ocn_wav + cmeps1.0.20: Update dms exchange + cmeps1.0.19: wav2ocn and ocn2wav maps are still needed in some cases + cmeps1.0.18: Fix xgrid reproducibility + cmeps1.0.17: Fix for exchange grid with add_gusts false + + Depends on: + cime6.1.33 + + +mom + Alper Altuntas 2024-11-22 - mi_241122 - components/mom (cesm3_0_alpha05b) + https://github.com/ESCOMP/MOM_interface/tags/mi_241122 + + - nvhpc fix (atan -> atan2) + - consortium sync + + +mosart + Erik Kluzek 2024-11-19 - mosart1.1.04 - components/mosart (cesm3_0_alpha05b) + https://github.com/ESCOMP/mosart/tags/mosart1.1.04 + + Make time the center of the interval + + + Erik Kluzek 2024-11-18 - mosart1.1.03 - components/mosart (cesm3_0_alpha05b) + https://github.com/ESCOMP/mosart/tags/mosart1.1.03 + + Some b4b changes including testlist changes + + + Erik Kluzek 2024-11-19 - mosart1.1.05 - components/mosart (cesm3_0_alpha05b) + https://github.com/ESCOMP/mosart/tags/mosart1.0.5 + + Stop running 0th time-step for startup/hybrid + + +rtm + Erik Kluzek 2024-12-04 - rtm1_0_83 - components/rtm (cesm3_0_alpha05b) + https://github.com/ESCOMP/rtm/tags/rtm1_0_83 + + Stop running 0th time-step for startup/hybrid + + + Erik Kluzek 2024-11-19 - rtm1_0_82 - components/rtm (cesm3_0_alpha05b) + https://github.com/ESCOMP/rtm/tags/rtm1_0_82 + + Change time to middle of timestep for history + + + Erik Kluzek 2024-11-19 - rtm1_0_81 - components/rtm (cesm3_0_alpha05b) + https://github.com/ESCOMP/rtm/tags/rtm1.0.81 + + Change compsets for testing + + +ww3 + Alper Altuntas 2024-12-17 - main_0.0.16 - components/ww3 (cesm3_0_alpha05b) + https://github.com/ESCOMP/WW3_interface/tags/main_0.0.16 + + Restart filename fix + Restart at eor + + + Alper Altuntas 2024-12-11 - main_0.0.15 - components/ww3 (cesm3_0_alpha05b) + https://github.com/ESCOMP/WW3_interface/tags/main_0.0.15 + + Move file staging + + ============================================================== Tag name: cesm3_0_alpha05a Originator(s): CSEG From fb5e9fff677398a7c6436f0d060ea49c5c79448c Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Dec 2024 10:44:17 -0700 Subject: [PATCH 15/17] update to fix namelist testing --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 042e16eff..2943501f0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 From 2d8f1e827ac169e9b326fe9c29ce8176cd26f184 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Dec 2024 11:23:52 -0700 Subject: [PATCH 16/17] need to prestage ww3 data --- .github/workflows/preview_namelist.yaml | 6 +++++- cime | 2 +- components/cam | 2 +- components/cdeps | 2 +- components/cism | 2 +- components/clm | 2 +- components/cmeps | 2 +- components/mizuroute | 2 +- components/mosart | 2 +- share | 2 +- tools/CUPiD | 2 +- 11 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/preview_namelist.yaml b/.github/workflows/preview_namelist.yaml index 2f21ec9ae..f5bb92bea 100644 --- a/.github/workflows/preview_namelist.yaml +++ b/.github/workflows/preview_namelist.yaml @@ -36,12 +36,16 @@ jobs: 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 + run: | + svn co https://svn-ccsm-inputdata.cgd.ucar.edu/trunk/inputdata/wav/ww3/grid_inp.wgx3v7 /home/runner/cesm/inputdata/wav/ww3/grid_inp.wgx3v7 + - name: Create new cases, run case.setup, and then preview namelists run: | cd $GITHUB_WORKSPACE/cime/scripts 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/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 1d824b8c2..f437651ee 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 1d824b8c2eb95159d8e247ca7c71cd177223de59 +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 99b425e61..a246344e9 160000 --- a/components/mosart +++ b/components/mosart @@ -1 +1 @@ -Subproject commit 99b425e618a31d077935a0774141aa9bf48fcc13 +Subproject commit a246344e9b28e4bb42313749094fa20d45e2b212 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 From eba32bb04e2f49158517506496b8245c72fc354e Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Dec 2024 11:34:26 -0700 Subject: [PATCH 17/17] add one more ww3 directory to prestage --- .github/workflows/preview_namelist.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/preview_namelist.yaml b/.github/workflows/preview_namelist.yaml index f5bb92bea..c29b49fbb 100644 --- a/.github/workflows/preview_namelist.yaml +++ b/.github/workflows/preview_namelist.yaml @@ -43,8 +43,9 @@ jobs: $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/grid_inp.wgx3v7 /home/runner/cesm/inputdata/wav/ww3/grid_inp.wgx3v7 + 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: |