diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index 1894ef66fa5d..2a724dd74686 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -681,6 +681,16 @@ oEC60to30v3 + + r025 + r025 + r025 + r025 + null + null + oEC60to30v3 + + r0125 r0125 @@ -711,6 +721,16 @@ oRRS18to6v3 + + r025 + r025 + IcoswISC30E3r5 + null + null + null + IcoswISC30E3r5 + + @@ -1376,6 +1396,26 @@ oRRS18to6v3 + + ne120np4.pg2 + r025 + IcoswISC30E3r5 + null + null + null + IcoswISC30E3r5 + + + + ne30np4.pg2 + r025 + IcoswISC30E3r5 + null + null + null + IcoswISC30E3r5 + + ne60np4 ne60np4 @@ -2852,6 +2892,12 @@ r0125 is 1/8 degree river routing grid: + + 1440 + 720 + $DIN_LOC_ROOT/share/domains/domain.lnd.r025_IcoswISC30E3r5.240129.nc + + 28993 1 @@ -3458,6 +3504,22 @@ cpl/gridmaps/ne120pg2/map_ne120pg2_to_r0125_mono.200707.nc + + cpl/gridmaps/ne120pg2/map_ne120pg2_to_r025_traave.20240206.nc + cpl/gridmaps/ne120pg2/map_ne120pg2_to_r025_trfv2.20240206.nc + cpl/gridmaps/ne120pg2/map_ne120pg2_to_r025_esmfbilin.20240206.nc + cpl/gridmaps/ne120pg2/map_r025_to_ne120pg2_traave.20240206.nc + cpl/gridmaps/ne120pg2/map_r025_to_ne120pg2_traave.20240206.nc + + + + cpl/gridmaps/ne120pg2/map_ne30pg2_to_r025_traave.20240206.nc + cpl/gridmaps/ne120pg2/map_ne30pg2_to_r025_trfv2.20240206.nc + cpl/gridmaps/ne120pg2/map_ne30pg2_to_r025_esmfbilin.20240206.nc + cpl/gridmaps/ne120pg2/map_r025_to_ne30pg2_traave.20240206.nc + cpl/gridmaps/ne120pg2/map_r025_to_ne30pg2_traave.20240206.nc + + cpl/gridmaps/ne120np4/map_ne120np4_to_oRRS18to6v3_mono.20200702.nc cpl/gridmaps/ne120np4/map_ne120np4_to_oRRS18to6v3_mono.20200702.nc diff --git a/components/elm/bld/namelist_files/namelist_defaults.xml b/components/elm/bld/namelist_files/namelist_defaults.xml index 4f02fc9df8ac..5389c45ff580 100644 --- a/components/elm/bld/namelist_files/namelist_defaults.xml +++ b/components/elm/bld/namelist_files/namelist_defaults.xml @@ -298,6 +298,8 @@ lnd/clm2/surfdata_map/surfdata_ne256pg2_simyr2010_c230207.nc lnd/clm2/surfdata_map/surfdata_ne1024pg2_simyr2010_c211021.nc lnd/clm2/surfdata_map/surfdata_ne1024np4_simyr2010_c220523.nc + +lnd/clm2/surfdata_map/surfdata_0.25x0.25_simyr2010_c240206_TOP.nc @@ -434,6 +436,8 @@ lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr1850_c211019.nc lnd/clm2/surfdata_map/surfdata_0.125x0.125_simyr1850_c190730.nc lnd/clm2/surfdata_map/surfdata_0.125x0.125_simyr1950_c210924.nc + +lnd/clm2/surfdata_map/surfdata_0.25x0.25_simyr1850_c240125_TOP.nc lnd/clm2/surfdata_map/surfdata_conusx4v1_simyr1850_c160503.nc @@ -2061,6 +2065,39 @@ this mask will have smb calculated over the entire global land surface +lnd/clm2/mappingdata/maps/0.25x0.25/map_0.5x0.5_AVHRR_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_0.5x0.5_MODIS_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_0.9x1.25_GRDC_to_0.25x0.25_nomask_aave_da_c240124.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_10x10min_IGBPmergeICESatGIS_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_10x10min_nomask_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_1km-merge-10min_HYDRO1K-merge-nomask_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_360x720cru_cruncep_to_0.25x0.25_nomask_aave_da_c240124.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_3x3min_GLOBE-Gardner-mergeGIS_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_3x3min_GLOBE-Gardner_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_3x3min_LandScan2004_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_3x3min_MODIS_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_3x3min_USGS_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_5x5min_IGBP-GSDP_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_5x5min_ISRIC-WISE_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_5x5min_nomask_to_0.25x0.25_nomask_aave_da_c240123.nc +lnd/clm2/mappingdata/maps/0.25x0.25/map_0.5x0.5_GSDTG2000_to_0.25x0.25_nomask_aave_da_c240123.nc + lnd/clm2/mappingdata/maps/antarcticax4v1/map_0.5x0.5_AVHRR_to_antarcticax4v1_nomask_aave_da_c210130.nc +"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,ne4np4,ne4np4.pg2,ne11np4,ne16np4,ne30np4,ne30np4.pg2,ne60np4,ne120np4,ne120np4.pg2,ne240np4,ne256np4,ne256np4.pg2,ne1024np4,ne1024np4.pg2,1km-merge-10min,ne0np4_arm_x8v3_lowcon,ne0np4_conus_x4v1_lowcon,ne0np4_enax4v1,ne0np4_twpx4v1,r2,r05,r0125,NLDAS,ne0np4_northamericax4v1.pg2,ne0np4_arcticx4v1.pg2,r025"> Horizontal resolutions Note: 0.1x0.1, 0.5x0.5, 5x5min, 10x10min, 3x3min and 0.33x0.33 are only used for CLM tools diff --git a/components/elm/cime_config/config_compsets.xml b/components/elm/cime_config/config_compsets.xml index 01366aa71dd9..a473f2b4fed9 100644 --- a/components/elm/cime_config/config_compsets.xml +++ b/components/elm/cime_config/config_compsets.xml @@ -129,6 +129,11 @@ 1850_DATM%QIA_ELM%CNPRDCTCBC_SICE_SOCN_MOSART_SGLC_SWAV + + I1850CNPRDCTCBCTOP + 1850_DATM%QIA_ELM%CNPRDCTCBCTOP_SICE_SOCN_MOSART_SGLC_SWAV + + ICB1850CRDCTCBC 1850_SATM_ELM%CRDCTCBC_SICE_SOCN_MOSART_SGLC_SWAV diff --git a/components/mosart/bld/namelist_files/namelist_defaults_mosart.xml b/components/mosart/bld/namelist_files/namelist_defaults_mosart.xml index 9a7c5e4eeaed..1f7e44722127 100644 --- a/components/mosart/bld/namelist_files/namelist_defaults_mosart.xml +++ b/components/mosart/bld/namelist_files/namelist_defaults_mosart.xml @@ -42,12 +42,14 @@ for the CLM data in the CESM distribution rof/mosart/MOSART_global_8th_20180211c.nc +rof/mosart/MOSART_global_qd_20240212.v3.nc rof/mosart/MOSART_global_half_20180721a.nc rof/mosart/MOSART_Global_2deg_antarctica_flowing_to_north_c09162020.nc rof/mosart/MOSART_NLDAS_8th_20160426.nc share/meshes/rof/MOSART_global_8th.scrip.20180211c.nc +share/meshes/rof/SCRIPgrid_0.25x0.25_nomask_c200309.nc share/meshes/rof/SCRIPgrid_0.5x0.5_nomask_c110308.nc share/meshes/rof/SCRIPgrid_2x2_nomask_c210211.nc diff --git a/components/mosart/cime_config/buildnml b/components/mosart/cime_config/buildnml index ba015b01f6a0..90b3b3bb379a 100755 --- a/components/mosart/cime_config/buildnml +++ b/components/mosart/cime_config/buildnml @@ -46,8 +46,8 @@ def buildnml(case, caseroot, compname): # Verify rof grid is supported #-------------------------------------------------------------------- - rof_grid_supported = ("null", "r2", "r05", "r0125", "r01", "NLDAS", "ELM_USRDAT") - expect(rof_grid in rof_grid_supported, "ROF_GRID '{}' is not supported in mosart. Choose from: null, r2, r05, r0125, r01, NLDAS, ELM_USRDAT".format(rof_grid)) + rof_grid_supported = ("null", "r2", "r05", "r025", "r0125", "r01", "NLDAS", "ELM_USRDAT") + expect(rof_grid in rof_grid_supported, "ROF_GRID '{}' is not supported in mosart. Choose from: null, r2, r05, r025, r0125, r01, NLDAS, ELM_USRDAT".format(rof_grid)) #-------------------------------------------------------------------- # Invoke mosart build-namelist - output will go in $CASEBUILD/mosartconf