Skip to content

Commit 050ef18

Browse files
authored
Merge pull request #326 from fischer-ncar/cesm3.0-alphabranch
Fix cice divide by zero and revert gcc for cesm3_0_alpha06d
2 parents b05778e + 50c647b commit 050ef18

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
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.30
33+
fxtag = ccs_config_cesm1.0.31
3434
fxrequired = ToplevelRequired
3535

3636
[submodule "cime"]
@@ -73,7 +73,7 @@
7373
url = https://github.com/ESCOMP/CESM_CICE
7474
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
7575
fxrequired = ToplevelRequired
76-
fxtag = cesm3_cice6_6_0_9
76+
fxtag = cesm3_cice6_6_0_10
7777

7878
[submodule "mom"]
7979
path = components/mom

ChangeLog

+13-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ Originator(s): CSEG
44
Date: 16th March 2025
55
One-line Summary: CICE and NCAR system
66

7-
ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.30 **
7+
ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.31 **
88
cime https://github.com/ESMCI/cime/tree/cime6.1.72 --
99
components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240822 --
1010
share https://github.com/ESCOMP/CESM_share/tree/share1.1.9 --
1111
components/cam https://github.com/ESCOMP/CAM/cam6_4_067 --
1212
components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.3.029 --
13-
components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm3_cice6_6_0_9 **
13+
components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm3_cice6_6_0_10 **
1414
components/mom https://github.com/ESCOMP/MOM_interface/mi_250210 --
1515
components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_006 --
1616
components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.65 --
@@ -37,6 +37,10 @@ https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_cesm1.0.30
3737
ccs_config_cesm1.0.30: Update machine configuration for Casper
3838
ccs_config_cesm1.0.29: Back off intel compiler to 2024.2.1
3939

40+
Chris Fischer 2025-03-22 - ccs_config_cesm1.0.31 - ccs_config (cesm3_0_alpha06d)
41+
https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_cesm1.0.31
42+
Backout gcc update on derecho.
43+
4044
cice
4145
David Bailey 2025-02-20 - cesm3_cice6_6_0_9 - components/cice (cesm3_0_alpha06d)
4246
https://github.com/ESCOMP/CESM_CICE/tags/cesm3_cice6_6_0_7
@@ -51,6 +55,13 @@ Turn off daily history for prescribed mode.
5155
Fix some multi-instance tests.
5256

5357
CUPiD
58+
59+
60+
Chris Fischer 2025-03-21 - cesm3_cice6_6_0_10 - components/cice (cesm3_0_alpha06d)
61+
https://github.com/ESCOMP/CESM_CICE/tags/cesm3_cice6_6_0_10
62+
Fix divide by zero.
63+
64+
5465
Michael Levy 2025-03-07 - v0.2.1 - tools/CUPiD (cesm3_0_alpha06d)
5566
https://github.com/NCAR/CUPiD/tags/v0.2.1
5667
Bugfix for cupid-webpage: new feature allows linking generated webpage to

components/cice

0 commit comments

Comments
 (0)