diff --git a/cime/config/acme/config_grids.xml b/cime/config/acme/config_grids.xml index 3ce67f709f7a..5b462810bc61 100644 --- a/cime/config/acme/config_grids.xml +++ b/cime/config/acme/config_grids.xml @@ -466,6 +466,20 @@ sooberingoax4x8v1_sooberingoax4x8v1 + + + ne0np4_enax4v1_ne0np4_enax4v1 + a%ne0np4_enax4v1_l%ne0np4_enax4v1_oi%ne0np4_enax4v1_r%r01_m%oRRS18to6_g%null_w%null + enax4v1_enax4v1 + + + + + ne0np4_enax4v1_ne30np4_ne0np4_enax4v1 + a%ne0np4_enax4v1_l%ne30np4_oi%ne0np4_enax4v1_r%r01_m%oRRS18to6_g%null_w%null + enax4v1_ne30_enax4v1 + + ne16np4_ne16np4 ne16_ne16 @@ -1457,6 +1471,20 @@ domain.ocn.conusx4v1_tx0.1v2.141022.nc + + 78788 + 1 + 1-deg with 1/4-deg over Eastern North Atlantic (version 1): + domain.lnd.enax4v1_gx1v6.170523.nc + domain.ocn.enax4v1_gx1v6.170523.nc + domain.lnd.enax4v1_gx1v6.170523.nc + domain.ocn.enax4v1_gx1v6.170523.nc + domain.lnd.enax4v1_oRRS18to6.170621.nc + domain.ocn.enax4v1_oRRS18to6.170621.nc + domain.lnd.enax4v1_oRRS18to6.170621.nc + domain.ocn.enax4v1_oRRS18to6.170621.nc + + 71912 1 @@ -1749,6 +1777,29 @@ cpl/gridmaps/fv0.23x0.31/map_fv0.23x0.31_to_ne240np4_aave_110428.nc + + cpl/cpl6/map_enax4v1_TO_ne30np4_aave.170517.nc + cpl/cpl6/map_enax4v1_TO_ne30np4_aave.170517.nc + cpl/cpl6/map_ne30np4_TO_enax4v1_aave.170517.nc + cpl/cpl6/map_ne30np4_TO_enax4v1_aave.170517.nc + + + + cpl/cpl6/map_enax4v1_TO_gx1v6_aave.170523.nc + cpl/cpl6/map_enax4v1_TO_gx1v6_blin.170523.nc + cpl/cpl6/map_enax4v1_TO_gx1v6_patc.170523.nc + cpl/cpl6/map_gx1v6_TO_enax4v1_aave.170523.nc + cpl/cpl6/map_gx1v6_TO_enax4v1_aave.170523.nc + + + + cpl/cpl6/map_enax4v1_TO_oRRS18to6_aave.170620.nc + cpl/cpl6/map_enax4v1_TO_oRRS18to6_blin.170620.nc + cpl/cpl6/map_enax4v1_TO_oRRS18to6_patc.170620.nc + cpl/cpl6/map_oRRS18to6_TO_enax4v1_aave.170620.nc + cpl/cpl6/map_oRRS18to6_TO_enax4v1_aave.170620.nc + + cpl/gridmaps/T62/map_T62_TO_gx3v7_aave.130322.nc cpl/gridmaps/T62/map_T62_TO_gx3v7_blin.130322.nc diff --git a/cime/src/drivers/mct/cime_config/config_component_acme.xml b/cime/src/drivers/mct/cime_config/config_component_acme.xml index 0198b7eecb1c..3963f49e0cc1 100644 --- a/cime/src/drivers/mct/cime_config/config_component_acme.xml +++ b/cime/src/drivers/mct/cime_config/config_component_acme.xml @@ -279,6 +279,7 @@ 96 144 144 + 96 72 144 288 diff --git a/components/cam/bld/config_files/horiz_grid.xml b/components/cam/bld/config_files/horiz_grid.xml index 86eccd4098be..543dd9910057 100644 --- a/components/cam/bld/config_files/horiz_grid.xml +++ b/components/cam/bld/config_files/horiz_grid.xml @@ -44,5 +44,6 @@ + diff --git a/components/cam/bld/namelist_files/namelist_defaults_cam.xml b/components/cam/bld/namelist_files/namelist_defaults_cam.xml index 36c8a7bed758..290cb47eacca 100644 --- a/components/cam/bld/namelist_files/namelist_defaults_cam.xml +++ b/components/cam/bld/namelist_files/namelist_defaults_cam.xml @@ -26,6 +26,7 @@ 900 600 600 +900 3600 @@ -180,6 +181,9 @@ atm/cam/inic/homme/cami-mam3_0000-01-01_sooberingoax4x8v1np4_L30_c141110.nc atm/cam/inic/homme/cami_0003-01-01_sooberingoax4x8v1np4_L30_ape_c000000.nc + + +atm/cam/inic/homme/cami_0002-01-01_enax4v1_L72_c170706.nc atm/cam/inic/homme/cami_0000-01-01_ne5np8_L26_ape_c061102.nc atm/cam/inic/homme/cami_0000-01-01_ne16np4_L26_ape_c071213.nc @@ -220,6 +224,7 @@ atm/cam/topo/USGS_conusx4v1-tensor12x_consistentSGH_c150924.nc atm/cam/topo/USGS_svalbardx8v1-tensor12x_c150612.nc atm/cam/topo/USGS_sooberingoax4x8v1-tensor12x_c150612.nc +atm/cam/topo/USGS_enax4v1_tensorx12_consistentSGH_170522.nc @@ -708,6 +713,8 @@ atm/cam/chem/trop_mam/atmsrf_conusx4v1.nc atm/cam/chem/trop_mam/atmsrf_svalbardx8v1.nc atm/cam/chem/trop_mam/atmsrf_sooberingoax4x8v1.nc + +atm/cam/chem/trop_mam/atmsrf_enax4v1_170517.nc atm/cam/chem/trop_mozart/dvel/depvel_monthly.nc @@ -1288,6 +1295,7 @@ atm/cam/inic/homme/conusx4v1.g atm/cam/inic/homme/svalbardx8v1.g atm/cam/inic/homme/sooberingoax4x8v1.g +atm/cam/inic/homme/enax4v1.g 2.5e5 1.0e5 @@ -1304,7 +1312,7 @@ 8.0e-8 8.0e-8 8.0e-8 - +8.0e-8 8.0e-8 @@ -1327,7 +1335,7 @@ 8.0e-8 8.0e-8 8.0e-8 - +8.0e-8 2.5e15 1.25e18 @@ -1341,6 +1349,7 @@ 20.0e-8 20.0e-8 20.0e-8 +20.0e-8 2 @@ -1357,6 +1366,7 @@ 7 8 8 +7 1 @@ -1385,6 +1395,7 @@ 4 5 5 +4 5 5 @@ -1398,12 +1409,13 @@ 3.2 3.2 3.2 +3.2 0 0 0 0 - +0 0 @@ -1573,6 +1585,8 @@ share/domains/domain.lnd.ne120np4_gx1v6.111226.nc share/domains/domain.lnd.ne240np4_gx1v6.120125.nc +share/domains/domain.lnd.enax4v1_oRRS18to6.170621.nc + lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc lnd/clm2/snicardata/snicar_drdt_bst_fit_60_c070416.nc @@ -1663,4 +1677,6 @@ share/domains/domain.ocn.ne120np4_gx1v6.111226.nc share/domains/domain.ocn.ne240np4_gx1v6.111226.nc +share/domains/domain.ocn.enax4v1_oRRS18to6.170621.nc + diff --git a/components/cam/cime_config/config_component.xml b/components/cam/cime_config/config_component.xml index 3d52ac4f4100..0abc36dcf821 100644 --- a/components/cam/cime_config/config_component.xml +++ b/components/cam/cime_config/config_component.xml @@ -19,7 +19,7 @@ fv eul - se + se build_component_cam env_build.xml diff --git a/components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml b/components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml index 2f632fcbf01f..e8af5ff294bb 100644 --- a/components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml +++ b/components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml @@ -295,11 +295,11 @@ ic_tod="0" sim_year="2000" glc_nec="0" use_crop=".true." irrigate=".false." >lnd ic_tod="0" sim_year="2000" glc_nec="0" use_crop=".true." irrigate=".true." >lnd/clm2/initdata_map/clmi.ICRUCLM45BGCCROPmp24Irrig.0241-01-01.10x15_USGS_simyr2000_c140111.nc - + lnd/clm2/initdata/clmi.armx8v3.1850-01-01.nc lnd/clm2/initdata_map/clmi.I1850CLM45.conusx4v1.74e105b.clm2.r.0021-01-01-00000.nc lnd/clm2/initdata_map/clmi.ICRUCLM45.conusx4v1.74e105b.clm2.r.0021-01-01-00000.nc - +lnd/clm2/initdata_map/clmi.ICRUCLM45SP.2000-01-01.enax4v1_oRRS18to6_simyr2000_c170621.nc @@ -390,6 +390,10 @@ lnd/clm2/surfdata_map/surfdata_conusx4v1_simyr1850_c160503.nc lnd/clm2/surfdata_map/surfdata_conusx4v1_simyr2000_c160503.nc + + lnd/clm2/surfdata/surfdata_enax4v1_mp24_simyr1850_c170518.nc + + lnd/clm2/surfdata/surfdata_enax4v1_mp24_simyr2000_c170518.nc diff --git a/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml b/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml index 1add00e6b107..e13045a9740a 100644 --- a/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml +++ b/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml @@ -1113,7 +1113,7 @@ CLM run type. +"512x1024,360x720cru,128x256,64x128,48x96,32x64,8x16,94x192,0.23x0.31,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,5x5_amazon,1x1_tropicAtl,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne11np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min,ne0np4_arm_x8v3_lowcon,ne0np4_conus_x4v1_lowcon,ne0np4_enax4v1"> Horizontal resolutions Note: 0.1x0.1, 0.5x0.5, 5x5min, 10x10min, 3x3min and 0.33x0.33 are only used for CLM tools