From c37961957c42a01c89dab7c24bfd5007d07d3d4f Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Mon, 15 Jul 2024 12:25:01 -0600 Subject: [PATCH 1/5] Update for cesm3_0_alpha02a --- .gitmodules | 31 +++++++------------ cime_config/config_compsets.xml | 18 ++++++++--- cime_config/testlist_allactive.xml | 4 +-- .../allactive/defaultio/user_nl_mosart | 8 ++--- 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/.gitmodules b/.gitmodules index b8db1cb844..e97725e3ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,30 +31,23 @@ path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = ccs_config_cesm0.0.109 + fxtag = ccs_config_cesm1.0.0 fxrequired = ToplevelRequired [submodule "share"] path = share url = https://github.com/ESCOMP/CESM_share fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share - fxtag = share1.0.19 + fxtag = share1.1.2 fxrequired = ToplevelRequired [submodule "cime"] path = cime url = https://github.com/ESMCI/cime fxDONOTUSEurl = https://github.com/ESMCI/cime - fxtag = cime6.0.246 + fxtag = cime6.1.0 fxrequired = ToplevelRequired -[submodule "mct"] - path = libraries/mct - url = https://github.com/MCSclimate/MCT - fxDONOTUSEurl = https://github.com/MCSclimate/MCT - fxrequired = ToplevelRequired - fxtag = MCT_2.11.0 - [submodule "mpi-serial"] path = libraries/mpi-serial url = https://github.com/ESMCI/mpi-serial @@ -66,7 +59,7 @@ path = components/cam url = https://www.github.com/ESCOMP/CAM fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM - fxtag = cam6_3_162 + fxtag = cam6_4_001 fxrequired = ToplevelRequired [submodule "ww3"] @@ -81,7 +74,7 @@ url = https://github.com/ESCOMP/RTM fxDONOTUSEurl = https://github.com/ESCOMP/RTM fxrequired = ToplevelRequired - fxtag = rtm1_0_79 + fxtag = rtm1_0_80 [submodule "pysect"] path = tools/statistical_ensemble_test/pyCECT @@ -95,14 +88,14 @@ url = https://github.com/ESCOMP/MOSART fxDONOTUSEurl = https://github.com/ESCOMP/MOSART fxrequired = ToplevelRequired - fxtag = mosart1_0_49 + fxtag = mosart1.1.02 [submodule "mizuroute"] path = components/mizuroute url = https://github.com/ESCOMP/mizuRoute fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute fxrequired = ToplevelRequired - fxtag = cesm-coupling.n02_v2.1.2 + fxtag = cesm-coupling.n02_v2.1.3 [submodule "fms"] path = libraries/FMS @@ -123,14 +116,14 @@ url = https://github.com/ESCOMP/CDEPS fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS fxrequired = ToplevelRequired - fxtag = cdeps1.0.37 + fxtag = cdeps1.0.43 [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git fxrequired = ToplevelRequired - fxtag = cmeps0.14.63 + fxtag = cmeps1.0.2 [submodule "cice"] path = components/cice @@ -143,7 +136,7 @@ path = components/cism url = https://github.com/ESCOMP/cism-wrapper.git fxDONOTUSEurl = https://github.com/ESCOMP/cism-wrapper.git - fxtag = cismwrap_2_2_001 + fxtag = cismwrap_2_2_002 fxrequired = ToplevelRequired [submodule "clm"] @@ -151,11 +144,11 @@ url = https://github.com/ESCOMP/CTSM fxDONOTUSEurl = https://github.com/ESCOMP/CTSM fxrequired = ToplevelRequired - fxtag = ctsm5.2.007 + fxtag = ctsm5.2.009 [submodule "mom"] path = components/mom url = https://github.com/ESCOMP/MOM_interface fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface fxrequired = ToplevelRequired - fxtag = mi_240522 + fxtag = mi_240705 diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 743ccd2776..3c1f8c1024 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -39,13 +39,23 @@ - BLT1850_v0c - 1850_CAM%DEV%LT%GHGMAM4_CLM51%BGC-CROP_CICE_MOM6_MOSART_CISM2%GRIS-NOEVOLVE_SWAV + BLT1850 + 1850_CAM70%LT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV - BLTHIST_v0c - HIST_CAM%DEV%LT%GHGMAM4_CLM51%BGC-CROP_CICE_MOM6_MOSART_CISM2%GRIS-NOEVOLVE_SWAV + BLTHIST + HIST_CAM70%LT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + + + + BMT1850 + 1850_CAM70%MT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + + + + BMTHIST + HIST_CAM70%MT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml index 96a25671c8..6f578b60cb 100644 --- a/cime_config/testlist_allactive.xml +++ b/cime_config/testlist_allactive.xml @@ -24,7 +24,7 @@ - + @@ -91,7 +91,7 @@ - + diff --git a/cime_config/testmods_dirs/allactive/defaultio/user_nl_mosart b/cime_config/testmods_dirs/allactive/defaultio/user_nl_mosart index ecd3d1730e..38561d0a19 100644 --- a/cime_config/testmods_dirs/allactive/defaultio/user_nl_mosart +++ b/cime_config/testmods_dirs/allactive/defaultio/user_nl_mosart @@ -1,13 +1,13 @@ !---------------------------------------------------------------------------------- ! Users should add all user specific namelist changes below in the form of ! namelist_var = new_namelist_value -! NOTE: namelist variable rtm_tstep CAN ONLY be changed by modifying the value +! NOTE: namelist variable tstep CAN ONLY be changed by modifying the value ! of the xml variable ROF_NCPL in env_run.xml ! NOTE: if the xml variable RTM_MODE in env_run.xml is set to 'NULL', then ! then rtm will set rtm_present to .false. - and will ignore everything else !---------------------------------------------------------------------------------- -rtmhist_ndens = 1 -rtmhist_nhtfrq =-24 -rtmhist_mfilt = 1 +ndens = 1 +nhtfrq =-24 +mfilt = 1 From f7c3b023a5470789cbb31bc753261600be564ce2 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Mon, 15 Jul 2024 13:26:09 -0600 Subject: [PATCH 2/5] Update for cesm3_0_alpha02a --- .github/workflows/fleximod_test.yaml | 24 ++++ .lib/git-fleximod/CODE_OF_CONDUCT.md | 107 ++++++++++++++++ .lib/git-fleximod/git_fleximod/cli.py | 2 +- .../git-fleximod/git_fleximod/git_fleximod.py | 2 +- .lib/git-fleximod/poetry.lock | 116 +++++++++--------- .lib/git-fleximod/pyproject.toml | 2 +- .lib/git-fleximod/tbump.toml | 2 +- 7 files changed, 193 insertions(+), 62 deletions(-) create mode 100644 .github/workflows/fleximod_test.yaml create mode 100644 .lib/git-fleximod/CODE_OF_CONDUCT.md diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml new file mode 100644 index 0000000000..24bcac95d4 --- /dev/null +++ b/.github/workflows/fleximod_test.yaml @@ -0,0 +1,24 @@ +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] +jobs: + fleximod-test: + runs-on: ubuntu-latest + strategy: + matrix: + # oldest supported and latest supported + python-version: ["3.7", "3.x"] + steps: + - id: checkout-CESM + uses: actions/checkout@v4 + - id: run-fleximod + run: | + $GITHUB_WORKSPACE/bin/git-fleximod update + $GITHUB_WORKSPACE/bin/git-fleximod test +# - name: Setup tmate session +# if: ${{ failure() }} +# uses: mxschmitt/action-tmate@v3 + + diff --git a/.lib/git-fleximod/CODE_OF_CONDUCT.md b/.lib/git-fleximod/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000..84f2925bba --- /dev/null +++ b/.lib/git-fleximod/CODE_OF_CONDUCT.md @@ -0,0 +1,107 @@ +# Contributor Code of Conduct +_The Contributor Code of Conduct is for participants in our software projects and community._ + +## Our Pledge +We, as contributors, creators, stewards, and maintainers (participants), of **git-fleximod** pledge to make participation in +our software, system or hardware project and community a safe, productive, welcoming and inclusive experience for everyone. +All participants are required to abide by this Code of Conduct. +This includes respectful treatment of everyone regardless of age, body size, disability, ethnicity, gender identity or expression, +level of experience, nationality, political affiliation, veteran status, pregnancy, genetic information, physical appearance, race, +religion, or sexual orientation, as well as any other characteristic protected under applicable US federal or state law. + +## Our Standards +Examples of behaviors that contribute to a positive environment include: + +* All participants are treated with respect and consideration, valuing a diversity of views and opinions +* Be considerate, respectful, and collaborative +* Communicate openly with respect for others, critiquing ideas rather than individuals and gracefully accepting criticism +* Acknowledging the contributions of others +* Avoid personal attacks directed toward other participants +* Be mindful of your surroundings and of your fellow participants +* Alert UCAR staff and suppliers/vendors if you notice a dangerous situation or someone in distress +* Respect the rules and policies of the project and venue + +Examples of unacceptable behavior include, but are not limited to: + +* Harassment, intimidation, or discrimination in any form +* Physical, verbal, or written abuse by anyone to anyone, including repeated use of pronouns other than those requested +* Unwelcome sexual attention or advances +* Personal attacks directed at other guests, members, participants, etc. +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Alarming, intimidating, threatening, or hostile comments or conduct +* Inappropriate use of nudity and/or sexual images +* Threatening or stalking anyone, including a participant +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Scope +This Code of Conduct applies to all spaces managed by the Project whether they be physical, online or face-to-face. +This includes project code, code repository, associated web pages, documentation, mailing lists, project websites and wiki pages, +issue tracker, meetings, telecons, events, project social media accounts, and any other forums created by the project team which the +community uses for communication. +In addition, violations of this Code of Conduct outside these spaces may affect a person's ability to participate within them. +Representation of a project may be further defined and clarified by project maintainers. + +## Community Responsibilities +Everyone in the community is empowered to respond to people who are showing unacceptable behavior. +They can talk to them privately or publicly. +Anyone requested to stop unacceptable behavior is expected to comply immediately. +If the behavior continues concerns may be brought to the project administrators or to any other party listed in the +[Reporting](#reporting) section below. + +## Project Administrator Responsibilities +Project administrators are responsible for clarifying the standards of acceptable behavior and are encouraged to model appropriate +behavior and provide support when people in the community point out inappropriate behavior. +Project administrator(s) are normally the ones that would be tasked to carry out the actions in the [Consequences](#consequences) +section below. + +Project administrators are also expected to keep this Code of Conduct updated with the main one housed at UCAR, as listed below in +the [Attribution](#attribution) section. + +## Reporting +Instances of unacceptable behavior can be brought to the attention of the project administrator(s) who may take any action as +outlined in the [Consequences](#consequences) section below. +However, making a report to a project administrator is not considered an 'official report' to UCAR. + +Instances of unacceptable behavior may also be reported directly to UCAR pursuant to [UCAR's Harassment Reporting and Complaint +Procedure](https://www2.fin.ucar.edu/procedures/hr/harassment-reporting-and-complaint-procedure), or anonymously through [UCAR's +EthicsPoint Hotline](https://www2.fin.ucar.edu/ethics/anonymous-reporting). + +Complaints received by UCAR will be handled pursuant to the procedures outlined in UCAR's Harassment Reporting and Complaint +Procedure. +Complaints to UCAR will be held as confidential as practicable under the circumstances, and retaliation against a person who +initiates a complaint or an inquiry about inappropriate behavior will not be tolerated. + +Any Contributor can use these reporting methods even if they are not directly affiliated with UCAR. +The Frequently Asked Questions (FAQ) page for reporting is [here](https://www2.fin.ucar.edu/procedures/hr/reporting-faqs). + +## Consequences +Upon receipt of a complaint, the project administrator(s) may take any action deemed necessary and appropriate under the +circumstances. +Such action can include things such as: removing, editing, or rejecting comments, commits, code, wiki edits, email, issues, and +other contributions that are not aligned to this Code of Conduct, or banning temporarily or permanently any contributor for other +behaviors that are deemed inappropriate, threatening, offensive, or harmful. +Project administrators also have the right to report violations to UCAR HR and/or UCAR's Office of Diversity, Equity and Inclusion +(ODEI), as well as a participant's home institution and/or law enforcement. +In the event an incident is reported to UCAR, UCAR will follow its Harassment Reporting and Complaint Procedure. + +## Process for Changes +All UCAR managed projects are required to adopt this Contributor Code of Conduct. +Adoption is assumed even if not expressly stated in the repository. +Projects should fill in sections where prompted with project-specific information, including, project name and adoption date. + +Projects that adopt this Code of Conduct need to stay up to date with UCAR's Contributor Code of Conduct, linked with a DOI in the +[Attribution](#attribution) section below. +Projects can make limited substantive changes to the Code of Conduct, however, the changes must be limited in scope and may not +contradict the UCAR Contributor Code of Conduct. + +## Attribution +This Code of Conduct was originally adapted from the [Contributor Covenant](http://contributor-covenant.org/version/1/4), version +1.4. +We then aligned it with the UCAR Participant Code of Conduct, which also borrows from the American Geophysical Union (AGU) Code of +Conduct. +The UCAR Participant Code of Conduct applies to both UCAR employees as well as participants in activities run by UCAR. +The original version of this for all software projects that have strong management from UCAR or UCAR staff is available on the UCAR +website at https://doi.org/10.5065/6w2c-a132. +The date that it was adopted by this project was **Feb/13/2018**. +When responding to complaints, UCAR HR and ODEI will do so based on the latest published version. +Therefore, any project-specific changes should follow the [Process for Changes](#process-for-changes) section above. diff --git a/.lib/git-fleximod/git_fleximod/cli.py b/.lib/git-fleximod/git_fleximod/cli.py index a15a226de4..25fce68fdf 100644 --- a/.lib/git-fleximod/git_fleximod/cli.py +++ b/.lib/git-fleximod/git_fleximod/cli.py @@ -2,7 +2,7 @@ import argparse from git_fleximod import utils -__version__ = "0.7.8" +__version__ = "0.7.9" def find_root_dir(filename=".gitmodules"): """ finds the highest directory in tree diff --git a/.lib/git-fleximod/git_fleximod/git_fleximod.py b/.lib/git-fleximod/git_fleximod/git_fleximod.py index e1b8f484a5..ed24c4e753 100755 --- a/.lib/git-fleximod/git_fleximod/git_fleximod.py +++ b/.lib/git-fleximod/git_fleximod/git_fleximod.py @@ -547,7 +547,7 @@ def submodules_test(gitmodules, root_dir): # and that sparse checkout files exist for name in gitmodules.sections(): url = gitmodules.get(name, "url") - fxurl = gitmodules.get(name, "fxDONOTMODIFYurl") + fxurl = gitmodules.get(name, "fxDONOTUSEurl") fxsparse = gitmodules.get(name, "fxsparse") path = gitmodules.get(name, "path") fxurl = fxurl[:-4] if fxurl.endswith(".git") else fxurl diff --git a/.lib/git-fleximod/poetry.lock b/.lib/git-fleximod/poetry.lock index b59ed3942c..3a74effcd1 100644 --- a/.lib/git-fleximod/poetry.lock +++ b/.lib/git-fleximod/poetry.lock @@ -13,13 +13,13 @@ files = [ [[package]] name = "babel" -version = "2.14.0" +version = "2.15.0" description = "Internationalization utilities" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "Babel-2.14.0-py3-none-any.whl", hash = "sha256:efb1a25b7118e67ce3a259bed20545c29cb68be8ad2c784c83689981b7a57287"}, - {file = "Babel-2.14.0.tar.gz", hash = "sha256:6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363"}, + {file = "Babel-2.15.0-py3-none-any.whl", hash = "sha256:08706bdad8d0a3413266ab61bd6c34d0c28d6e1e7badf40a2cebe67644e2e1fb"}, + {file = "babel-2.15.0.tar.gz", hash = "sha256:8daf0e265d05768bc6c7a314cf1321e9a123afc328cc635c18622a2f30a04413"}, ] [package.dependencies] @@ -30,13 +30,13 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "certifi" -version = "2024.2.2" +version = "2024.6.2" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2024.2.2-py3-none-any.whl", hash = "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"}, - {file = "certifi-2024.2.2.tar.gz", hash = "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f"}, + {file = "certifi-2024.6.2-py3-none-any.whl", hash = "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56"}, + {file = "certifi-2024.6.2.tar.gz", hash = "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516"}, ] [[package]] @@ -162,13 +162,13 @@ files = [ [[package]] name = "exceptiongroup" -version = "1.2.0" +version = "1.2.1" description = "Backport of PEP 654 (exception groups)" optional = false python-versions = ">=3.7" files = [ - {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"}, - {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"}, + {file = "exceptiongroup-1.2.1-py3-none-any.whl", hash = "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad"}, + {file = "exceptiongroup-1.2.1.tar.gz", hash = "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"}, ] [package.extras] @@ -225,30 +225,31 @@ smmap = ">=3.0.1,<6" [[package]] name = "gitpython" -version = "3.1.41" +version = "3.1.43" description = "GitPython is a Python library used to interact with Git repositories" optional = false python-versions = ">=3.7" files = [ - {file = "GitPython-3.1.41-py3-none-any.whl", hash = "sha256:c36b6634d069b3f719610175020a9aed919421c87552185b085e04fbbdb10b7c"}, - {file = "GitPython-3.1.41.tar.gz", hash = "sha256:ed66e624884f76df22c8e16066d567aaa5a37d5b5fa19db2c6df6f7156db9048"}, + {file = "GitPython-3.1.43-py3-none-any.whl", hash = "sha256:eec7ec56b92aad751f9912a73404bc02ba212a23adb2c7098ee668417051a1ff"}, + {file = "GitPython-3.1.43.tar.gz", hash = "sha256:35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c"}, ] [package.dependencies] gitdb = ">=4.0.1,<5" [package.extras] -test = ["black", "coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mock", "mypy", "pre-commit", "pytest (>=7.3.1)", "pytest-cov", "pytest-instafail", "pytest-mock", "pytest-sugar", "sumtypes"] +doc = ["sphinx (==4.3.2)", "sphinx-autodoc-typehints", "sphinx-rtd-theme", "sphinxcontrib-applehelp (>=1.0.2,<=1.0.4)", "sphinxcontrib-devhelp (==1.0.2)", "sphinxcontrib-htmlhelp (>=2.0.0,<=2.0.1)", "sphinxcontrib-qthelp (==1.0.3)", "sphinxcontrib-serializinghtml (==1.1.5)"] +test = ["coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mock", "mypy", "pre-commit", "pytest (>=7.3.1)", "pytest-cov", "pytest-instafail", "pytest-mock", "pytest-sugar", "typing-extensions"] [[package]] name = "idna" -version = "3.6" +version = "3.7" description = "Internationalized Domain Names in Applications (IDNA)" optional = false python-versions = ">=3.5" files = [ - {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"}, - {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"}, + {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"}, + {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"}, ] [[package]] @@ -264,22 +265,22 @@ files = [ [[package]] name = "importlib-metadata" -version = "7.0.1" +version = "8.0.0" description = "Read metadata from Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "importlib_metadata-7.0.1-py3-none-any.whl", hash = "sha256:4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e"}, - {file = "importlib_metadata-7.0.1.tar.gz", hash = "sha256:f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc"}, + {file = "importlib_metadata-8.0.0-py3-none-any.whl", hash = "sha256:15584cf2b1bf449d98ff8a6ff1abef57bf20f3ac6454f431736cd3e660921b2f"}, + {file = "importlib_metadata-8.0.0.tar.gz", hash = "sha256:188bd24e4c346d3f0a933f275c2fec67050326a856b9a359881d7c2a697e8812"}, ] [package.dependencies] zipp = ">=0.5" [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] +doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] perf = ["ipython"] -testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] +test = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] [[package]] name = "iniconfig" @@ -294,13 +295,13 @@ files = [ [[package]] name = "jinja2" -version = "3.1.3" +version = "3.1.4" description = "A very fast and expressive template engine." optional = false python-versions = ">=3.7" files = [ - {file = "Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa"}, - {file = "Jinja2-3.1.3.tar.gz", hash = "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90"}, + {file = "jinja2-3.1.4-py3-none-any.whl", hash = "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"}, + {file = "jinja2-3.1.4.tar.gz", hash = "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"}, ] [package.dependencies] @@ -380,24 +381,24 @@ files = [ [[package]] name = "packaging" -version = "23.2" +version = "24.1" description = "Core utilities for Python packages" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"}, - {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"}, + {file = "packaging-24.1-py3-none-any.whl", hash = "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"}, + {file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"}, ] [[package]] name = "pluggy" -version = "1.4.0" +version = "1.5.0" description = "plugin and hook calling mechanisms for python" optional = false python-versions = ">=3.8" files = [ - {file = "pluggy-1.4.0-py3-none-any.whl", hash = "sha256:7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981"}, - {file = "pluggy-1.4.0.tar.gz", hash = "sha256:8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be"}, + {file = "pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669"}, + {file = "pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1"}, ] [package.extras] @@ -406,39 +407,38 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "pyfakefs" -version = "5.3.5" +version = "5.5.0" description = "pyfakefs implements a fake file system that mocks the Python file system modules." optional = false python-versions = ">=3.7" files = [ - {file = "pyfakefs-5.3.5-py3-none-any.whl", hash = "sha256:751015c1de94e1390128c82b48cdedc3f088bbdbe4bc713c79d02a27f0f61e69"}, - {file = "pyfakefs-5.3.5.tar.gz", hash = "sha256:7cdc500b35a214cb7a614e1940543acc6650e69a94ac76e30f33c9373bd9cf90"}, + {file = "pyfakefs-5.5.0-py3-none-any.whl", hash = "sha256:8dbf203ab7bef1529f11f7d41b9478b898e95bf9f3b71262163aac07a518cd76"}, + {file = "pyfakefs-5.5.0.tar.gz", hash = "sha256:7448aaa07142f892d0a4eb52a5ed3206a9f02c6599e686cd97d624c18979c154"}, ] [[package]] name = "pygments" -version = "2.17.2" +version = "2.18.0" description = "Pygments is a syntax highlighting package written in Python." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pygments-2.17.2-py3-none-any.whl", hash = "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c"}, - {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"}, + {file = "pygments-2.18.0-py3-none-any.whl", hash = "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a"}, + {file = "pygments-2.18.0.tar.gz", hash = "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199"}, ] [package.extras] -plugins = ["importlib-metadata"] windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pytest" -version = "8.0.0" +version = "8.2.2" description = "pytest: simple powerful testing with Python" optional = false python-versions = ">=3.8" files = [ - {file = "pytest-8.0.0-py3-none-any.whl", hash = "sha256:50fb9cbe836c3f20f0dfa99c565201fb75dc54c8d76373cd1bde06b06657bdb6"}, - {file = "pytest-8.0.0.tar.gz", hash = "sha256:249b1b0864530ba251b7438274c4d251c58d868edaaec8762893ad4a0d71c36c"}, + {file = "pytest-8.2.2-py3-none-any.whl", hash = "sha256:c434598117762e2bd304e526244f67bf66bbd7b5d6cf22138be51ff661980343"}, + {file = "pytest-8.2.2.tar.gz", hash = "sha256:de4bb8104e201939ccdc688b27a89a7be2079b22e2bd2b07f806b6ba71117977"}, ] [package.dependencies] @@ -446,11 +446,11 @@ colorama = {version = "*", markers = "sys_platform == \"win32\""} exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" packaging = "*" -pluggy = ">=1.3.0,<2.0" -tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} +pluggy = ">=1.5,<2.0" +tomli = {version = ">=1", markers = "python_version < \"3.11\""} [package.extras] -testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] +dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] [[package]] name = "pytz" @@ -465,13 +465,13 @@ files = [ [[package]] name = "requests" -version = "2.31.0" +version = "2.32.3" description = "Python HTTP for Humans." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, - {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, + {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"}, + {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"}, ] [package.dependencies] @@ -643,13 +643,13 @@ files = [ [[package]] name = "urllib3" -version = "2.2.0" +version = "2.2.2" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.8" files = [ - {file = "urllib3-2.2.0-py3-none-any.whl", hash = "sha256:ce3711610ddce217e6d113a2732fafad960a03fd0318c91faa79481e35c11224"}, - {file = "urllib3-2.2.0.tar.gz", hash = "sha256:051d961ad0c62a94e50ecf1af379c3aba230c66c710493493560c0c223c49f20"}, + {file = "urllib3-2.2.2-py3-none-any.whl", hash = "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"}, + {file = "urllib3-2.2.2.tar.gz", hash = "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"}, ] [package.extras] @@ -674,18 +674,18 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [[package]] name = "zipp" -version = "3.17.0" +version = "3.19.2" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false python-versions = ">=3.8" files = [ - {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"}, - {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"}, + {file = "zipp-3.19.2-py3-none-any.whl", hash = "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"}, + {file = "zipp-3.19.2.tar.gz", hash = "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"] +doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] [metadata] lock-version = "2.0" diff --git a/.lib/git-fleximod/pyproject.toml b/.lib/git-fleximod/pyproject.toml index 5b1332549c..52cc26e7a7 100644 --- a/.lib/git-fleximod/pyproject.toml +++ b/.lib/git-fleximod/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "git-fleximod" -version = "0.7.8" +version = "0.7.9" description = "Extended support for git-submodule and git-sparse-checkout" authors = ["Jim Edwards "] maintainers = ["Jim Edwards "] diff --git a/.lib/git-fleximod/tbump.toml b/.lib/git-fleximod/tbump.toml index c4f7ac96ea..b1d08a5611 100644 --- a/.lib/git-fleximod/tbump.toml +++ b/.lib/git-fleximod/tbump.toml @@ -2,7 +2,7 @@ github_url = "https://github.com/jedwards4b/git-fleximod/" [version] -current = "0.7.8" +current = "0.7.9" # Example of a semver regexp. # Make sure this matches current_version before From 6f81dca9f9ce5d39c7269fa267eaa58ac4ce2fad Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Tue, 16 Jul 2024 12:52:49 -0600 Subject: [PATCH 3/5] Update for cesm3_0_alpha02a --- ChangeLog | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/ChangeLog b/ChangeLog index f47223fbb9..40e4886b2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,170 @@ +============================================================== +Tag name: cesm3_0_alpha02a +Originator(s): CSEG +Date: 16 July 2024 +One-line Summary: First set of changes from components in preparation for the science capability freeze. + +components/cam https://github.com/ESCOMP/CAM/cam6_4_001 ** +components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm_cice6_5_0_9 -- +cime https://github.com/ESMCI/cime/tree/cime6.1.0 ** +share https://github.com/ESCOMP/CESM_share/tree/share1.1.2 ** +ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.0 ** +components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.2 ** +components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.43 ** +components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_002 ** +components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.2.009 ** +components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240516 -- +components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.3 ** +components/mom https://github.com/ESCOMP/MOM_interface/mi_240705 ** +components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_1_02 ** +components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_80 ** +components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/ww3i_0.0.2 -- +libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_2 -- + +cam + Cheryl Craig 2024-06-24 - cam6_4_001 - components/cam (cesm3_0_alpha02a) + https://github.com/ESCOMP/CAM/tags/cam6_4_001 + + For Brian Eaton- + + Change cam_dev to CAM7 + + Requires cmeps0.14.67 + + +ccs_config + James Edwards 2024-06-28 - ccs_config_cesm1.0.0 - ccs_config (cesm3_0_alpha02a) + https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config1.1.0 + + fix cmake for github workflow, remove mapping files that are no longer used. + + +cdeps + James Edwards 2024-06-28 - cdeps1.0.43 - components/cdeps (cesm3_0_alpha02a) + https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.43 + + Add dglc + + +cesm + James Edwards 2024-06-26 - cesm3.0-alphabranch - (cesm3_0_alpha02a) + https://github.com/ESCOMP/cesm/tags/cesm3.0-alphabranch + + updates git-fleximod subtree, updates testmods for mosart + + +cime + James Edwards 2024-06-26 - cime6.1.0 - cime (cesm3_0_alpha02a) + https://github.com/ESMCI/cime/tags/cime5.7.0 + + Update Makefile, remove mct from build. + + +cism + James Edwards 2024-06-26 - cismwrap_2_2_002 - components/cism (cesm3_0_alpha02a) + https://github.com/ESCOMP/cism-wrapper/tags/cismwrap_2_2_002 + + GLC->mosart runoff + + +clm + Erik Kluzek 2024-06-28 - ctsm5.2.009 - components/clm (cesm3_0_alpha02a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.009 + + Add support for CAM7 in CTSM. Also allow for "C" and "E" after period in long compset names. + Fix a couple bugs related to these changes. + + Changes answers for the: clm45cam4LndTuningModeZDustSoilErod, clm50cam5LndTuningModeZDustSoilErod + test mods + + This is required for: cam6_4_001 + + + Erik Kluzek 2024-06-06 - ctsm5.2.008 - components/clm (cesm3_0_alpha02a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.008 + + Updates along our temporary branch + + b4b-dev changes: fix prescribed crop calendar test add more checking for it, dust emission to OO + Update git-fleximod + + Hillslope hydrology changes: Changes answer ONLY for hillslope tests + + +cmeps + William Sacks 2024-07-09 - cmeps1.0.2 - src/drivers/nuopc/ (cesm3_0_alpha02a) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.?? + + https://github.com/ESCOMP/CMEPS/pull/481 + + This reverts some of the answer changes that came in with cmeps0.14.71, so ideally this PR will be included in the same CESM alpha tag as cmeps0.14.71, but that isn't critical. + + + James Edwards 2024-07-09 - cmeps1.0.1 - src/drivers/nuopc/ (cesm3_0_alpha02a) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.1 + + Fix for issue with gnu compiler + + + James Edwards 2024-06-26 - cmeps1.0.0 - src/drivers/nuopc/ (cesm3_0_alpha02a) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.0 + + Add support for glc->rtm runoff depends on mosart and cism tags. + + +MCT + James Edwards 2024-06-26 - NONE - libraries/mct (cesm3_0_alpha02a) + https://github.com/MCSclimate/MCT/tags/NONE + + Remove from DB + + +mizuRoute + Erik Kluzek 2024-06-20 - cesm-coupling.n02_v2.1.3 - components/mizuroute (cesm3_0_alpha02a) + https://github.com/ESCOMP/mizuRoute/tags/cesm-coupling.n02_v2.1.3 + + Makefile cleanup, get working on intel-oneapi + Add some new capability for floodplain and other routing methods + + +mom + James Edwards 2024-07-05 - mi_240705 - components/mom (cesm3_0_alpha02a) + https://github.com/ESCOMP/MOM_interface/tags/mi_240705 + + fms library path change + + +mosart + Erik Kluzek 2024-06-20 - mosart1.1.02 - components/mosart (cesm3_0_alpha02a) + https://github.com/ESCOMP/mosart/tags/mosart1.1.02 + + Starts adding capability to receive runoff from CISM directly. + + For the new capability depends on: + CMEPS + CISM + + + James Edwards 2024-06-07 - mosart1.1.01 - components/mosart (cesm3_0_alpha02a) + https://github.com/ESCOMP/mosart/tags/mosart1.1.01 + + Brings in changes from nor-esm + Refactoring and halo update capability + + +rtm + Erik Kluzek 2024-06-21 - rtm1_0_80 - components/rtm (cesm3_0_alpha02a) + https://github.com/ESCOMP/rtm/tags/rtm1_0_80 + + Correct fluxes by area + + +share + James Edwards 2024-06-26 - share1.1.2 - share (cesm3_0_alpha02a) + https://github.com/ESCOMP/CESM_share/tags/share1.1.1 + + Remove mct and other unused code, add nuopc_shr_methods add github action for unit testing + ============================================================== Tag name: cesm3_0_beta01 Originator(s): CSEG From 851865e2bc42fb2876c8c7452c3daf116d222e0c Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Tue, 16 Jul 2024 15:53:23 -0600 Subject: [PATCH 4/5] Update for cesm3_0_alpha02a --- ChangeLog | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40e4886b2c..540de01a7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,14 +36,24 @@ ccs_config James Edwards 2024-06-28 - ccs_config_cesm1.0.0 - ccs_config (cesm3_0_alpha02a) https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config1.1.0 - fix cmake for github workflow, remove mapping files that are no longer used. + ccs_config_cesm1.0.0: Fix cmake for github workflow, remove mapping files that are no longer used. + ccs_config_cesm0.0.113: Fix cmake for github workflow + ccs_config_cesm0.0.112: Add Cidadinho test site + ccs_config_cesm0.0.111: Removal of mapping files that are no longer needed for cism->mosart + ccs_config_cesm0.0.110: Add a PFUNIT for github workflow of cesm_share + ccs_config_cesm0.0.109: Making additions to Depends.nvhpc to enable GPU compilation of clubb code. cdeps James Edwards 2024-06-28 - cdeps1.0.43 - components/cdeps (cesm3_0_alpha02a) https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.43 - Add dglc + cdeps1.0.43: Add dglc + cdeps1.0.42: Fix initialization of dglc import/export pointers + cdeps1.0.41: Add changes to exchange between SOM and WW3DEV. + cdeps1.0.40: Updates the fox build since the directory now always exists + cdeps1.0.39: Allow input of stream on unstructured mesh (e.g. mpas) + cdeps1.0.38: Update stream_definition_datm.xml to include longer time period in files cesm @@ -57,7 +67,13 @@ cime James Edwards 2024-06-26 - cime6.1.0 - cime (cesm3_0_alpha02a) https://github.com/ESMCI/cime/tags/cime5.7.0 - Update Makefile, remove mct from build. + cime6.1.0: Update Makefile, remove mct from build. + cime6.0.251: Remove mct for cesm + cime6.0.250: Remove esmf wrf timemanager + cime6.0.249: Remove broken unsupported tool + cime6.0.248: The xmlchange tool should not raise an exception when a diff is detected. + cime6.0.247: More robust approach to waiting for many threads + cime6.0.246: Remove reference to cice5 and ww3dev, no longer required cism @@ -109,7 +125,21 @@ cmeps James Edwards 2024-06-26 - cmeps1.0.0 - src/drivers/nuopc/ (cesm3_0_alpha02a) https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.0 - Add support for glc->rtm runoff depends on mosart and cism tags. + cmeps1.0.0: Add support for glc->rtm runoff depends on mosart and cism tags. + cmeps0.14.77: Bug fix primarily for usf testing + cmeps0.14.76: New fix for add_gusts + cmeps0.14.75: Bug fix for wav2ocn_map + cmeps0.14.74: Add trigrid capability - ability to run atm and lnd on separate grids + cmeps0.14.73: Add shr_dust_emis_mod to handle options for dust emissions between CTSM and CAM + cmeps0.14.72: Add bilinr_nostd for wav2ice coupling + cmeps0.14.71: Remove negative runoff + cmeps0.14.70: mct_init call is no longer needed + cmeps0.14.69: Fix aoflux for UFS + cmeps0.14.68: Implementation of glc->ocn coupling via going through mosart + cmeps0.14.67: Change CAM%DEV to CAM70 in buildnml + cmeps0.14.66: Replace manage-externals with git-fleximod + cmeps0.14.65: Revert "test github testing in cime PR #4631" + cmeps0.14.64: Test github testing in cime PR #4631 MCT @@ -163,7 +193,10 @@ share James Edwards 2024-06-26 - share1.1.2 - share (cesm3_0_alpha02a) https://github.com/ESCOMP/CESM_share/tags/share1.1.1 - Remove mct and other unused code, add nuopc_shr_methods add github action for unit testing + share1.1.2: Remove mct and other unused code, add nuopc_shr_methods add github action for unit testing + share1.1.1: Add m_MergeSorts from mpeu for sort routines used in cam + share1.1.0: Add GitHub pfunit tests + ============================================================== Tag name: cesm3_0_beta01 From a956168fbaad606822bd3c5109c51852f3633c1e Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Sat, 20 Jul 2024 11:06:09 -0600 Subject: [PATCH 5/5] Switch from CLM51 to CLM60 in the long compset name. --- cime_config/config_compsets.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 3c1f8c1024..162e5e39c4 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -40,22 +40,22 @@ BLT1850 - 1850_CAM70%LT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + 1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV BLTHIST - HIST_CAM70%LT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV BMT1850 - 1850_CAM70%MT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + 1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV BMTHIST - HIST_CAM70%MT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV