Skip to content

Commit 29a2850

Browse files
fischer-ncarfischer-ncar
committed
Merge branch 'cesm3.0-alphabranch'
2 parents 51d7c2d + bf893ae commit 29a2850

File tree

9 files changed

+163
-50
lines changed

9 files changed

+163
-50
lines changed

‎.gitmodules‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
path = ccs_config
3131
url = https://github.com/ESMCI/ccs_config_cesm.git
3232
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
33-
fxtag = ccs_config_cesm1.0.61
33+
fxtag = ccs_config_cesm1.0.63
3434
fxrequired = ToplevelRequired
3535

3636
[submodule "cime"]
3737
path = cime
3838
url = https://github.com/ESMCI/cime
3939
fxDONOTUSEurl = https://github.com/ESMCI/cime
40-
fxtag = cime6.1.127
40+
fxtag = cime6.1.134
4141
fxrequired = ToplevelRequired
4242

4343
[submodule "fms"]
@@ -58,7 +58,7 @@
5858
path = components/cam
5959
url = https://www.github.com/ESCOMP/CAM
6060
fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM
61-
fxtag = cam6_4_116
61+
fxtag = cam6_4_126
6262
fxrequired = ToplevelRequired
6363

6464
[submodule "clm"]
@@ -86,22 +86,22 @@
8686
path = components/cism
8787
url = https://github.com/ESCOMP/cism-wrapper.git
8888
fxDONOTUSEurl = https://github.com/ESCOMP/cism-wrapper.git
89-
fxtag = cismwrap_2_2_010
89+
fxtag = cismwrap_2_2_011
9090
fxrequired = ToplevelRequired
9191

9292
[submodule "cdeps"]
9393
path = components/cdeps
9494
url = https://github.com/ESCOMP/CDEPS
9595
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS
9696
fxrequired = ToplevelRequired
97-
fxtag = cdeps1.0.81
97+
fxtag = cdeps1.0.82
9898

9999
[submodule "cmeps"]
100100
path = components/cmeps
101101
url = https://github.com/ESCOMP/CMEPS.git
102102
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
103103
fxrequired = ToplevelRequired
104-
fxtag = cmeps1.1.17
104+
fxtag = cmeps1.1.21
105105

106106
[submodule "rtm"]
107107
path = components/rtm

‎ChangeLog‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,149 @@
1+
==============================================================
2+
Tag name: cesm3_0_alpha07f
3+
Originator(s): CSEG
4+
Date: 20th Oct. 2025
5+
One-line Summary: CAM answer changes.
6+
7+
ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.63 **
8+
cime https://github.com/ESMCI/cime/tree/cime6.1.134 **
9+
components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_250428 --
10+
share https://github.com/ESCOMP/CESM_share/tree/share1.1.9 --
11+
components/cam https://github.com/ESCOMP/CAM/cam6_4_126 **
12+
components/clm https://github.com/ESCOMP/ctsm/tree/alpha-ctsm5.4.CMIP7.09.ctsm5.3.068--
13+
components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm3_cice6_6_1_6 --
14+
components/mom https://github.com/ESCOMP/MOM_interface/mi_250519 --
15+
components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_011 **
16+
components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.82 **
17+
components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.1.21 **
18+
components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_89 --
19+
components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/main_0.0.18 --
20+
components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.v3.0.0 --
21+
components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_1_12 --
22+
libraries/mpi-serial https://github.com/ESMCI/mpi-serial/tree/MPIserial_2.5.0 --
23+
libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_6 --
24+
tools/CUPiD https://github.com/NCAR/CUPiD/tree/v0.3.1 --
25+
26+
27+
cam
28+
Cheryl Craig 2025-10-16 - cam6_4_126 - components/cam (cesm3_0_alpha07f)
29+
https://github.com/ESCOMP/CAM/tags/cam6_4_126
30+
31+
Fix frontogenesis function bug and change CISM2 to SGLC in FCHIST_GC compset
32+
33+
- answer changing for CAM and WACCM SE dycore tests
34+
35+
36+
Brian Eaton 2025-10-09 - cam6_4_125 - components/cam (cesm3_0_alpha07f)
37+
https://github.com/ESCOMP/CAM/tags/cam6_4_125
38+
39+
remove unicon; remove -ocn option to configure
40+
41+
42+
Courtney Peverley 2025-10-09 - cam6_4_124 - components/cam (cesm3_0_alpha07f)
43+
https://github.com/ESCOMP/CAM/tags/cam6_4_124
44+
45+
Update atmospheric_physics and ccs_config externals to fix GPU test
46+
47+
48+
Cheryl Craig 2025-09-30 - cam6_4_123 - components/cam (cesm3_0_alpha07f)
49+
https://github.com/ESCOMP/CAM/tags/cam6_4_124
50+
51+
Various misc CAM fixes
52+
53+
54+
Cheryl Craig 2025-09-30 - cam6_4_122 - components/cam (cesm3_0_alpha07f)
55+
https://github.com/ESCOMP/CAM/tags/cam6_4_122
56+
57+
For Francis Vitt
58+
59+
Prescribed MAM5 volcanic forcings
60+
61+
62+
Cheryl Craig 2025-09-30 - cam6_4_121 - components/cam (cesm3_0_alpha07f)
63+
https://github.com/ESCOMP/CAM/tags/cam6_4_121
64+
65+
Fixes for input interpolation routines (aircraft runs only)
66+
67+
68+
Courtney Peverley 2025-09-25 - cam6_4_120 - components/cam (cesm3_0_alpha07f)
69+
https://github.com/ESCOMP/CAM/tags/cam6_4_120
70+
71+
for haipeng lin -
72+
Complete CCPPization of HB PBL scheme and vertical diffusion solver (non-WACCM)
73+
74+
75+
Courtney Peverley 2025-09-25 - cam6_4_119 - components/cam (cesm3_0_alpha07f)
76+
https://github.com/ESCOMP/CAM/tags/cam6_4_119
77+
78+
RRTMGP SW CCPP interface integration into CAM
79+
80+
81+
Cheryl Craig 2025-09-24 - cam6_4_118 - components/cam (cesm3_0_alpha07f)
82+
https://github.com/ESCOMP/CAM/tags/cam6_4_118
83+
84+
Use relative path for emission files
85+
86+
Answer changing for tags which use the emission files
87+
88+
89+
ccs_config
90+
Chris Fischer 2025-10-20 - ccs_config_cesm1.0.63 - ccs_config (cesm3_0_alpha07f)
91+
https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_cesm1.0.63
92+
93+
ccs_config_cesm1.0.63: Update Casper module version and add a missing PUMAS GPU code.
94+
ccs_config_cesm1.0.62: Adding the necessary change to recognize the new Greenland 4 km grid.
95+
96+
97+
cdeps
98+
Chris Fischer 2025-10-20 - cdeps1.0.82 - components/cdeps (cesm3_0_alpha07f)
99+
https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.82
100+
101+
DGLC grid updates for new gris4 mesh
102+
103+
104+
cime
105+
Chris Fischer 2025-10-20 - cime6.1.134 - cime (cesm3_0_alpha07f)
106+
https://github.com/ESMCI/cime/tags/cime6.1.134
107+
108+
cime6.1.34:
109+
cime6.1.134: Fix for create_clone issue
110+
cime6.1.133: Support for archiving directories
111+
cime6.1.132: Fix wrong GPU test configuration on Casper
112+
cime6.1.130: Fix check of resource_nodes
113+
cime6.1.129: Fix log message and error check in _set_restart_interval
114+
115+
116+
Erik Kluzek 2025-10-08 - cime6.1.128 - cime (cesm3_0_alpha07f)
117+
https://github.com/ESMCI/cime/tags/cime6.1.128
118+
119+
Fix unresolved values in workflow
120+
121+
122+
cism
123+
Kate Thayer-Calder 2025-10-10 - cismwrap_2_2_011 - components/cism (cesm3_0_alpha07f)
124+
https://github.com/ESCOMP/cism-wrapper/tags/cismwrap_2_2_011
125+
126+
New files for the Greenland 4km grid (gris4) and some support to use DGLC in Cism-wrapper
127+
128+
Needs ccs_config_cesm1.0.62
129+
Needs cdeps1.0.82
130+
131+
132+
133+
cmeps
134+
Chris Fischer 2025-10-20 - cmeps1.1.21 - src/drivers/nuopc/ (cesm3_0_alpha07f)
135+
https://github.com/ESCOMP/CMEPS/tags/cmeps1.1.21
136+
137+
Add one more barrier at end of run.
138+
139+
Erik Kluzek 2025-10-08 - cmeps1.1.20 - src/drivers/nuopc/ (cesm3_0_alpha07f)
140+
https://github.com/ESCOMP/CMEPS/tags/cmeps1.1.20
141+
142+
cmeps1.1.20: Wrap call of buildnml in readonly context
143+
cmeps1.1.19: Change of CPL_ALBAV for MOM6 and other cleanup (changes answers for C and G compsets)
144+
cmeps1.1.18: Fix gust factors (changes answers for CAMDEV)
145+
146+
1147
==============================================================
2148
Tag name: cesm3_0_alpha07e
3149
Originator(s): CSEG

