diff --git a/.gitmodules b/.gitmodules index b85216f992..e5216a7d77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -146,7 +146,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git [submodule "cime"] path = cime url = https://github.com/ESMCI/cime -fxtag = cime6.1.145 +fxtag = cime6.1.155 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/cime diff --git a/cime b/cime index 0fc24bad91..8e2a170e21 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 0fc24bad917f692bce6438d56c573b4e9c7a6ef8 +Subproject commit 8e2a170e2114c2a20dbe972e53914449a1638a90 diff --git a/cime_config/cam.case_setup.py b/cime_config/cam.case_setup.py index e8cb17c5a6..b6c4473ac8 100755 --- a/cime_config/cam.case_setup.py +++ b/cime_config/cam.case_setup.py @@ -21,13 +21,14 @@ logger = logging.getLogger(__name__) -if len(sys.argv) != 3: +if len(sys.argv) != 4: raise SystemExit(f"Incorrect call to {sys.argv[0]}, need CAM root and case root") # end if cam_root = sys.argv[1] case_root = sys.argv[2] +non_local = sys.argv[3] == 'True' -with Case(case_root) as case: +with Case(case_root, non_local=non_local) as case: cam_config = case.get_value('CAM_CONFIG_OPTS') # Gather case information (from _build_usernl_files in case_setup.py) comp_interface = case.get_value("COMP_INTERFACE") diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 47641cba0b..c53e94a5fd 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -84,7 +84,7 @@ - + @@ -1276,7 +1276,7 @@ - + diff --git a/doc/ChangeLog b/doc/ChangeLog index e540b6ad0b..f181c475cf 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,76 @@ + +=============================================================== + +Tag name: cam6_4_144 +Originator(s): alperaltuntas, cacraigucar +Date: Jan 15, 2026 +One-line Summary: Receive and pass --non-local option in cam.case_setup.py +Github PR URL: https://github.com/ESCOMP/CAM/pull/1456 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + - Allow users to create and set up a case on one machine and run on another (this fix enables CAM to do that):no issue made + - update cime external to bring in the change required in it and the fix for multi-instance jobs + +Describe any changes made to build system: N/A + +Describe any changes made to the namelist: N/A + +List any changes to the defaults for the boundary datasets: N/A + +Describe any substantial timing or memory changes: N/A + +Code reviewed by: cacraigucar + +List all files eliminated: N/A + +List all files added and what they do: N/A + +List all existing files that have been modified, and describe the changes: +M .gitmodules +M cime + - update CIME external + +M cime_config/cam.case_setup.py + - mods to support the --non-local option + +M cime_config/testdefs/testlist_cam.xml + - Set timing of GPU tests back to 45 minutes and resume running test + +If there were any failures reported from running test_driver.sh on any test +platform, and checkin with these failures has been OK'd by the gatekeeper, +then copy the lines from the td.*.status files for the failed tests to the +appropriate machine below. All failed tests must be justified. + +derecho/intel/aux_cam: + + ERI_D_Ln18.ne16pg3_ne16pg3_mt232.FHIST_C4.derecho_intel.cam-outfrq3s_eri (Overall: FAIL) details: + FAIL ERI_D_Ln18.ne16pg3_ne16pg3_mt232.FHIST_C4.derecho_intel.cam-outfrq3s_eri COMPARE_base_hybrid + - ERI test discovered a bug in CICE: See: https://github.com/ESCOMP/CESM_CICE/issues/34 + +derecho/nvhpc/aux_cam: + FAIL ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default + -pre-existing failure -- exceeds wallclock time limit + NOTE: Jian has determined this is due to changes on derecho with the the last upgrade. + He has reported the issue to CISL. Note cam6_4_128 is the last CAM tag with + baselines to use for comparison but answer changes are expected starting with + cam6_4_130. + + Check that the end of the cesm_log is: (If not, please report to Jian as CISL is supposed to make a change on derecho) + + deg0020.hsn.de.hpc.ucar.edu 0: calcsize j,iq,jac, lsfrm,lstoo 2 4 2 25 26 + deg0020.hsn.de.hpc.ucar.edu 0: calcsize j,iq,jac, lsfrm,lstoo 2 5 1 19 20 + deg0020.hsn.de.hpc.ucar.edu 0: calcsize j,iq,jac, lsfrm,lstoo 2 5 2 19 20 + deg0020.hsn.de.hpc.ucar.edu 1: Opened file + deg0020.hsn.de.hpc.ucar.edu 1: + ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default.GC.aux_cam_nvhpc_20260108161835.cam.r.1979-01-01-09000.nc + deg0020.hsn.de.hpc.ucar.edu 1: to write 316 + deg0020.hsn.de.hpc.ucar.edu: rank 62 died from signal 15 + +izumi/nag/aux_cam: all BFB + +izumi/gnu/aux_cam: all BFB + +=============================================================== =============================================================== Tag name: cam6_4_143