diff --git a/.gitmodules b/.gitmodules index 169d3259e4..2022373360 100644 --- a/.gitmodules +++ b/.gitmodules @@ -144,7 +144,8 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git -fxtag = ccs_config_cesm1.0.40_izumi_update0.1 +fxtag = ccs_config_cesm1.0.48 +#fxtag = ccs_config_cesm1.0.40_izumi_update0.1 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git @@ -158,6 +159,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git +#fxtag = cmeps1.1.2 fxtag = cmeps1.0.47 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index a2df7559f7..f0ced80113 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 @@ -225,8 +227,14 @@ 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 atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc @@ -314,6 +322,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/rwills/grids/var-res/ne0np4.NATL.ne30x8/topo/NATL_30_x8_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042.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 @@ -343,6 +353,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 @@ -1985,6 +1997,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 @@ -2375,7 +2389,7 @@ 1 1 3 - + 2 1 2 @@ -3243,6 +3257,8 @@ .true. .true. .true. + .true. + .true. 2 1 diff --git a/ccs_config b/ccs_config index 4051731712..4b5e4eb54d 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 40517317127076c5e772f5eba2599899df6fb527 +Subproject commit 4b5e4eb54d6a0ec7de59065b897d2de2524e0ecf