diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index ddb1df949ac3..8dcfd80b9083 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -1160,6 +1160,16 @@ IcoswISC30E3r5 + + ne0np4_eastasiax4v1.pg2 + r025 + IcoswISC30E3r5 + r025 + null + null + IcoswISC30E3r5 + + ne0np4_northamericax4v1.pg2 r0125 @@ -3399,7 +3409,7 @@ 1440 720 - $DIN_LOC_ROOT/share/domains/domain.lnd.r025_IcoswISC30E3r5.240129.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r025_IcoswISC30E3r5.250923.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r025_RRSwISC6to18E3r5.240402.nc r025 is 1/4 degree river routing grid: @@ -3546,7 +3556,15 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_EC30to60E2r2.220428.nc $DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_IcoswISC30E3r5.240416.nc $DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_IcoswISC30E3r5.240416.nc - 1-deg with 1/4-deg over North America (version 1) pg2: + 1-deg with 1/4-deg over North America (version 1) pg2 as described in Tang et al. (2023): + + + + 48864 + 1 + $DIN_LOC_ROOT/share/domains/domain.lnd.eastasiax4v1pg2_IcoswISC30E3r5.250805.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.eastasiax4v1pg2_IcoswISC30E3r5.250805.nc + 1-deg with 1/4-deg over East Asia (version 1) pg2: @@ -4414,6 +4432,16 @@ cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_IcoswISC30E3r5_trfvnp2.20240331.nc + + cpl/gridmaps/eastasiax4v1pg2/map_eastasiax4v1pg2_to_IcoswISC30E3r5_traave.20250805.nc + cpl/gridmaps/eastasiax4v1pg2/map_eastasiax4v1pg2_to_IcoswISC30E3r5_trbilin.20250805.nc + cpl/gridmaps/eastasiax4v1pg2/map_eastasiax4v1pg2_to_IcoswISC30E3r5-nomask_trbilin.20250805.nc + cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_eastasiax4v1pg2_traave.20250805.nc + cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_eastasiax4v1pg2_traave.20250805.nc + cpl/gridmaps/eastasiax4v1pg2/map_eastasiax4v1pg2_to_IcoswISC30E3r5_trfvnp2.20250805.nc + cpl/gridmaps/eastasiax4v1pg2/map_eastasiax4v1pg2_to_IcoswISC30E3r5_trfvnp2.20250805.nc + + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r0125_mono.20200401.nc cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r0125_bilin.20200401.nc @@ -4429,6 +4457,14 @@ cpl/gridmaps/r025/map_r025_to_northamericax4v1pg2_traave.20240331.nc + + cpl/gridmaps/eastasiax4v1pg2/map_eastasiax4v1pg2_to_r025_traave.20250805.nc + cpl/gridmaps/eastasiax4v1pg2/map_eastasiax4v1pg2_to_r025_trfvnp2.20250805.nc + cpl/gridmaps/eastasiax4v1pg2/map_eastasiax4v1pg2_to_r025_trbilin.20250805.nc + cpl/gridmaps/r025/map_r025_to_eastasiax4v1pg2_traave.20250805.nc + cpl/gridmaps/r025/map_r025_to_eastasiax4v1pg2_traave.20250805.nc + + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r0125_mono.20200401.nc cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r0125_bilin.20200401.nc @@ -4445,6 +4481,12 @@ cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r025_trbilin.20240331.nc + + cpl/gridmaps/eastasiax4v1pg2/map_eastasiax4v1pg2_to_r025_traave.20250805.nc + cpl/gridmaps/eastasiax4v1pg2/map_eastasiax4v1pg2_to_r025_trfvnp2.20250805.nc + cpl/gridmaps/eastasiax4v1pg2/map_eastasiax4v1pg2_to_r025_trbilin.20250805.nc + + cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_oARRM60to10_mono.20210407.nc cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_oARRM60to10_mono.20210407.nc diff --git a/cime_config/tests.py b/cime_config/tests.py index 4c3984500dff..47d7ddb7098f 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -390,7 +390,7 @@ "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-wcprod_1850", "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCLSSP370.allactive-wcprodssp", "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCLSSP585.allactive-wcprodssp", - "SMS_Ld1_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.allactive-wcprodrrm_1850", + "SMS_Ld1_P512.northamericax4v1pg2_r025_IcoswISC30E3r5.WCYCL1850.allactive-wcprodrrm_1850", "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.CRYO1850", ) }, diff --git a/components/eam/bld/config_files/horiz_grid.xml b/components/eam/bld/config_files/horiz_grid.xml index 9053a492cda0..9ee6e220a47b 100644 --- a/components/eam/bld/config_files/horiz_grid.xml +++ b/components/eam/bld/config_files/horiz_grid.xml @@ -74,6 +74,8 @@ + + diff --git a/components/eam/bld/namelist_files/namelist_defaults_eam.xml b/components/eam/bld/namelist_files/namelist_defaults_eam.xml index cfd9bf682c8e..5b48403fa3b7 100755 --- a/components/eam/bld/namelist_files/namelist_defaults_eam.xml +++ b/components/eam/bld/namelist_files/namelist_defaults_eam.xml @@ -111,9 +111,12 @@ atm/cam/inic/homme/cami_0003-01-01_arm30x8_L26_ape_c000000.nc atm/cam/inic/homme/cami-mam3_0000-01-01_arm_x8v3_lowcon_np4_L30_c000000.nc atm/cam/inic/homme/cami_0003-01-01_arm_x8v3_lowcon_np4_L26_ape_c000000.nc +atm/cam/inic/homme/v3.LR_mapped_conusx4v1np4-topoadj.eam.i.2010-01-01.nc atm/cam/inic/homme/cami_0002-01-01-00000_conusx4v1np4_L72_c160719.nc atm/cam/inic/homme/cami-mam3_0000-01-01_conusx4v1np4_L30_c141106.nc atm/cam/inic/homme/cami_0003-01-01_conusx4v1np4_L30_ape_c000000.nc +atm/cam/inic/homme/v3.LR_mapped_northamericax4v1np4-topoadj.eam.i.2010-01-01.nc +atm/cam/inic/homme/v3.LR_amip_0101_mapped_eastasiax4v1np4-topoadj.eam.i.1990-01-01-00000.nc atm/cam/inic/homme/cami_0001-01-01_northamericax4v1_c190709.nc atm/cam/inic/homme/cami_mam3_Linoz_0000-01-antarcticax4v1_L72_topoadj_c20200507.nc atm/cam/inic/homme/eam_i_mam4_Linoz_0011-01-arcticx4v1np4_L72_c20220127.nc @@ -152,7 +155,8 @@ atm/cam/topo/USGS_conusx4v1-tensor12x_consistentSGH_c150924.nc atm/cam/topo/USGS_conusx4v1pg2_12x_consistentSGH_20200609.nc atm/cam/topo/USGS_northamericax4v1_12xdel2_consistentSGH_191023.nc -atm/cam/topo/USGS_northamericax4v1pg2_12xdel2_consistentSGH_20020209.nc +atm/cam/topo/USGS-gtopo30_northamericax4v1np4pg2_oroshp_x6t.c20250813.nc +atm/cam/topo/USGS-gtopo30_eastasiax4v1np4pg2_oroshp_x6t.c20250805.nc atm/cam/topo/USGS-gtopo30_antarcticax4v1_12xdel2_consistentSGH_191120.nc atm/cam/topo/USGS_gtopo30_antarcticax4v1pg2_12xdel2_consistentSGH_20200925.nc atm/cam/topo/USGS-gtopo30_arcticx4v1pg2_12xdel2_20210527.nc @@ -728,6 +732,7 @@ atm/cam/chem/trop_mam/atmsrf_conusx4v1pg2_20020609.nc atm/cam/chem/trop_mam/atmsrf_northamericax4v1np4_20191023.nc atm/cam/chem/trop_mam/atmsrf_northamericax4v1pg2_20020209.nc +atm/cam/chem/trop_mam/atmsrf_eastasiax4v1pg2_20250809.nc atm/cam/chem/trop_mam/atmsrf_antarcticax4v1np4_20191127.nc atm/cam/chem/trop_mam/atmsrf_antarcticax4v1pg2_20020925.nc atm/cam/chem/trop_mam/atmsrf_arcticx4v1pg2_20210512.nc @@ -1424,6 +1429,7 @@ 0 0 0 + 0 0 0 0 @@ -1433,6 +1439,7 @@ atm/cam/inic/homme/arm_x8v3_lowcon.g atm/cam/inic/homme/conusx4v1.g atm/cam/inic/homme/northamericax4v1.g +atm/cam/inic/homme/eastasiax4v1.g atm/cam/inic/homme/antarcticax4v1.g atm/cam/inic/homme/arcticx4v1.g atm/cam/inic/homme/svalbardx8v1.g @@ -1450,6 +1457,7 @@ 2e4 1e4 1e5 + 1e5 1e5 1e5 1e5 @@ -1487,6 +1495,7 @@ 150 75 75 + 75 75 75 75 @@ -1514,6 +1523,7 @@ 6 3 + 3 3 3 3 @@ -1522,6 +1532,7 @@ 2 2 + 2 2 2 2 @@ -1566,6 +1577,7 @@ with se_tstep, dt_remap_factor, dt_tracer_factor set to -1 8.0e-8 8.0e-8 8.0e-8 + 8.0e-8 8.0e-8 8.0e-8 8.0e-8 @@ -1587,6 +1599,7 @@ with se_tstep, dt_remap_factor, dt_tracer_factor set to -1 20.0e-8 20.0e-8 20.0e-8 + 20.0e-8 20.0e-8 20.0e-8 20.0e-8 @@ -1598,6 +1611,7 @@ with se_tstep, dt_remap_factor, dt_tracer_factor set to -1 3.2 3.2 3.2 + 3.2 3.2 3.2 3.2 @@ -1641,6 +1655,7 @@ with se_tstep, dt_remap_factor, dt_tracer_factor set to -1 5 4 4 + 4 4 4 5 @@ -1662,6 +1677,7 @@ with se_tstep, dt_remap_factor, dt_tracer_factor set to -1 8 7 7 + 7 7 7 8 diff --git a/components/eam/cime_config/config_component.xml b/components/eam/cime_config/config_component.xml index 785a6469650d..1628d90b9d6b 100755 --- a/components/eam/cime_config/config_component.xml +++ b/components/eam/cime_config/config_component.xml @@ -55,9 +55,6 @@ -bc_dep_to_snow_updates -co2_cycle - - -nlev 72 - &eamv3_phys_defaults; &eamv3_chem_defaults; -scam diff --git a/driver-mct/cime_config/config_component_e3sm.xml b/driver-mct/cime_config/config_component_e3sm.xml index 8fc93b607d46..8864ba81070b 100755 --- a/driver-mct/cime_config/config_component_e3sm.xml +++ b/driver-mct/cime_config/config_component_e3sm.xml @@ -415,6 +415,7 @@ 144 96 48 + 48 48 144 144 diff --git a/driver-mct/cime_config/namelist_definition_drv.xml b/driver-mct/cime_config/namelist_definition_drv.xml index 982acabe64d8..64d05c252ec1 100644 --- a/driver-mct/cime_config/namelist_definition_drv.xml +++ b/driver-mct/cime_config/namelist_definition_drv.xml @@ -1524,6 +1524,7 @@ $EPS_AGRID 3.e-10 + 3.e-10 1.e-10 1.e-10 1.e-10