diff --git a/.gitmodules b/.gitmodules index a14a9f2090..a843f4a9a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -188,7 +188,8 @@ 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 +fxtag = ctsm5.4.003 +#fxtag = alpha-ctsm5.4.CMIP7.09.ctsm5.3.068 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CTSM diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 75acdede44..1e65e9ea36 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -25,6 +25,8 @@ 225 450 225 +450 +225 1800 @@ -220,6 +222,8 @@ atm/cam/inic/se/ape_cam5_ne120np4_L30_c170419.nc atm/cam/inic/se/F2000climo_ne120pg3_mt13_01-01-00000_c200420.nc atm/cam/inic/se/ape_cam6_ne120np4_L32_c170908.nc +/glade/work/aherring/grids/uniform-res/ne120np4.pg3/inic/betacast_ERA5ml_20100101_ne120np4_L58_c260225.nc +/glade/work/aherring/grids/uniform-res/ne120np4.pg3/inic/betacast_ERA5ml_20100101_ne120np4_L93_c260225.nc atm/waccm/ic/fx2000_ne120pg3L273.001.cam.i.0002-01-01-00000.noBRCL_c250522.nc atm/cam/inic/homme/cami_1850-01-01_ne240np4_L26_c110314.nc @@ -234,8 +238,18 @@ atm/waccm/ic/FW2000_CONUS_30x8_L70_01-01-0001_c200602.nc atm/cam/inic/se/FHIST_ARCTIC_ne30x4_mt12_1979bc-mg3_01-01-00000_c200424.nc - atm/cam/inic/se/FHIST_ARCTICGRIS_ne30x8_mt12_1979bc-mg3_01-01-00000_c200428.nc +/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_L32_c250620.nc +/glade/work/aherring/grids/var-res/ne0np4.CONUS.ne30x8/inic/betacast_ERA5ml_20200101_CONUS_c250617.nc +/glade/work/aherring/grids/var-res/ne0np4.ARCTIC.ne30x4/inic/betacast_ERA5ml_20200101_ARCTIC_c250617.nc +/glade/work/aherring/grids/var-res/ne0np4.ARCTICGRIS.ne30x8/inic/betacast_ERA5ml_20200101_ARCTICGRIS_c250617.nc +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20200101_POLARCAP_c250322.nc +/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_L58_c250618.nc +/glade/work/aherring/grids/var-res/ne0np4.CONUS.ne30x8/inic/betacast_ERA5ml_20100101_CONUS_ne30x8_L93_c260225.nc +/glade/work/aherring/grids/var-res/ne0np4.ARCTIC.ne30x4/inic/betacast_ERA5ml_20100101_ARCTIC_ne30x4_L93_c260225.nc +/glade/work/aherring/grids/var-res/ne0np4.ARCTICGRIS.ne30x8/inic/betacast_ERA5ml_20100101_ARCTICGRIS_ne30x8_L93_c260225.nc +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20100101_POLARCAP_ne30x4_L93_c260225.nc +/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20100101_NATL_ne30x8_L93_c260225.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc @@ -327,6 +341,8 @@ atm/cam/topo/se/ne30x8_CONUS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/se/ne30x4_ARCTIC_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/topo/POLARCAP_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20250322.nc +/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/topo/NATL.ne30x8_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20260225.nc atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc @@ -361,6 +377,8 @@ atm/cam/coords/ne0np4EQFACE.ne5x4.g atm/cam/coords/ne30x4_EXODUS_ARCTIC_c191009.g atm/cam/coords/ne30x8_EXODUS_ARCTICGRIS_c191209.g +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/grids/POLARRES_ne30x4_EXODUS.nc +/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/grids/NATL_ne30x8_EXODUS.nc none @@ -2043,6 +2061,8 @@ atm/cam/chem/trop_mam/atmsrf_ne0np4conus30x8_161116.nc atm/cam/chem/trop_mam/atmsrf_ne30x4_ARCTIC_191011.nc atm/cam/chem/trop_mam/atmsrf_ne30x8_ARCTICGRIS_191212.nc +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/atmsrf/atmsrf_POLARCAP_250322.nc +/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/atmsrf/atmsrf_ne0np4.NATL.ne30x8_201109.nc atm/cam/chem/trop_mam/atmsrf_C24_c200625.nc atm/cam/chem/trop_mam/atmsrf_C48_c200625.nc @@ -2433,7 +2453,7 @@ 1 1 3 - + 2 1 2 @@ -3224,21 +3244,29 @@ 18 18 30 + 2 + + 1 + 3 + 3 + 2 + 4 + 20 + 60 + 4 + 2 + 4 + 2 + 4 + 40 + 180 + 10 + 3 + 3 + 6 + 6 + 6 - 1 - 3 - 3 - 2 - 4 - 20 - 60 - 4 - 2 - 4 - 2 - 4 - 40 - 180 1 2 @@ -3293,33 +3321,46 @@ .true. .true. .true. + .true. + .true. 2 1 - 3 - 3 - 2 - 3 - 3 + 3 + 3 + 2 + 3 + 3 4 - 2 - 4 - 4 - 5 - 10 - - 7 - 10 - - 3 - 3 - 2 - 2 - 4 - 2 - 3 - 5 + 2 + 4 + 4 + 5 + 10 + 7 + 10 + 8 + 3 + 3 + 4 + 4 + 4 + + 3 + 3 + 2 + 2 + 4 + 2 + 3 + 5 + 3 + 6 + 6 + 5 + 5 + 5 -1 -1 diff --git a/components/clm b/components/clm index 0991175998..98067b4314 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 0991175998c94291f3d544169e3a4acb71b0b7f1 +Subproject commit 98067b43147f62bc0fee7dedabc67763a061e166