diff --git a/.gitmodules b/.gitmodules index 0a0c6902..89cb29b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 @@ -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 @@ -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 \ No newline at end of file +fxtag = v0.7.0 \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index aaed28ee..74b4b862 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/ccs_config b/ccs_config index 8fe3339b..02c47069 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 8fe3339bd2b75c2090e06b054972bcd805c9d408 +Subproject commit 02c470697a3107c33aa1fcccdc337bd4a5ad8981 diff --git a/cime b/cime index ffbf6c59..dbca2296 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit ffbf6c596c5736538690af1bc9269d830abcd53c +Subproject commit dbca22967c0971f41c9db3b50e103fe3b38be77e diff --git a/cime_config/namelist_definition_cism.xml b/cime_config/namelist_definition_cism.xml index 59d44f9d..2eace639 100644 --- a/cime_config/namelist_definition_cism.xml +++ b/cime_config/namelist_definition_cism.xml @@ -612,6 +612,24 @@ Sub-elements of each entry include: + + real + cism_config_climate + glad_climate + + 0.0 + + + 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 > 0, else 0. + Fractional values require a coupler (CMEPS) that supports them. + Default: 0.0 + + + logical cism_config_climate @@ -650,7 +668,7 @@ Sub-elements of each entry include: cism_config_history cism_history - 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 + 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 smb artm thk usurf topg diff --git a/cime_config/testdefs/testlist_cism.xml b/cime_config/testdefs/testlist_cism.xml index 4f732404..27d010d4 100644 --- a/cime_config/testdefs/testlist_cism.xml +++ b/cime_config/testdefs/testlist_cism.xml @@ -573,6 +573,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/cism/fractional_ice_covered/README b/cime_config/testdefs/testmods_dirs/cism/fractional_ice_covered/README new file mode 100644 index 00000000..2092389d --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cism/fractional_ice_covered/README @@ -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. diff --git a/cime_config/testdefs/testmods_dirs/cism/fractional_ice_covered/user_nl_cism b/cime_config/testdefs/testmods_dirs/cism/fractional_ice_covered/user_nl_cism new file mode 100644 index 00000000..98aa0b89 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cism/fractional_ice_covered/user_nl_cism @@ -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 diff --git a/cime_config/testdefs/testmods_dirs/cism/gris_powerlaw/README b/cime_config/testdefs/testmods_dirs/cism/gris_powerlaw/README new file mode 100644 index 00000000..cd7e9a14 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cism/gris_powerlaw/README @@ -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 diff --git a/cime_config/testdefs/testmods_dirs/cism/gris_powerlaw/user_nl_cism b/cime_config/testdefs/testmods_dirs/cism/gris_powerlaw/user_nl_cism new file mode 100644 index 00000000..166064f1 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cism/gris_powerlaw/user_nl_cism @@ -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 diff --git a/cime_config/testdefs/testmods_dirs/cism/test_coupling/user_nl_cism b/cime_config/testdefs/testmods_dirs/cism/test_coupling/user_nl_cism index 1e65ec4b..491e9ed7 100644 --- a/cime_config/testdefs/testmods_dirs/cism/test_coupling/user_nl_cism +++ b/cime_config/testdefs/testmods_dirs/cism/test_coupling/user_nl_cism @@ -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 diff --git a/components/cdeps b/components/cdeps index 3f7f22d0..8b51a06b 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit 3f7f22d0426ccc1428a1ebfd4357caf90009132a +Subproject commit 8b51a06b7e1633f640983d619bc9c7d34de34b84 diff --git a/components/clm b/components/clm index 9ec4ef38..be1aff2f 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 9ec4ef38275acb8813e783f2c7e0b30db884c963 +Subproject commit be1aff2f2a3d3374da37760e846c326616f2da49 diff --git a/components/cmeps b/components/cmeps index 567e1845..934d67af 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 567e1845f00e3f8047bb6634eec16ca9f0161f9f +Subproject commit 934d67af9ac62f0e90b846162033acd71c339bcf diff --git a/libraries/FMS b/libraries/FMS index 99a1d4f4..e1ef2091 160000 --- a/libraries/FMS +++ b/libraries/FMS @@ -1 +1 @@ -Subproject commit 99a1d4f46a0e4586c51e8a2f68eb905201b128ff +Subproject commit e1ef2091398e3fea7d23ee4d7839f75179b5a6e4 diff --git a/share b/share index 9aa0b449..f256faa2 160000 --- a/share +++ b/share @@ -1 +1 @@ -Subproject commit 9aa0b449c47f0f22badf27eff2e6fd37ecdd2def +Subproject commit f256faa25edb103f09f3c372d021ea6e1a633516 diff --git a/source_cism b/source_cism index 6f04e11f..5a37db2c 160000 --- a/source_cism +++ b/source_cism @@ -1 +1 @@ -Subproject commit 6f04e11f9667f0f01fbf47e1f2aa6d9fa4f14c88 +Subproject commit 5a37db2cfa15de24af51678c62ce5ddd3f7e2fc6 diff --git a/tools/CUPiD b/tools/CUPiD index e6e62cb4..cf0c57fd 160000 --- a/tools/CUPiD +++ b/tools/CUPiD @@ -1 +1 @@ -Subproject commit e6e62cb4f51fbf01f01d480f01e3c2977a08f157 +Subproject commit cf0c57fd88c689791b38fcf2dcbb5f6d82473ab3