Skip to content

Commit dffdfcd

Browse files
authored
Update externals to match beta05 (#371)
Tag name (required for release branches): sima0_03_001 Originator(s): peverwhee Description (include the issue title, and the keyword ['closes', 'fixes', 'resolves'] followed by the issue number): - Updates externals to match [CESM beta05 tag](https://github.com/ESCOMP/CESM/releases/tag/cesm3_0_beta05) - Add CUPiD external - Adds additional git-fleximod workflow test - Small fix to test_driver.sh to agree with new externals closes #361 Describe any changes made to build system: n/a Describe any changes made to the namelist: n/a List any changes to the defaults for the input datasets (e.g. boundary datasets): n/a List all files eliminated and why: n/a List all files added and what they do: A tools/CUPiD - add new CUPiD submodule List all existing files that have been modified, and describe the changes: (Helpful git command: `git diff --name-status development...<your_branch_name>`) M .github/workflows/fleximod-test.yaml - add new test to confirm what is checked out with git-fleximod matches the expected submodules M .gitmodules - update externals to match beta05 M ccs_config M cime M components/cdeps M components/cism M components/clm M components/cmeps M components/mizuRoute M components/mosart M components/rtm M libraries/FMS M libraries/parallelio M share - submodule updates M test/system/test_driver.sh - Remove `--queue` argument from `testargs` for derecho (to match CAM usage) If there are new failures (compared to the `test/existing-test-failures.txt` file), have them OK'd by the gatekeeper, note them here, and add them to the file. If there are baseline differences, include the test and the reason for the diff. What is the nature of the change? Roundoff? derecho/intel/aux_sima: All NLFAIL due to NUOPC external update derecho/gnu/aux_sima: All NLFAIL due to NUOPC external update If this changes climate describe any run(s) done to evaluate the new climate in enough detail that it(they) could be reproduced: n/a CAM-SIMA date used for the baseline comparison tests if different than latest:
1 parent 16b735a commit dffdfcd

File tree

16 files changed

+45
-27
lines changed

16 files changed

+45
-27
lines changed

.github/workflows/fleximod_test.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ jobs:
44
fleximod-test:
55
runs-on: ubuntu-latest
66
strategy:
7+
fail-fast: false
78
matrix:
89
# oldest supported and latest supported
910
python-version: ["3.8", "3.x"]
@@ -13,6 +14,15 @@ jobs:
1314
- id: run-fleximod
1415
run: |
1516
$GITHUB_WORKSPACE/bin/git-fleximod update
17+
echo
18+
echo "Update complete, checking status"
19+
echo
1620
$GITHUB_WORKSPACE/bin/git-fleximod test
21+
- id: check-cleanliness
22+
run: |
23+
echo
24+
echo "Checking if git fleximod matches expected externals"
25+
echo
26+
git diff --exit-code
1727
1828

.gitmodules

+21-14
Original file line numberDiff line numberDiff line change
@@ -26,49 +26,49 @@
2626
[submodule "ccs_config"]
2727
path = ccs_config
2828
url = https://github.com/ESMCI/ccs_config_cesm.git
29-
fxtag = ccs_config_cesm0.0.106
29+
fxtag = ccs_config_cesm1.0.21
3030
fxrequired = ToplevelRequired
3131
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
3232
[submodule "cdeps"]
3333
path = components/cdeps
3434
url = https://github.com/ESCOMP/CDEPS.git
35-
fxtag = cdeps1.0.34
35+
fxtag = cdeps1.0.61
3636
fxrequired = ToplevelRequired
3737
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
3838
[submodule "cice"]
3939
path = components/cice
4040
url = https://github.com/ESCOMP/CESM_CICE
41-
fxtag = cesm_cice6_5_0_10
41+
fxtag = cesm_cice6_6_0_6
4242
fxrequired = ToplevelRequired
4343
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
4444
[submodule "cime"]
4545
path = cime
4646
url = https://github.com/ESMCI/cime
47-
fxtag = cime6.0.246
47+
fxtag = cime6.1.58
4848
fxrequired = ToplevelRequired
4949
fxDONOTUSEurl = https://github.com/ESMCI/cime
5050
[submodule "cism"]
5151
path = components/cism
5252
url = https://github.com/ESCOMP/CISM-wrapper
53-
fxtag = cismwrap_2_2_001
53+
fxtag = cismwrap_2_2_005
5454
fxrequired = ToplevelRequired
5555
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
5656
[submodule "clm"]
5757
path = components/clm
5858
url = https://github.com/ESCOMP/CTSM
59-
fxtag = ctsm5.2.007
59+
fxtag = ctsm5.3.017
6060
fxrequired = ToplevelRequired
6161
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
6262
[submodule "cmeps"]
6363
path = components/cmeps
6464
url = https://github.com/ESCOMP/CMEPS.git
65-
fxtag = cmeps0.14.67
65+
fxtag = cmeps1.0.33
6666
fxrequired = ToplevelRequired
6767
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
6868
[submodule "fms"]
6969
path = libraries/FMS
7070
url = https://github.com/ESCOMP/FMS_interface
71-
fxtag = fi_240516
71+
fxtag = fi_240828
7272
fxrequired = ToplevelRequired
7373
fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
7474
[submodule "mct"]
@@ -80,30 +80,37 @@
8080
[submodule "mizuRoute"]
8181
path = components/mizuRoute
8282
url = https://github.com/ESCOMP/mizuRoute
83-
fxtag = cesm-coupling.n02_v2.1.2
83+
fxtag = cesm-coupling.n03_v2.2.0
8484
fxrequired = ToplevelRequired
8585
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
8686
[submodule "mosart"]
8787
path = components/mosart
8888
url = https://github.com/ESCOMP/MOSART
89-
fxtag = mosart1_0_49
89+
fxtag = mosart1.1.07
9090
fxrequired = ToplevelRequired
9191
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
9292
[submodule "parallelio"]
9393
path = libraries/parallelio
9494
url = https://github.com/NCAR/ParallelIO
95-
fxtag = pio2_6_2
95+
fxtag = pio2_6_3
9696
fxrequired = ToplevelRequired
9797
fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
9898
[submodule "rtm"]
9999
path = components/rtm
100100
url = https://github.com/ESCOMP/RTM
101-
fxtag = rtm1_0_79
101+
fxtag = rtm1_0_84
102102
fxrequired = ToplevelRequired
103103
fxDONOTUSEurl = https://github.com/ESCOMP/RTM
104104
[submodule "share"]
105105
path = share
106106
url = https://github.com/ESCOMP/CESM_share
107-
fxtag = share1.0.19
107+
fxtag = share1.1.9
108108
fxrequired = ToplevelRequired
109-
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
109+
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
110+
[submodule "tools/CUPiD"]
111+
path = tools/CUPiD
112+
url = https://github.com/NCAR/CUPiD.git
113+
fxtag = v0.1.4
114+
fxrequired = ToplevelRequired
115+
fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git
116+

ccs_config

Submodule ccs_config updated 134 files

cime

Submodule cime updated 115 files

components/cdeps

Submodule cdeps updated 50 files

components/clm

Submodule clm updated 1041 files

components/cmeps

Submodule cmeps updated 41 files

components/mizuRoute

Submodule mizuRoute updated 215 files

libraries/FMS

share

Submodule share updated 75 files

test/system/test_driver.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ if [ "${cesm_test_suite}" != "none" -a -n "${cesm_test_mach}" ]; then
570570
case $hostname in
571571
# derecho
572572
derec* | dec* )
573-
testargs="${testargs} --queue ${CAM_BATCHQ} --test-root ${cesm_testdir} --output-root ${cesm_testdir}"
573+
testargs="${testargs} --test-root ${cesm_testdir} --output-root ${cesm_testdir}"
574574
;;
575575
# casper
576576
casper* | crhtc* )

tools/CUPiD

Submodule CUPiD added at 18c0e37

0 commit comments

Comments
 (0)