‎ccs_config‎

‎cime‎

‎cime_config/config_pes.xml‎

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,12 @@
180180
</rootpe>
181181
</pes>
182182
<pes pesize="L" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
183-
<comment>13.9 ypd/ 5300 pe-hrs/simyr expected</comment>
183+
<comment>12.25 ypd/ 6763 pe-hrs/simyr expected</comment>
184184
<ntasks>
185185
<ntasks_atm>2700</ntasks_atm>
186-
<ntasks_lnd>1280</ntasks_lnd>
186+
<ntasks_lnd>2700</ntasks_lnd>
187187
<ntasks_rof>1280</ntasks_rof>
188-
<ntasks_ice>1772</ntasks_ice>
188+
<ntasks_ice>2700</ntasks_ice>
189189
<ntasks_ocn>640</ntasks_ocn>
190190
<ntasks_glc>116</ntasks_glc>
191191
<ntasks_wav>116</ntasks_wav>
@@ -204,47 +204,14 @@
204204
<rootpe>
205205
<rootpe_atm>0</rootpe_atm>
206206
<rootpe_lnd>0</rootpe_lnd>
207-
<rootpe_rof>896</rootpe_rof>
208-
<rootpe_ice>1280</rootpe_ice>
207+
<rootpe_rof>0</rootpe_rof>
208+
<rootpe_ice>0</rootpe_ice>
209209
<rootpe_ocn>2816</rootpe_ocn>
210210
<rootpe_glc>2700</rootpe_glc>
211211
<rootpe_wav>2700</rootpe_wav>
212212
<rootpe_cpl>0</rootpe_cpl>
213213
</rootpe>
214214
</pes>
215-
<pes pesize="L" compset="CAM.*%LT.*MOM6%[^_]*MARBL-BIO">
216-
<comment>13.9 ypd/ 8000 pe-hrs/simyr expected</comment>
217-
<ntasks>
218-
<ntasks_atm>2700</ntasks_atm>
219-
<ntasks_lnd>896</ntasks_lnd>
220-
<ntasks_rof>32</ntasks_rof>
221-
<ntasks_ice>1772</ntasks_ice>
222-
<ntasks_ocn>1908</ntasks_ocn>
223-
<ntasks_glc>32</ntasks_glc>
224-
<ntasks_wav>32</ntasks_wav>
225-
<ntasks_cpl>2700</ntasks_cpl>
226-
</ntasks>
227-
<nthrds>
228-
<nthrds_atm>1</nthrds_atm>
229-
<nthrds_lnd>1</nthrds_lnd>
230-
<nthrds_rof>1</nthrds_rof>
231-
<nthrds_ice>1</nthrds_ice>
232-
<nthrds_ocn>1</nthrds_ocn>
233-
<nthrds_glc>1</nthrds_glc>
234-
<nthrds_wav>1</nthrds_wav>
235-
<nthrds_cpl>1</nthrds_cpl>
236-
</nthrds>
237-
<rootpe>
238-
<rootpe_atm>0</rootpe_atm>
239-
<rootpe_lnd>0</rootpe_lnd>
240-
<rootpe_rof>896</rootpe_rof>
241-
<rootpe_ice>928</rootpe_ice>
242-
<rootpe_ocn>2700</rootpe_ocn>
243-
<rootpe_glc>896</rootpe_glc>
244-
<rootpe_wav>896</rootpe_wav>
245-
<rootpe_cpl>0</rootpe_cpl>
246-
</rootpe>
247-
</pes>
248215
<pes pesize="M" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
249216
<comment>10 ypd/ 5500 pe-hrs/simyr expected</comment>
250217
<ntasks>

‎components/cam‎

Submodule cam updated 83 files

‎components/cdeps‎

‎components/cism‎

‎components/cmeps‎

0 commit comments

Comments
 (0)