Skip to content

Katetc/smb cleanup wrapper #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Katetc merged 9 commits into from
Dec 6, 2025
Merged

Katetc/smb cleanup wrapper #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3dfb6fa
Point to new branch for testing
Katetc Oct 16, 2025
9260bb2
Updates from Bill in issue #126
Katetc Oct 28, 2025
334abb9
Updates needed to run gris4 test
Katetc Oct 28, 2025
6ce728a
Update PE layouts to be smaller for Derecho
Katetc Nov 6, 2025
dedd44a
Changed stdout to iulog in CISM, set equal in cism_wrapper init
Katetc Nov 6, 2025
0cff0d9
Changed comments in which_ho_coulomb_c and added btemp_scale parameter
Katetc Nov 6, 2025
ce7fb05
Updated test user_nl to use flow_factor_float instead of flow_factor
Katetc Nov 13, 2025
dba0119
Point to new CISM tag and update submodule
Katetc Dec 5, 2025
e4631a4
Update ChangeLog
Katetc Dec 6, 2025
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[submodule "source_cism"]
path = source_cism
url = https://github.com/ESCOMP/cism
fxtag = cism_main_2.02.002
fxtag = cism_main_2.02.003
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/cism

Expand Down
75 changes: 75 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,81 @@
This file describes what tags were created on master and why
================================================================================

Originator: katetc
Date: December 5, 2025
Version: cismwrap_2_2_012
One-line summary: Support for the new CISM tag cism_main_2.02.003

Purpose of changes:
Support for the new CISM tag cism_main_2.02.003, updates to namelist
options, testing, externals. New CISM source submodule.

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: Yes

Bugs fixed (include github issue number):
- Address CISM-wrapper Issue #126 - Namelist updates for the next cism main tag

Summary of testing:
aux_glc test suite on Derecho for both Intel and Gnu run. Baseline
compared to cismwrap_2_2_011. All tests DIFF with answer changes EXCEPT
the new JK/DGLC test which fails. Possibly due to needed changes in CMEPS
for the new grid and input file.

Expected failure of NCK test still occurs.

New baselines generated for this tag.

aux_glc/derecho/intel:
ERI_Ly10.f10_f10_mg37.I1850Clm50SpG.derecho_intel.cism-isostasy_period4 (Overall: DIFF)
ERI_Ly15.f09_g17_gris4.T1850Gg.derecho_intel.cism-isostasy_period4 (Overall: DIFF)
ERI_Ly44.f09_g17_gris20.T1850Gg.derecho_intel.cism-isostasy_period4 (Overall: DIFF)
ERS_D_Ly3.f09_g17_ais8gris4.T1850Gag.derecho_intel (Overall: DIFF)
ERS_D_Ly3.f09_g17_gris4.T1850Gg.derecho_intel.cism-cmip6_evolving_icesheet (Overall: DIFF)
ERS_D_Ly3.f09_g17_gris4.T1850Gg.derecho_intel.cism-noevolve (Overall: DIFF)
ERS_Ly3_C2_D.f09_g17_gris20.T1850Gg.derecho_intel (Overall: DIFF)
ERS_Ly3.f10_f10_ais8_mg37.I1850Clm50SpGa.derecho_intel (Overall: DIFF)
ERS_Ly3.f10_f10_mg37.I1850Clm50SpG.derecho_intel (Overall: DIFF)
ERS_Ly4.f10_f10_ais8gris4_mg37.I1850Clm50SpGag.derecho_intel (Overall: DIFF)
ERS_Ly5.f09_g17_ais8.T1850Ga.derecho_intel (Overall: DIFF)
ERS_Ly7.f09_g17_gris4.T1850Gg.derecho_intel (Overall: DIFF)
MULTINOAIS_Ly2.f10_f10_ais8gris4_mg37.I1850Clm50SpRsGag.derecho_intel.cism-change_params (Overall: DIFF)
MULTINOGRIS_Ly2.f10_f10_ais8gris4_mg37.I1850Clm50SpRsGag.derecho_intel.cism-change_params (Overall: DIFF)
SMS_D_Ly1.f09_g17_ais8.T1850Ga.derecho_intel (Overall: DIFF)
SMS_D_Ly1.f09_g17_gris4.T1850Gg.derecho_intel.cism-isostasy_period1 (Overall: DIFF)
SMS_D_Ly1.f09_g17_gris4.T1850Gg.derecho_intel (Overall: DIFF)
SMS_Lm13.f10_f10_mg37.I1850Clm50SpG.derecho_intel.cism-noevolve (Overall: DIFF)

