From b1568e72435702b3cfa0f35a733d09c1728c6d8b Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 13 Nov 2024 13:33:53 -0700 Subject: [PATCH 01/26] update poetry certifi version and update tests failing due to mpi-serial update --- poetry.lock | 6 +++--- tests/conftest.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3a74effcd..ac82fb0d9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -30,13 +30,13 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "certifi" -version = "2024.6.2" +version = "2024.8.30" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2024.6.2-py3-none-any.whl", hash = "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56"}, - {file = "certifi-2024.6.2.tar.gz", hash = "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516"}, + {file = "certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8"}, + {file = "certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"}, ] [[package]] diff --git a/tests/conftest.py b/tests/conftest.py index 81edbe713..1dd1b86f3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -32,7 +32,7 @@ def logger(): "submodule_name": "test_optional", "status1" : "test_optional MPIserial_2.5.0-3-gd82ce7c is out of sync with .gitmodules MPIserial_2.4.0", "status2" : "test_optional at tag MPIserial_2.4.0", - "status3" : "test_optional not checked out, out of sync at tag None, expected tag is MPIserial_2.4.0 (optional)", + "status3" : "test_optional not checked out, out of sync at tag MPIserial_2.5.1, expected tag is MPIserial_2.4.0 (optional)", "status4" : "test_optional at tag MPIserial_2.4.0", "gitmodules_content": """ [submodule "test_optional"] @@ -46,7 +46,7 @@ def logger(): "submodule_name": "test_alwaysoptional", "status1" : "test_alwaysoptional MPIserial_2.3.0 is out of sync with .gitmodules e5cf35c", "status2" : "test_alwaysoptional at hash e5cf35c", - "status3" : "out of sync at tag None, expected tag is e5cf35c", + "status3" : "out of sync at tag MPIserial_2.5.1, expected tag is e5cf35c", "status4" : "test_alwaysoptional at hash e5cf35c", "gitmodules_content": """ [submodule "test_alwaysoptional"] From e7f9a261ccde33f63bac2ba86073e8ac5954d33d Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 13 Nov 2024 14:06:10 -0700 Subject: [PATCH 02/26] fix issue 65 --- git_fleximod/cli.py | 36 ++++++++++++++++++++---------------- git_fleximod/git_fleximod.py | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/git_fleximod/cli.py b/git_fleximod/cli.py index 208bc0468..c0591d76e 100644 --- a/git_fleximod/cli.py +++ b/git_fleximod/cli.py @@ -7,22 +7,26 @@ def find_root_dir(filename=".gitmodules"): """ finds the highest directory in tree which contains a file called filename """ - d = Path.cwd() - root = Path(d.root) - dirlist = [] - dl = d - while dl != root: - dirlist.append(dl) - dl = dl.parent - dirlist.append(root) - dirlist.reverse() - - for dl in dirlist: - attempt = dl / filename - if attempt.is_file(): - return str(dl) - return None - + try: + root = utils.execute_subprocess(["git","rev-parse", "--show-toplevel"], + output_to_caller=True ).rstrip() + except: + d = Path.cwd() + root = Path(d.root) + dirlist = [] + dl = d + while dl != root: + dirlist.append(dl) + dl = dl.parent + dirlist.append(root) + dirlist.reverse() + + for dl in dirlist: + attempt = dl / filename + if attempt.is_file(): + return str(dl) + return None + return Path(root) def get_parser(): description = """ diff --git a/git_fleximod/git_fleximod.py b/git_fleximod/git_fleximod.py index 0851e9d09..13f35df95 100755 --- a/git_fleximod/git_fleximod.py +++ b/git_fleximod/git_fleximod.py @@ -342,7 +342,7 @@ def main(): excludelist=excludelist, ) if not gitmodules.sections(): - sys.exit("No submodule components found") + sys.exit(f"No submodule components found, root_dir={root_dir}") retval = 0 if action == "update": submodules_update(gitmodules, root_dir, fxrequired, force) From 135770709a5ea911427eda39b4fbb3c7f6ec9d95 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 13 Nov 2024 15:03:12 -0700 Subject: [PATCH 03/26] strip strip --- git_fleximod/submodule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_fleximod/submodule.py b/git_fleximod/submodule.py index c939d54bc..75d9dd4eb 100644 --- a/git_fleximod/submodule.py +++ b/git_fleximod/submodule.py @@ -221,7 +221,7 @@ def sparse_checkout(self): if superroot: gitroot = superroot.strip() else: - gitroot = self.root_dir.strip() + gitroot = self.root_dir # Now need to move the .git dir to the submodule location rootdotgit = os.path.join(self.root_dir, ".git") while os.path.isfile(rootdotgit): From 50bd54c63e38c52e0bfc4a1d6bc6cb0eea6cf645 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 13 Nov 2024 15:59:44 -0700 Subject: [PATCH 04/26] Bump to 0.9.3 --- git_fleximod/cli.py | 2 +- pyproject.toml | 2 +- tbump.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git_fleximod/cli.py b/git_fleximod/cli.py index c0591d76e..ac9493cfc 100644 --- a/git_fleximod/cli.py +++ b/git_fleximod/cli.py @@ -2,7 +2,7 @@ import argparse from git_fleximod import utils -__version__ = "0.9.2" +__version__ = "0.9.3" def find_root_dir(filename=".gitmodules"): """ finds the highest directory in tree diff --git a/pyproject.toml b/pyproject.toml index 619cdabe3..1d0419ad2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "git-fleximod" -version = "0.9.2" +version = "0.9.3" description = "Extended support for git-submodule and git-sparse-checkout" authors = ["Jim Edwards "] maintainers = ["Jim Edwards "] diff --git a/tbump.toml b/tbump.toml index 920ff0591..b432206a5 100644 --- a/tbump.toml +++ b/tbump.toml @@ -2,7 +2,7 @@ github_url = "https://github.com/jedwards4b/git-fleximod/" [version] -current = "0.9.2" +current = "0.9.3" # Example of a semver regexp. # Make sure this matches current_version before From 9911c0ddd31253114ee6ba0082ec15f3d4c9e00b Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Wed, 20 Nov 2024 12:55:07 -0700 Subject: [PATCH 05/26] 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 06/26] 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 07/26] 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 08/26] 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 09/26] 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 10/26] 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 11/26] 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 12/26] 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 13/26] 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 14/26] 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 15/26] 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 16/26] 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 17/26] 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 004194fd4a3ba13ccdb1f14290112f8164074bcb Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Dec 2024 10:01:07 -0700 Subject: [PATCH 18/26] if not fxtag is available tag=hash --- git_fleximod/git_fleximod.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git_fleximod/git_fleximod.py b/git_fleximod/git_fleximod.py index 13f35df95..2c2601fa1 100755 --- a/git_fleximod/git_fleximod.py +++ b/git_fleximod/git_fleximod.py @@ -181,6 +181,8 @@ def init_submodule_from_gitmodules(gitmodules, name, root_dir, logger): url = gitmodules.get(name, "url") assert path and url, f"Malformed .gitmodules file {path} {url}" tag = gitmodules.get(name, "fxtag") + if not tag: + tag = gitmodules.get(name, "hash") fxurl = gitmodules.get(name, "fxDONOTUSEurl") fxsparse = gitmodules.get(name, "fxsparse") fxrequired = gitmodules.get(name, "fxrequired") @@ -250,7 +252,6 @@ def submodules_update(gitmodules, root_dir, requiredlist, force): newrequiredlist = ["AlwaysRequired"] if optional: newrequiredlist.append("AlwaysOptional") - submodules_update(gitsubmodules, repodir, newrequiredlist, force=force) def local_mods_output(): From 5f05c45c1f13cdb9e4a80efc2355882ac2ef1cf0 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Dec 2024 10:16:45 -0700 Subject: [PATCH 19/26] Bump to 0.9.4 --- git_fleximod/cli.py | 2 +- pyproject.toml | 2 +- tbump.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git_fleximod/cli.py b/git_fleximod/cli.py index ac9493cfc..131466b9b 100644 --- a/git_fleximod/cli.py +++ b/git_fleximod/cli.py @@ -2,7 +2,7 @@ import argparse from git_fleximod import utils -__version__ = "0.9.3" +__version__ = "0.9.4" def find_root_dir(filename=".gitmodules"): """ finds the highest directory in tree diff --git a/pyproject.toml b/pyproject.toml index 1d0419ad2..65924ff9a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "git-fleximod" -version = "0.9.3" +version = "0.9.4" description = "Extended support for git-submodule and git-sparse-checkout" authors = ["Jim Edwards "] maintainers = ["Jim Edwards "] diff --git a/tbump.toml b/tbump.toml index b432206a5..be0b799d3 100644 --- a/tbump.toml +++ b/tbump.toml @@ -2,7 +2,7 @@ github_url = "https://github.com/jedwards4b/git-fleximod/" [version] -current = "0.9.3" +current = "0.9.4" # Example of a semver regexp. # Make sure this matches current_version before From ae9a7e3d47f52bbd3ec33293f2436895ea8a2e0c Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Dec 2024 10:18:25 -0700 Subject: [PATCH 20/26] updates for alpha05c --- .gitmodules | 24 ++++++++++++------------ ccs_config | 2 +- cime | 2 +- components/cam | 2 +- components/cdeps | 2 +- components/cice | 2 +- components/cism | 2 +- components/clm | 2 +- components/cmeps | 2 +- components/mizuroute | 2 +- components/mosart | 2 +- components/rtm | 2 +- share | 2 +- tools/CUPiD | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.gitmodules b/.gitmodules index 370f42cef..5e3f9108f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,14 +30,14 @@ 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"] path = cime url = https://github.com/ESMCI/cime fxDONOTUSEurl = https://github.com/ESMCI/cime - fxtag = cime6.1.46 + fxtag = cime6.1.55 fxrequired = ToplevelRequired [submodule "fms"] @@ -51,14 +51,14 @@ path = share url = https://github.com/ESCOMP/CESM_share fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share - fxtag = share1.1.5 + fxtag = share1.1.7 fxrequired = ToplevelRequired [submodule "cam"] path = components/cam url = https://www.github.com/ESCOMP/CAM fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM - fxtag = cam6_4_047 + fxtag = cam6_4_048 fxrequired = ToplevelRequired [submodule "clm"] @@ -66,14 +66,14 @@ url = https://github.com/ESCOMP/CTSM fxDONOTUSEurl = https://github.com/ESCOMP/CTSM fxrequired = ToplevelRequired - fxtag = ctsm5.3.014 + fxtag = ctsm5.3.016 [submodule "cice"] path = components/cice 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_5 [submodule "mom"] path = components/mom @@ -86,7 +86,7 @@ path = components/cism url = https://github.com/ESCOMP/cism-wrapper.git fxDONOTUSEurl = https://github.com/ESCOMP/cism-wrapper.git - fxtag = cismwrap_2_2_002 + fxtag = cismwrap_2_2_005 fxrequired = ToplevelRequired [submodule "cdeps"] @@ -94,14 +94,14 @@ url = https://github.com/ESCOMP/CDEPS fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS fxrequired = ToplevelRequired - fxtag = cdeps1.0.57 + fxtag = cdeps1.0.61 [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git fxrequired = ToplevelRequired - fxtag = cmeps1.0.25 + fxtag = cmeps1.0.33 [submodule "rtm"] path = components/rtm @@ -122,14 +122,14 @@ url = https://github.com/ESCOMP/mizuRoute fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute fxrequired = ToplevelRequired - fxtag = cesm-coupling.n02_v2.1.3 + fxtag = cesm-coupling.n03_v2.2.0 [submodule "mosart"] path = components/mosart url = https://github.com/ESCOMP/MOSART fxDONOTUSEurl = https://github.com/ESCOMP/MOSART fxrequired = ToplevelRequired - fxtag = mosart1.1.05 + fxtag = mosart1.1.06 [submodule "parallelio"] path = libraries/parallelio @@ -157,4 +157,4 @@ url = https://github.com/NCAR/CUPiD.git fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git fxrequired = ToplevelRequired - fxtag = v0.1.1 + fxtag = v0.1.2 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..787d3ccf3 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit eebe30a55c114ac8456774e422f721d7504911e0 +Subproject commit 787d3ccf3b242214b0add3e474672f0609efcf2d 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 From fb5e9fff677398a7c6436f0d060ea49c5c79448c Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Dec 2024 10:44:17 -0700 Subject: [PATCH 21/26] 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 22/26] 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 23/26] 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: | From 7c841e9cb6bc647cea1911543a2c3fbf65f7048b Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 30 Dec 2024 10:38:42 -0700 Subject: [PATCH 24/26] update cime with correction to leap year correction logic --- .gitmodules | 2 +- cime | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 03a35cf34..cfb27e0b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,7 +37,7 @@ path = cime url = https://github.com/ESMCI/cime fxDONOTUSEurl = https://github.com/ESMCI/cime - fxtag = cime6.1.55 + fxtag = cime6.1.56 fxrequired = ToplevelRequired [submodule "fms"] diff --git a/cime b/cime index 85922c028..ac8e58310 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 85922c028ff8a5b9f5573888f4240cdc4b8104a3 +Subproject commit ac8e583108b1ce1f592a6f6436c71d6dc087f447 From b7515bb54d14783da086a567e763eb75cfb85db2 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 6 Jan 2025 11:36:47 -0700 Subject: [PATCH 25/26] update ccs_config and rtm --- .gitmodules | 4 ++-- ccs_config | 2 +- components/rtm | 2 +- components/ww3 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index cfb27e0b7..3584de532 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.15 + fxtag = ccs_config_cesm1.0.16 fxrequired = ToplevelRequired [submodule "cime"] @@ -108,7 +108,7 @@ url = https://github.com/ESCOMP/RTM fxDONOTUSEurl = https://github.com/ESCOMP/RTM fxrequired = ToplevelRequired - fxtag = rtm1_0_83 + fxtag = rtm1_0_84 [submodule "ww3"] path = components/ww3 diff --git a/ccs_config b/ccs_config index 26aacc140..a712a9204 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 26aacc1403c01f44df4ab05d275c0fccd5ae3dce +Subproject commit a712a920453dc0cb2831dce576e78c389b567f7e diff --git a/components/rtm b/components/rtm index a2cd8249e..6899b5581 160000 --- a/components/rtm +++ b/components/rtm @@ -1 +1 @@ -Subproject commit a2cd8249e40e8c61d68fe13145c4cf9d5e098f68 +Subproject commit 6899b55816ee4d9b7cf983d74ba2997b97a13c4d diff --git a/components/ww3 b/components/ww3 index d16f7c8fd..fc5aa8434 160000 --- a/components/ww3 +++ b/components/ww3 @@ -1 +1 @@ -Subproject commit d16f7c8fdefb51385703f5821942a0c124812323 +Subproject commit fc5aa843472c36993ab479263f7c384bfc7ab4af From 4d3b720846bab58c8f5998b47a97a9bbe883de45 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Wed, 8 Jan 2025 12:24:39 -0700 Subject: [PATCH 26/26] Update for cesm3_0_alpha05c --- ChangeLog | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5dc80431a..eb98f2d6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,249 @@ +============================================================== +Tag name: cesm3_0_alpha05c +Originator(s): CSEG +Date: 8th January 2024 +One-line Summary: RPOINTER update + +ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.16 ** +cime https://github.com/ESMCI/cime/tree/cime6.1.56 ** +components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240822 -- +share https://github.com/ESCOMP/CESM_share/tree/share1.1.7 ** +components/cam https://github.com/ESCOMP/CAM/cam6_4_048 ** +components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.3.016 ** +components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm3_cice6_6_0_1 ** +components/mom https://github.com/ESCOMP/MOM_interface/mi_241122 -- +components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_005 ** +components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.61 ** +components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.33 ** +components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_84 ** +components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/main_0.0.16 -- +components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n03_v2.3.0 ** +components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_1_06 ** +libraries/mpi-serial https://github.com/ESMCI/mpi-serial/tree/MPIserial_2.5.0 -- +libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_3 -- +tools/CUPiD https://github.com/NCAR/CUPiD/tree/v0.1.2 ** + + +cam + James Edwards 2024-10-03 - cam6_4_048 - components/cam (cesm3_0_alpha05c) + https://github.com/ESCOMP/CAM/tags/cam6_4_xxx + + Adds timestamp to rpointer files. + + Depends on: + - cmeps1.0.32 + - cime6.1.49 + - share1.0.6 + - cdeps1.0.61 + - ctsm5.3.016 + + +ccs_config + Alper Altuntas 2025-01-06 - ccs_config_cesm1.0.16 - ccs_config (cesm3_0_alpha05c) + https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_cesm1.0.xx + + fix default ww3 grid + + + James Edwards 2024-12-27 - ccs_config_cesm1.0.15 - ccs_config (cesm3_0_alpha05c) + https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_cesm1.0.15 + + ccs_config_cesm1.0.15: Backout derecho module update + ccs_config_cesm1.0.14: Add a cam and a clm file to debug exceptions for nvhpc + ccs_config_cesm1.0.13: Update nvhpc and gnu on derecho. + + +cdeps + James Edwards 2024-12-18 - cdeps1.0.61 - components/cdeps (cesm3_0_alpha05c) + https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.61 + + cdeps1.0.61: update nuopc_shr_methods to match share code and work with ufs + cdeps1.0.60: Readd rpointer timestamps. + cdeps1.0.59: Add back rpointer timestamps. + cdeps1.0.58: Change hard-coded default for nextsw_cday_calc - important for UFS. + + +cice + Chris Fischer 2024-12-23 - cesm3_cice6_6_0_5 - components/cice (cesm3_0_alpha05c) + https://github.com/ESCOMP/CESM_CICE/tags/cesm3_cice6_6_0_5 + + cesm3_cice6_6_0_5: Update git modules + cesm3_cice6_6_0_4: Fix msec initialization + cesm3_cice6_6_0_3: Fix msec initialization + cesm3_cice6_6_0_2: Remove glob rootdir + + + Chris Fischer 2024-11-19 - cesm3_cice6_6_0_1 - components/cice (cesm3_0_alpha05c) + https://github.com/ESCOMP/CESM_CICE/tags/cesm3_cice6_6_0_1 + + Fix for testing. + Clean up redundant dsnown line in icepack_therm_vertical + Make dsnow and dsnown optional + Update new wave fracturing arguments + + + James Edwards 2024-10-03 - cesm3_cice6_6_0_2 - components/cice (cesm3_0_alpha05c) + https://github.com/ESCOMP/CESM_CICE/tags/cesm3_cice6_5_0_xx + + Adds timestamp to rpointer files. Depends on cmeps1.0.22 and cime6.1.xxx + + + Chris Fischer 2024-11-19 - cesm3_cice6_5_0_15 - components/cice (cesm3_0_alpha05c) + https://github.com/ESCOMP/CESM_CICE/tags/cesm3_cice6_5_0_15 + + FSD fixes for conservation + Update ESCOMP version of Icepack + + +cime + James Edwards 2024-10-03 - cime6.1.47 - cime (cesm3_0_alpha05c) + https://github.com/ESMCI/cime/tags/cime6.1.xxx + + Updates tests to add DRV_RESTART_RPOINTER variable + + + James Edwards 2024-12-30 - cime6.1.56 - cime (cesm3_0_alpha05c) + https://github.com/ESMCI/cime/tags/cime6.1.56 + + corrects logic of leap year correction in python. + + + James Edwards 2024-12-26 - cime6.1.55 - cime (cesm3_0_alpha05c) + https://github.com/ESMCI/cime/tags/cime6.1.55 + + Fixes an issue with RESUBMIT>0 which was missed in testing cam. + + + James Edwards 2024-12-20 - cime6.1.54 - cime (cesm3_0_alpha05c) + https://github.com/ESMCI/cime/tags/cime6.1.54 + + Improve leap year correction code and add doctests + + + James Edwards 2024-12-18 - cime6.1.53 - cime (cesm3_0_alpha05c) + https://github.com/ESMCI/cime/tags/cime6.1.53 + + cime6.1.53: Several updates for python 3.12 compatibility + cime6.1.52: Docker is not a machine, ubuntu_latest is. + cime6.1.51: Skip tests using evv4esm if not available. + cime6.1.50: Remove another reference to distutils. + cime6.1.49: Short term archive fix. + cime6.1.48: Make sure file exists before assigning. + + +cism + James Edwards 2024-10-28 - cismwrap_2_2_005 - components/cism (cesm3_0_alpha05c) + https://github.com/ESCOMP/cism-wrapper/tags/cismwrap_2_2_005 + + write restart at end of run. + + + James Edwards 2024-10-03 - cismwrap_2_2_004 - components/cism (cesm3_0_alpha05c) + https://github.com/ESCOMP/cism-wrapper/tags/cismwrap_2_2_003 + + cismwrap_2_2_004: Adds timestamp to rpointer files. Depends on cmeps1.0.22 and cime6.1.47 + cismwrap_2_2_003: Update changelog for cismwrap_2_2_003. + + +clm + James Edwards 2024-10-03 - ctsm5.3.015 - components/clm (cesm3_0_alpha05c) + https://github.com/ESCOMP/ctsm/tags/ctsm5.3.xxx + + Updates CDEPS and share to bring in an answer change (from CTSM's perspective) + regarding nextsw_cday. This change already was in place for CESM. For CTSM it + changes answers for cplhist cases, but also CTSM cam7 tests because of a change + in settings. + + Changes answers for clm50cam7LndTuningMode and clm60cam7LndTuningMode tests. + No prealpha or prebeta tests are expected to change. + + Depends on: + - share1.0.6 + + + Erik Kluzek 2024-12-18 - ctsm5.3.016 - components/clm (cesm3_0_alpha05c) + https://github.com/ESCOMP/ctsm/tags/ctsm5.3.016 + + Adds timestamp to rpointer files. + + Includes several submodule updates that are required to go along with this. Without ALL the submodule updates there are many important tests that don't run or don't pass. + + Depends on: + - cmeps1.0.32 + - cdeps1.0.61 + - cime6.1.49 + + +cmeps + James Edwards 2024-12-18 - cmeps1.0.33 - src/drivers/nuopc/ (cesm3_0_alpha05c) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.33 + + cmeps1.0.33: remove unused variable isPresent and other github workflow related changes. + cmeps1.0.32: Replace testcase None in config with unset. + cmeps1.0.31: Restart at end of run needs to be false for these tests. + cmeps1.0.30: Update ice2wav maps. + cmeps1.0.29: Update retrieval and writing of dststatus fields. + cmeps1.0.28: Fix/ocnalb orbprint + cmeps1.0.27: Do not write restart at end of erc test. + cmeps1.0.26: Add timestamp rpointer. + + +CUPiD + Michael Levy 2024-12-05 - v0.1.2 - tools/CUPiD (cesm3_0_alpha05c) + https://github.com/NCAR/CUPiD/tags/v0.1.2 + + - Start prepping CUPiD to be part of CESM workflow (can generate CUPiD and ADF config files using info from CESM cases) + - Better documentation + - Additional diagnostics in key_metrics example (requires additional packages in cupid-analysis) + - Update ADF external + - More intuitive names for both scripts and conda environments + + +mizuRoute + Erik Kluzek 2024-10-07 - cesm-coupling.n03_v2.2.0 - components/mizuroute (cesm3_0_alpha05c) + https://github.com/ESCOMP/mizuRoute/tags/cesm-coupling.n03_v2.2.0 + + Adds floodplain + + Updates rpointer files as needed by CESM + Moves stand-alone version to use git-fleximod and removes manage_externals + + +mosart + James Edwards 2024-10-03 - mosart1.1.06 - components/mosart (cesm3_0_alpha05c) + https://github.com/ESCOMP/mosart/tags/mosart1.1.03 + + Adds timestamp to rpointer files + + Depends on: + - cmeps1.0.32 + - cdeps1.0.61 + - share1.0.6 + - cime6.1.49 + + +rtm + James Edwards 2024-10-03 - rtm1_0_84 - components/rtm (cesm3_0_alpha05c) + https://github.com/ESCOMP/rtm/tags/rtm1_0_81 + + Adds timestamp to rpointer files. + + Depends on: + - cmeps1.0.32 + - cdeps1.0.61 + - share1.0.6 + - cime6.1.49 + + +share + James Edwards 2024-12-18 - share1.1.7 - share (cesm3_0_alpha05c) + https://github.com/ESCOMP/CESM_share/tags/share1.1.7 + + share1.1.7: update nuopc_shr_methods to match cdeps/share code + share1.1.6: The adjustl needs to be prior to inquire statement. + + + ============================================================== Tag name: cesm3_0_alpha05b Originator(s): CSEG