Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,49 @@
[submodule "source_cism"]
path = source_cism
url = https://github.com/ESCOMP/cism
fxtag = cism_main_3.00.002
fxtag = cism_main_3.00.003
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/cism

[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime.git
fxtag = cime6.1.169
fxtag = cime6.8.4
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/cime.git

[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.79
fxtag = ccs_config_cesm1.0.98
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.1.42
fxtag = cmeps1.1.76
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS
fxtag = cdeps1.0.93
fxtag = cdeps1.0.113
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS

[submodule "share"]
path = share
url = https://github.com/ESCOMP/CESM_share
fxtag = share1.1.19
fxtag = share1.1.22
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share

[submodule "ctsm"]
path = components/clm
url = https://github.com/ESCOMP/CTSM.git
fxtag = ctsm5.4.027
fxtag = ctsm5.4.063
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM.git

Expand Down Expand Up @@ -74,7 +74,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/FTorch_interface
[submodule "fms"]
path = libraries/FMS
url = https://github.com/ESCOMP/FMS_interface
fxtag = fi_250428
fxtag = fi_260310
fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
fxrequired = ToplevelRequired

Expand All @@ -83,4 +83,4 @@ fxrequired = ToplevelRequired
url = https://github.com/NCAR/CUPiD.git
fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git
fxrequired = ToplevelRequired
fxtag = v0.5.1
fxtag = v0.7.0
92 changes: 92 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,98 @@
This file describes what tags were created on master and why
================================================================================

Originator: katetc, wlipscomb, claude
Date: Nov 12, 2026
Version: cismwrap_3_0_003
One-line summary: Add support for cism_main_3.00.003 and update
externals to mostly match cesm3_0_alpha11e

Purpose of changes:
The new cism_main_3.00.003 tag includes the CISM PRs #97 and #98. These
add diagnostics and fixes to improve water conservation in coupled runs,
including allowing fractional ice coverage through the mediator (CMEPS tag
1.1.76) and adding excess positive smb to runoff. There is also a one line
change to CMakeLists.txt to support builds on some machines. This CISM-
Wrapper tag includes two new tests and updated externals to the alpha11e
set plus the cmeps1.1.76 version.

Standalone checkout supported in this tag (Yes/No): Yes
(If yes, this implies that we expect to be able to build and run a
case from a standalone checkout using git-fleximod, and for this
to continue to work long-term. The answer may be "No" if the set of
externals pointed to by manage_externals is broken, or if at least
one external points to a temporary branch that is may be deleted in
the near future.)

If No: Notes on externals used for testing:

Changes answers relative to previous tag: Nearly all baselines DIFF due to changes
in externals. Plus, small changes from the GLAD ocean-mask fix
(cold starts only) and from rofi, which now includes positive SMB not
applied by CISM (2-5 Gt/yr for Greenland). New h0a history files and new
fields in the namelists, so baseline comparisons will show namelist and
history differences.

Bugs fixed (include github issue number):
https://github.com/ESCOMP/CISM-wrapper/issues/151
partially: https://github.com/ESCOMP/CISM-wrapper/issues/145

Summary of testing:
aux_glc test suite on Derecho for both Intel and Gnu run. Baseline compared to cismwrap_3_0_002

Test FAIL documented in CISM-Wrapper issue 148
https://github.com/ESCOMP/CISM-wrapper/issues/148
ERI_Ly10.f10_f10_mg37.I1850Clm50SpG.derecho_intel.cism-isostasy_period4 (Overall: FAIL)

NCK_Ly3.f09_g17_gris20.T1850Gg.derecho_gnu (Overall: FAIL) details:
** Expected failure ** See https://github.com/ESCOMP/CISM-wrapper/issues/110

Short test where CISM history is turned off:
ERS_D_Ld9.f10_f10_mg37.I1850Clm50SpG.derecho_gnu.cism-override_glc_frac (Overall: NLFAIL) details:

All other tests DIFF with answer changes.

ERI_C2_Ly9.f09_g17_ais8gris4.T1850Gag.derecho_gnu (Overall: DIFF) details:
ERI.f10_f10_mg37.I1850Clm50SpG.derecho_gnu.cism-test_coupling (Overall: DIFF) details:
ERI_Ly9.f09_g17_ais8gris4.T1850Gag.derecho_gnu.cism-noevolve_ais (Overall: DIFF) details:
ERP_Ly5.f09_g17_ais8.T1850Ga.derecho_gnu.cism-norenormal (Overall: DIFF) details:
ERS_D_Ld9.f10_f10_mg37.I1850Clm50SpG.derecho_gnu.cism-override_glc_frac (Overall: DIFF) details:
ERS_Ly11.f09_g17_gris20.T1850Gg.derecho_gnu.cism-oneway (Overall: DIFF) details:
ERS_Ly11.f09_g17_gris20.T1850Gg.derecho_gnu (Overall: DIFF) details:
ERS_Ly23.f09_g17_ais8.T1850Ga.derecho_gnu.cism-tavg_history (Overall: DIFF) details:
ERS_Ly3.f09_g17_gris4.T1850Gg.derecho_gnu.cism-isostasy_period1 (Overall: DIFF) details:
**NEW TEST NO BASELINE**ERS_Ly5.f09_g17_gris4.I1850Clm50SpG.derecho_gnu.cism-fractional_ice_covered (Overall: DIFF)
ERS_Ly5.f09_g17_gris4.T1850Gg.derecho_gnu.cism-isostasy_period4 (Overall: DIFF) details:
MCC_Ly3.f09_g17_gris20.T1850Gg.derecho_gnu (Overall: DIFF) details:
SMS_D_Ld5.f10_f10_ais8gris4_mg37.I1850Clm50SpGag.derecho_gnu.cism-test_coupling (Overall: DIFF) details:
SMS_D_Ly1.f09_g17_ais8.T1850Ga.derecho_gnu (Overall: DIFF) details:
SMS_D_Ly1.f09_g17_gris4.T1850Gg.derecho_gnu (Overall: DIFF) details:

ERI_Ly15.f09_g17_gris4.T1850Gg.derecho_intel.cism-isostasy_period4 (Overall: DIFF) details:
ERI_Ly44.f09_g17_gris20.T1850Gg.derecho_intel.cism-isostasy_period4 (Overall: DIFF) details:
ERP_Ly4.f09_g17_gris4.T1850Gg.derecho_intel.cism-norenormal (Overall: DIFF) details:
ERS_D_Ly3.f09_g17_ais8gris4.T1850Gag.derecho_intel (Overall: DIFF) details:
ERS_D_Ly3.f09_g17_gris4.T1850Gg.derecho_intel.cism-cmip6_evolving_icesheet (Overall: DIFF) details:
ERS_Ly23.f09_g17_gris4.T1850Gg.derecho_intel.cism-tavg_history (Overall: DIFF) details:
ERS_Ly3_C2_D.f09_g17_gris20.T1850Gg.derecho_intel (Overall: DIFF) details:
**NEW TEST NO BASELINE** ERS_Ly3.f09_g17_gris4.T1850Gg.derecho_intel.cism-gris_powerlaw (Overall: DIFF)
ERS_Ly3.f10_f10_ais8_mg37.I1850Clm50SpGa.derecho_intel (Overall: DIFF) details:
ERS_Ly3.f10_f10_mg37.I1850Clm50SpG.derecho_intel (Overall: DIFF) details:
ERS_Ly4.f10_f10_ais8gris4_mg37.I1850Clm50SpGag.derecho_intel (Overall: DIFF) details:
ERS_Ly5.f09_g17_ais8.T1850Ga.derecho_intel (Overall: DIFF) details:
ERS_Ly7.f09_g17_gris4.T1850Gg.derecho_intel (Overall: DIFF) details:
MULTINOAIS_Ly2.f10_f10_ais8gris4_mg37.I1850Clm50SpRsGag.derecho_intel.cism-change_params (Overall: DIFF) details:
MULTINOGRIS_Ly2.f10_f10_ais8gris4_mg37.I1850Clm50SpRsGag.derecho_intel.cism-change_params (Overall: DIFF) details:
SMS_D_Ld5.f10_f10_ais8gris4_mg37.JK1850D.derecho_intel (Overall: DIFF) details:
SMS_D_Ly1.f09_g17_ais8.T1850Ga.derecho_intel (Overall: DIFF) details:
SMS_D_Ly1.f09_g17_gris4.T1850Gg.derecho_intel.cism-isostasy_period1 (Overall: DIFF) details:
SMS_D_Ly1.f09_g17_gris4.T1850Gg.derecho_intel (Overall: DIFF) details:
SMS_Lm13.f10_f10_mg37.I1850Clm50SpG.derecho_intel.cism-noevolve (Overall: DIFF) details:

Note: Baselines are now stored in /glade/campaign/cesm/development/liwg/cesm_baselines

================================================================================

Originator: katetc
Date: Oct 9, 2026
Version: cismwrap_3_0_002
Expand Down
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 179 files
20 changes: 19 additions & 1 deletion cime_config/namelist_definition_cism.xml
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,24 @@ Sub-elements of each entry include:
</desc>
</entry>

<entry id="ice_covered_thck_scale">
<type>real</type>
<category>cism_config_climate</category>
<group>glad_climate</group>
<values>
<value>0.0</value>
</values>
<desc>
Thickness scale (m) for the ice-covered fraction sent to the coupler.
If greater than 0, ice_covered = min(1, thck/ice_covered_thck_scale), so that
cells with thin ice are treated as partly ice-covered. This reduces water
conservation errors from cells holding only a trace of ice.
If 0, ice_covered = 1 where thck &gt; 0, else 0.
Fractional values require a coupler (CMEPS) that supports them.
Default: 0.0
</desc>
</entry>

<entry id="zero_gcm_fluxes">
<type>logical</type>
<category>cism_config_climate</category>
Expand Down Expand Up @@ -650,7 +668,7 @@ Sub-elements of each entry include:
<category>cism_config_history</category>
<group>cism_history</group>
<values>
<value cism_evolve_this_icesheet=".true." >smb artm thk usurf topg uvel vvel temp bmlt bwat beta_internal floating_mask grounded_mask bpmp acab_applied bmlt_applied calving_rate iareaf iareag imass imass_above_flotation total_smb_flux total_bmb_flux total_calving_flux total_gl_flux ice_sheet_mask ice_cap_mask</value>
<value cism_evolve_this_icesheet=".true." >smb artm thk usurf topg uvel vvel temp bmlt bwat beta_internal floating_mask grounded_mask bpmp acab_applied bmlt_applied calving_rate iareaf iareag imass imass_above_flotation total_smb_flux total_bmb_flux total_calving_flux total_gl_flux ice_sheet_mask ice_cap_mask acab_cpl_tavg acab_applied_tavg acab_unapplied_glad_tavg acab_unapplied_tavg total_smb_flux_tavg total_smb_cpl_flux_tavg total_smb_unapplied_glad_flux_tavg total_smb_unapplied_flux_tavg</value>
<value cism_evolve_this_icesheet=".false.">smb artm thk usurf topg</value>
</values>
<desc>
Expand Down
22 changes: 22 additions & 0 deletions cime_config/testdefs/testlist_cism.xml
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,28 @@
</machines>
</test>

<test name="ERS_Ly5" grid="f09_g17_gris4" compset="I1850Clm50SpG" testmods="cism-fractional_ice_covered">
<machines>
<machine name="derecho" compiler="gnu" category="aux_glc">
<options>
<option name="wallclock">0:50:00</option>
<option name="comment">Exact restart test with a fractional ice coverage applied to the ice sheet margins in order to improve conservation in a coupled simulation.</option>
</options>
</machine>
</machines>
</test>

<test name="ERS_Ly3" grid="f09_g17_gris4" compset="T1850Gg" testmods="cism-gris_powerlaw">
<machines>
<machine name="derecho" compiler="intel" category="aux_glc">
<options>
<option name="wallclock">0:50:00</option>
<option name="comment">Exact restart test with the Greenland settings of the CESM3 coupled runs: power-law sliding with a basal friction coefficient from an inversion, read from a CISM restart file.</option>
</options>
</machine>
</machines>
</test>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we include the CMEPS and other externals updates in CISM-Wrapper with these changes (which I'm find with doing) then we could add the fractional_ice_covered test at the same time. I think that's a good idea. Do you want me to make this change or do you want to do it?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Katetc, I'll defer to Claude. Claude writes:

I'd suggest Kate updates the externals and adds the test, for two reasons:

  • She knows the compatible set. Moving CMEPS to a version with Allow fractional ice_covered values in the lnd2glc downscaling CMEPS#720 may mean moving cime, cdeps or the share code together with it, and choosing a consistent set of tags is her area. Getting that wrong would cost more time than the change itself.
  • The test entry is small and goes with the externals. It's one testlist_cism.xml entry using the existing cism/fractional_ice_covered testmod (for example, ERS_Ly5.f09_g17_gris4.T1850Gg.derecho_intel.cism-fractional_ice_covered). It belongs in the same commit, because it only works once CMEPS has #720. If she'd rather not write it, I can draft the exact entry for her.

Points worth mentioning to her:

  • Keep the default at ice_covered_thck_scale = 0 for now. CESM uses its own top-level externals, not CISM-wrapper's. If the wrapper default became 4.0 while CESM's CMEPS lacks #720, CESM runs would stop with the range-check error. The planned follow-up (default 4.0, plus a testmod for 0) waits until CESM's own CMEPS includes #720.
  • The CESM baseline will change. With new externals, the Stage 1 results no longer serve as the baseline, since other components may change answers. After her commit, I'd rerun the full aux_glc suite with her externals to make the new reference baseline, then repeat the Stage 2 CESM checks against it.

Effect on Stage 2: small. The six subsets running now use the current externals and still show whether each Stage 2 PR is BFB for the CISM code. After Kate's update, I'll:

  1. rebase the Stage 2 wrapper branches onto her updated lipscomb/smb_fixes;
  2. run the full suite with her externals (new baseline);
  3. rerun the per-PR subsets against it (each about an hour, all in parallel).

By Stage 2, Claude is referring to the next step, where we divide ESCOMP/CISM#94 into six smaller PRs and implement those PRs on top of ESCOMP/CISM#97.

<test name="ERI_Ly9" grid="f09_g17_ais8gris4" compset="T1850Gag" testmods="cism-noevolve_ais">
<machines>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
This testmod sets ice_covered_thck_scale = 4.0, so that CISM sends the coupler a
fractional ice_covered field, min(1, thck/4 m), instead of a binary (0 or 1) field.
This tests the coupling of fractional ice cover (lnd -> glc downscaling in CMEPS,
and the land-model glacier fractions), including exact restart.
It requires a CMEPS version that supports fractional ice_covered values.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
! Send a fractional ice_covered field to the coupler: ice_covered = min(1, thck/4 m)
! Requires a CMEPS version that supports fractional ice_covered values.
ice_covered_thck_scale = 4.0
8 changes: 8 additions & 0 deletions cime_config/testdefs/testmods_dirs/cism/gris_powerlaw/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
This testmod uses the Greenland ice sheet settings of the CESM3 alpha11d coupled runs
(e.g., b.e30_alpha11d.B1850_MTso.ne30_t233_wgx3.419): power-law basal sliding
(which_ho_babc = 9) with a spatially varying friction coefficient (which_ho_powerlaw_c = 2)
obtained by inversion in a standalone spin-up. The coefficient and the initial ice sheet
state are read from a CISM restart file of a coupled run (in inputdata, cesm2_init).

Intended for Greenland ice sheet tests at 4 km (gris4), e.g.
ERS_Ly3.f09_g17_gris4.T1850Gg.derecho_intel.cism-gris_powerlaw
16 changes: 16 additions & 0 deletions cime_config/testdefs/testmods_dirs/cism/gris_powerlaw/user_nl_cism
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
! Greenland settings of the CESM3 alpha11d coupled runs (b.e30_alpha11d.B1850_MTso.ne30_t233_wgx3.419-422):
! power-law sliding with the basal friction coefficient powerlaw_c from an inversion,
! read from the CISM restart file of run b.e30_alpha11b.B1850C_MTso.ne30_t233_wgx3.416 (year 21).
cisminputfile = '$DIN_LOC_ROOT/cesm2_init/b.e30_alpha11b.B1850C_MTso.ne30_t233_wgx3.416/0021-01-01/b.e30_alpha11b.B1850C_MTso.ne30_t233_wgx3.416.cism.gris.r.0021-01-01-00000.nc'
which_ho_babc = 9
which_ho_powerlaw_c = 2
which_ho_bwat = 0
which_ho_effecpress = 0
glissade_maxiter = 100
block_inception = .false.
remove_ice_caps = .false.
thck_gradient_ramp = 100.
pmp_offset = 10.
beta_powerlaw_umax = 5000.
pseudo_plastic_q = 0.25
p_ocean_penetration = 0.5
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ test_coupling = .true.
! This is needed to give CISM history output in the (typically short)
! tests that are done with this testmod directory
history_option = 'coupler'

! This allows for fractional ice coverage at the icesheet margins which
! reduces the amount of unapplied smb to much smaller amounts. This is
! important for water conservation in CESM3 and should be tested regularly
ice_covered_thck_scale = 4.0
2 changes: 1 addition & 1 deletion components/clm
Submodule clm updated 654 files
2 changes: 1 addition & 1 deletion components/cmeps
Submodule cmeps updated 109 files
2 changes: 1 addition & 1 deletion libraries/FMS
Submodule FMS updated 2 files
+1 −1 .gitmodules
+1 −1 src
2 changes: 1 addition & 1 deletion share
Submodule share updated from 9aa0b4 to f256fa
2 changes: 1 addition & 1 deletion tools/CUPiD
Submodule CUPiD updated 42 files
+1 −0 Contributors.md
+115 −34 cime_config/config_tool.xml
+194 −0 cupid/consistency_check.py
+17 −32 cupid/run_remapping.py
+31 −50 cupid/run_timeseries.py
+177 −314 cupid/timeseries.py
+3 −0 cupid/util.py
+20 −11 cupid_utils/cupid_utils/ice/plot_diff.py
+28 −14 cupid_utils/cupid_utils/ice/vect_diff.py
+2 −0 cupid_utils/cupid_utils/multi_component/__init__.py
+25 −6 cupid_utils/cupid_utils/multi_component/spatial_means.py
+17 −0 docs/generated/cupid.git_helper.rst
+12 −0 docs/generated/cupid.read.rst
+1 −0 environments/cupid-analysis.yml
+3 −0 environments/cupid-infrastructure.yml
+47 −34 examples/intermediary_outputs/config.yml
+42 −33 examples/key_metrics/config.yml
+1 −1 externals/ADF
+1 −1 externals/LDF
+75 −30 helper_scripts/cesm_postprocessing.sh
+67 −7 helper_scripts/find_enddates.py
+24 −25 helper_scripts/generate_adf_config_file.py
+283 −106 helper_scripts/generate_cupid_config_for_cesm_case.py
+32 −31 helper_scripts/generate_ilamb_config_files.py
+30 −28 helper_scripts/generate_ldf_config_file.py
+16 −19 nblibrary/atm/ADF.ipynb
+5 −4 nblibrary/atm/CVDP.ipynb
+87 −114 nblibrary/atm/Global_PSL_NMSE_compare_obs_lens.ipynb
+0 −265 nblibrary/atm/Global_TS_RESTOM_tseries.ipynb
+46 −42 nblibrary/atm/TimeSeriesPlots.ipynb
+227 −180 nblibrary/glc/Greenland_SMB_visual_compare_obs.ipynb
+236 −128 nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb
+1,016 −515 nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb
+26 −10 nblibrary/infrastructure/summary_tables.ipynb
+0 −247 nblibrary/lnd/Global_Land_Compare_Two_Cases.ipynb
+143 −147 nblibrary/lnd/Global_TerrestrialCouplingIndex_VisualCompareObs.ipynb
+11 −29 nblibrary/lnd/ILAMB.ipynb
+16 −29 nblibrary/lnd/LDF.ipynb
+5 −0 nblibrary/ocn/Global_Ocean_Surface.ipynb
+21 −31 nblibrary/rof/global_discharge_gauge_compare_obs.ipynb
+19 −31 nblibrary/rof/global_discharge_ocean_compare_obs.ipynb
+1 −0 pyproject.toml