diff --git a/.gitmodules b/.gitmodules index 9dba021a80..132544a07b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -138,7 +138,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config url = https://github.com/jtruesdal/ccs_config_cesm.git -fxtag = ccs_config_cesm1.0.63_nh.01 +fxtag = ccs_config_cesm1.0.63_nh.02 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/jtruesdal/ccs_config_cesm.git @@ -151,10 +151,10 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime.git [submodule "cmeps"] path = components/cmeps -url = https://github.com/ESCOMP/CMEPS.git -fxtag = cmeps1.1.16 +url = https://github.com/jtruesdal/CMEPS.git +fxtag = cmeps1.1.16.nh.001 fxrequired = ToplevelRequired -fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git +fxDONOTUSEurl = https://github.com/jtruesdal/CMEPS.git [submodule "cdeps"] path = components/cdeps @@ -186,10 +186,10 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE [submodule "clm"] path = components/clm -url = https://github.com/ESCOMP/CTSM -fxtag = alpha-ctsm5.4.CMIP7.09.ctsm5.3.068 +url = https://github.com/jtruesdal/ctsm.git +fxtag = alpha-ctsm5.4.CMIP7.09.ctsm5.3.068.nh.001 fxrequired = ToplevelRequired -fxDONOTUSEurl = https://github.com/ESCOMP/CTSM +fxDONOTUSEurl = https://github.com/jtruesdal/ctsm.git [submodule "fms"] path = libraries/FMS diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 83333e0700..14939757ed 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -32,6 +32,7 @@ 900 450 225 + 100 225 450 225 @@ -2029,6 +2030,7 @@ atm/cam/chem/trop_mam/atmsrf_ne120np4.pg2_200109.nc atm/cam/chem/trop_mam/atmsrf_ne120np4.pg3_c210324.nc atm/cam/chem/trop_mam/atmsrf_ne240np4_110920.nc +atm/cam/chem/trop_mam/atmsrf_ne1024.pg2_260211.nc atm/cam/chem/trop_mam/atmsrf_ne0np4conus30x8_161116.nc atm/cam/chem/trop_mam/atmsrf_ne30x4_ARCTIC_191011.nc @@ -3462,7 +3464,7 @@ 37.5 33 16 - 8 + 8.33333333333333 37.5 18.75 -1 diff --git a/ccs_config b/ccs_config index 1e66646037..6e3570b40b 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 1e66646037660dfbde00a5fa19a114671401702e +Subproject commit 6e3570b40b6b4234bbe1e96d14f78aa19f99eacf diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 7b9b5793f2..71ce7a4996 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -424,6 +424,63 @@ + + + + + -256 + -256 + -256 + -256 + -256 + -256 + + + 1 + 1 + 1 + 1 + 1 + 1 + + + + + + none + + -16 + -16 + -16 + -16 + -16 + -16 + -16 + -16 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + diff --git a/components/clm b/components/clm index 0991175998..449582b620 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 0991175998c94291f3d544169e3a4acb71b0b7f1 +Subproject commit 449582b620a63a27e56bc1dad133b58a74496465 diff --git a/components/cmeps b/components/cmeps index a0735ecdb5..38ce5b4b98 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit a0735ecdb5a3e1150797a8f05ded6e4b6a271b41 +Subproject commit 38ce5b4b98e48d3219f6fc81afef66cdb779bef0