From 58d7094e23b93b9d6d5a52dc19f4653abef3d6f7 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Mon, 15 Dec 2025 11:18:25 -0700 Subject: [PATCH 1/7] Receive and pass --non-local option in cam.case_setup.py During case.setup, receive the value of --non-local option from cime and use it to instantiate the Case object. --- cime_config/cam.case_setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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") From c6d7415cfa833f3799fa002a718bf237f0fd133a Mon Sep 17 00:00:00 2001 From: mvdebolskiy <80036033+mvdebolskiy@users.noreply.github.com> Date: Fri, 10 Apr 2026 13:42:28 +0200 Subject: [PATCH 2/7] Update cime_config/cam.case_setup.py Co-authored-by: goldy <1588651+gold2718@users.noreply.github.com> --- cime_config/cam.case_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/cam.case_setup.py b/cime_config/cam.case_setup.py index b6c4473ac8..200895272e 100755 --- a/cime_config/cam.case_setup.py +++ b/cime_config/cam.case_setup.py @@ -22,7 +22,7 @@ logger = logging.getLogger(__name__) if len(sys.argv) != 4: - raise SystemExit(f"Incorrect call to {sys.argv[0]}, need CAM root and case root") + raise SystemExit(f"Incorrect call to {sys.argv[0]}, need CAM root, case root, and non-local passed as arguments") # end if cam_root = sys.argv[1] case_root = sys.argv[2] From f142242f6c70f5884c619af77b5fda7a783766c1 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Wed, 15 Apr 2026 21:40:09 +0200 Subject: [PATCH 3/7] new cmip7 ndep files --- bld/namelist_files/namelist_defaults_cam.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 894c57f452..61f97c2d16 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -2024,8 +2024,8 @@ atm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_ESMFmesh_cdf5_c20251211.nc lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc -atm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-1-2_gn_185001-202212_c20251222.nc -lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.ncatm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-1-2_gn_185001-185012-clim_c20251222.nc +atm/ndep/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-2-0_gn_185001-202212_cdf5_c20260409.nc +lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.ncatm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-2-0_gn_185001-185012-clim_cdf5_c20260409.nc 2000 1850 From 96ee6f0c760bf53da77fd6e36389ae71d8660aac Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 16 Apr 2026 10:33:14 +0200 Subject: [PATCH 4/7] fixed problem with new ndep file specification --- bld/namelist_files/namelist_defaults_cam.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 61f97c2d16..61da259e08 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -2024,8 +2024,9 @@ atm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_ESMFmesh_cdf5_c20251211.nc lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc -atm/ndep/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-2-0_gn_185001-202212_cdf5_c20260409.nc -lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.ncatm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-2-0_gn_185001-185012-clim_cdf5_c20260409.nc +lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc +atm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-2-0_gn_185001-202212_cdf5_c20260409.nc +atm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-2-0_gn_185001-185012-clim_cdf5_c20260409.nc 2000 1850 From f6783513f089704534b30f92462bffe9023bb2e8 Mon Sep 17 00:00:00 2001 From: Steve Goldhaber Date: Wed, 22 Apr 2026 18:51:43 +0200 Subject: [PATCH 5/7] Merge up to noresm3_0_029_cam6_4_121 --- .gitmodules | 16 ++++++++-------- ccs_config | 2 +- components/clm | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 465f591653..d27f689b37 100644 --- a/.gitmodules +++ b/.gitmodules @@ -178,14 +178,14 @@ [submodule "ccs_config"] path = ccs_config url = https://github.com/NorESMhub/ccs_config_noresm.git - fxtag = ccs_config_noresm0.0.53 + fxtag = ccs_config_noresm0.0.63 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NorESMhub/ccs_config_noresm.git [submodule "cime"] path = cime url = https://github.com/NorESMhub/cime.git - fxtag = cime6.1.73_noresm_v1 + fxtag = cime6.1.73_noresm_v2 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NorESMhub/cime.git @@ -196,7 +196,7 @@ [submodule "share"] path = share url = https://github.com/NorESMHub/NorESM_share - fxtag = share1.1.9_noresm_v0 + fxtag = share1.1.18_noresm_v0 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NorESMHub/NorESM_share @@ -207,34 +207,34 @@ [submodule "cdeps"] path = components/cdeps url = https://github.com/NorESMHub/CDEPS.git - fxtag = cdeps1.0.70_noresm_v7 + fxtag = cdeps1.0.88_noresm_v1 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NorESMHub/CDEPS.git [submodule "cice6"] path = components/cice url = https://github.com/NorESMhub/NorESM_CICE - fxtag = noresm_cice6_6_0_20250522_v2 + fxtag = noresm_cice6_6_1_20251129_v2 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NorESMhub/NorESM_CICE [submodule "clm"] path = components/clm url = https://github.com/NorESMhub/CTSM - fxtag = ctsm5.3.045_noresm_v13 + fxtag = ctsm5.4.002_noresm_v6 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NorESMhub/CTSM [submodule "cmeps"] path = components/cmeps url = https://github.com/NorESMhub/CMEPS.git - fxtag = cmeps1.0.39_noresm_v8 + fxtag = cmeps1.1.41_noresm_v0 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NorESMhub/CMEPS.git [submodule "mosart"] path = components/mosart url = https://github.com/NorESMhub/MOSART - fxtag = mosart1.1.12_noresm_v0 + fxtag = mosart1.1.12_noresm_v2 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NorESMhub/MOSART diff --git a/ccs_config b/ccs_config index 1a4df56b62..227e8d8bf5 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 1a4df56b62700bc4484ed9b33f02cefb14d3dd60 +Subproject commit 227e8d8bf5ec54bb0d650768deda0c5b5abf0b25 diff --git a/components/clm b/components/clm index 77e76a761f..2109041b95 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 77e76a761f5ea62a889403b645de1ee767ac7249 +Subproject commit 2109041b9583bcdf05b00c7008305fe049bca104 From db00a790b55c15a2fb60f03cfbca9bb160a61eaf Mon Sep 17 00:00:00 2001 From: mvdebolskiy <80036033+mvdebolskiy@users.noreply.github.com> Date: Wed, 22 Apr 2026 21:11:40 +0200 Subject: [PATCH 6/7] Update cime tag, since wrong one was deleted. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index d27f689b37..5a62a71da6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -185,7 +185,7 @@ [submodule "cime"] path = cime url = https://github.com/NorESMhub/cime.git - fxtag = cime6.1.73_noresm_v2 + fxtag = cime6.1.173_noresm_v0 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NorESMhub/cime.git From f8baffda49b6a0af26da5705b62dd17067e6b5b4 Mon Sep 17 00:00:00 2001 From: Matvey Debolskiy Date: Wed, 22 Apr 2026 21:21:09 +0200 Subject: [PATCH 7/7] fix submodules --- .gitmodules | 2 +- ccs_config | 2 +- cime | 2 +- components/cdeps | 2 +- components/cice | 2 +- components/cmeps | 2 +- components/mosart | 2 +- share | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5a62a71da6..2e7b47f54a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -178,7 +178,7 @@ [submodule "ccs_config"] path = ccs_config url = https://github.com/NorESMhub/ccs_config_noresm.git - fxtag = ccs_config_noresm0.0.63 + fxtag = ccs_config_noresm0.0.65 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NorESMhub/ccs_config_noresm.git diff --git a/ccs_config b/ccs_config index 227e8d8bf5..d10fe9aec6 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 227e8d8bf5ec54bb0d650768deda0c5b5abf0b25 +Subproject commit d10fe9aec6e2cdfe476e1820c088e90158d5fca5 diff --git a/cime b/cime index bcb1e73944..a34f3575c7 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit bcb1e73944258a19e7909ef75206017daa56c7b6 +Subproject commit a34f3575c745d561500f8f9d7ac76c9b6d364a36 diff --git a/components/cdeps b/components/cdeps index 24369b135b..0cbed5b51d 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit 24369b135b100d8c6a0816012b5ed0a79d6c9703 +Subproject commit 0cbed5b51d9f9a47cc86fa5ab7c9ae7b397fee8f diff --git a/components/cice b/components/cice index dea02f9375..fd9ff7a5c9 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit dea02f937542b573a594a21a95843238966064ba +Subproject commit fd9ff7a5c9deb7349f6bd1ec4095d68aff6b5a77 diff --git a/components/cmeps b/components/cmeps index 257b47a6e2..b16528e9cd 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 257b47a6e2da88ad57d2d0668968fdfa3bc229cc +Subproject commit b16528e9cd641a7e3991d37ea54fd04b10950d59 diff --git a/components/mosart b/components/mosart index a150d66335..052ece95a9 160000 --- a/components/mosart +++ b/components/mosart @@ -1 +1 @@ -Subproject commit a150d663358e067208a52cbef7fc6c4f0e37f02e +Subproject commit 052ece95a941ed8f25c825e1b78ee68b327b6039 diff --git a/share b/share index 34eeb88622..aebd536217 160000 --- a/share +++ b/share @@ -1 +1 @@ -Subproject commit 34eeb88622d5edaa6ff8629604d33e908acd4feb +Subproject commit aebd536217e42fb3dd35d98159019578ca440e1b