SMS_D_Ld5.f10_f10_ais8gris4_mg37.JK1850D.derecho_intel (Overall: FAIL)

aux_glc/derecho/gnu:
ERI_C2_Ly9.f09_g17_ais8gris4.T1850Gag.derecho_gnu (Overall: DIFF)
ERI.f10_f10_mg37.I1850Clm50SpG.derecho_gnu.cism-test_coupling (Overall: DIFF)
ERI_Ly9.f09_g17_ais8gris4.T1850Gag.derecho_gnu.cism-noevolve_ais (Overall: DIFF)
ERS_D_Ld9.f10_f10_mg37.I1850Clm50SpG.derecho_gnu.cism-override_glc_frac (Overall: DIFF)
ERS_Ly11.f09_g17_gris20.T1850Gg.derecho_gnu.cism-oneway (Overall: DIFF)
ERS_Ly11.f09_g17_gris20.T1850Gg.derecho_gnu (Overall: DIFF)
ERS_Ly3.f09_g17_gris4.T1850Gg.derecho_gnu.cism-isostasy_period1 (Overall: DIFF)
ERS_Ly5.f09_g17_gris4.T1850Gg.derecho_gnu.cism-isostasy_period4 (Overall: DIFF)
MCC_Ly3.f09_g17_gris20.T1850Gg.derecho_gnu (Overall: DIFF)
SMS_D_Ld5.f10_f10_ais8gris4_mg37.I1850Clm50SpGag.derecho_gnu.cism-test_coupling (Overall: DIFF)
SMS_D_Ly1.f09_g17_ais8.T1850Ga.derecho_gnu (Overall: DIFF)
SMS_D_Ly1.f09_g17_gris4.T1850Gg.derecho_gnu (Overall: DIFF)

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

Originator: gunterl & katetc
Date: October 10, 2025
Version: cismwrap_2_2_011
Expand Down
48 changes: 24 additions & 24 deletions cime_config/config_pes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@
<pes pesize="any" compset="CISM2">
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
<ntasks_lnd>-8</ntasks_lnd>
<ntasks_rof>-8</ntasks_rof>
<ntasks_ice>-8</ntasks_ice>
<ntasks_ocn>-8</ntasks_ocn>
<ntasks_glc>-8</ntasks_glc>
<ntasks_wav>-8</ntasks_wav>
<ntasks_cpl>-8</ntasks_cpl>
<ntasks_atm>-2</ntasks_atm>
<ntasks_lnd>-2</ntasks_lnd>
<ntasks_rof>-2</ntasks_rof>
<ntasks_ice>-2</ntasks_ice>
<ntasks_ocn>-2</ntasks_ocn>
<ntasks_glc>-2</ntasks_glc>
<ntasks_wav>-2</ntasks_wav>
<ntasks_cpl>-2</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
Expand Down Expand Up @@ -92,14 +92,14 @@
<pes pesize="any" compset="CISM2">
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
<ntasks_lnd>-8</ntasks_lnd>
<ntasks_rof>-8</ntasks_rof>
<ntasks_ice>-8</ntasks_ice>
<ntasks_ocn>-8</ntasks_ocn>
<ntasks_glc>-8</ntasks_glc>
<ntasks_wav>-8</ntasks_wav>
<ntasks_cpl>-8</ntasks_cpl>
<ntasks_atm>-2</ntasks_atm>
<ntasks_lnd>-2</ntasks_lnd>
<ntasks_rof>-2</ntasks_rof>
<ntasks_ice>-2</ntasks_ice>
<ntasks_ocn>-2</ntasks_ocn>
<ntasks_glc>-2</ntasks_glc>
<ntasks_wav>-2</ntasks_wav>
<ntasks_cpl>-2</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
Expand Down Expand Up @@ -134,14 +134,14 @@
<pes pesize="any" compset="CISM2">
<comment>none</comment>
<ntasks>
<ntasks_atm>-2</ntasks_atm>
<ntasks_lnd>-2</ntasks_lnd>
<ntasks_rof>-2</ntasks_rof>
<ntasks_ice>-2</ntasks_ice>
<ntasks_ocn>-2</ntasks_ocn>
<ntasks_glc>-2</ntasks_glc>
<ntasks_wav>-2</ntasks_wav>
<ntasks_cpl>-2</ntasks_cpl>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-1</ntasks_lnd>
<ntasks_rof>-1</ntasks_rof>
<ntasks_ice>-1</ntasks_ice>
<ntasks_ocn>-1</ntasks_ocn>
<ntasks_glc>-1</ntasks_glc>
<ntasks_wav>-1</ntasks_wav>
<ntasks_cpl>-1</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
Expand Down
Loading