diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index d246a624b2a6..abed3f93ab54 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -399,6 +399,16 @@ ECwISC30to60E2r1 + + T62 + T62 + ECwISC30to60E3r2 + rx1 + null + null + ECwISC30to60E3r2 + + TL319 TL319 @@ -509,6 +519,16 @@ ECwISC30to60E2r1 + + TL319 + TL319 + ECwISC30to60E3r2 + JRA025 + null + null + ECwISC30to60E3r2 + + TL319 TL319 @@ -1183,6 +1203,16 @@ ECwISC30to60E2r1 + + ne30np4.pg2 + ne30np4.pg2 + ECwISC30to60E3r2 + r05 + null + null + ECwISC30to60E3r2 + + ne0np4_northamericax4v1 r0125 @@ -1426,6 +1456,16 @@ EC30to60E2r2 + + ne120np4.pg2 + r05 + ECwISC30to60E3r2 + r05 + null + null + ECwISC30to60E3r2 + + ne240np4 ne240np4 @@ -1984,6 +2024,16 @@ EC30to60E2r2 + + ne30np4.pg2 + r05 + ECwISC30to60E3r2 + r05 + null + null + ECwISC30to60E3r2 + + ne30np4.pg2 r05 @@ -2293,6 +2343,7 @@ $DIN_LOC_ROOT/share/domains/domain.lnd.T62_WCAtl12to45E2r4.210318.nc $DIN_LOC_ROOT/share/domains/domain.lnd.T62_SOwISC12to60E2r4.210119.nc $DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E2r1.201007.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E3r2.231018.nc T62 is Gaussian grid: @@ -2335,6 +2386,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_SOwISC12to60E2r4.210119.nc $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_ECwISC30to60E2r1.201007.nc $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E2r1.201007.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_ECwISC30to60E3r2.231018.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E3r2.231018.nc $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_oRRS18to6v3.220124.nc $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oRRS18to6v3.220124.nc TL319 is JRA lat/lon grid: @@ -2407,6 +2460,8 @@ $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4_oEC60to30v3.161222.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4_oEC60to30v3wLI_mask.170802.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4_ECwISC30to60E1r2.200410.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_oRRS18to6v3.211101.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_oRRS18to6v3.211101.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4_oRRS30to10v3.171101.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4_oRRS30to10v3wLI_mask.171109.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4_gx1v6_110217.nc @@ -2440,6 +2495,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_ECwISC30to60E2r1.201007.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_oRRS18to6v3.211101.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_oRRS18to6v3.211101.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_ECwISC30to60E3r2.231018.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_ECwISC30to60E3r2.231018.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_gx1v6.190806.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_gx1v6.190806.nc ne30np4.pg2 is Spectral Elem 1-deg grid w/ 2x2 FV physics grid per element: @@ -2509,6 +2566,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_EC30to60E2r2.210312.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_ICOS10.230120.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_ICOS10.230120.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_ECwISC30to60E3r2.231018.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_ECwISC30to60E3r2.231018.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_gx1v6.190819.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_gx1v6.190819.nc ne120np4 is Spectral Elem 1/4-deg grid w/ 2x2 FV physics grid @@ -2579,7 +2638,7 @@ - + @@ -2705,6 +2764,13 @@ ECwISC30to60E2r1 is a MPAS ocean grid generated with the jigsaw/compass process using the eddy closure density function that has 30 km gridcells at the equator, 60 km at mid-latitudes, and 35 km at high latitudes. Additionally, it has ocean in ice-shelf cavities: + + 237954 + 1 + $DIN_LOC_ROOT/share/domains/domain.ocn.ECwISC30to60E3r2.231018.nc + ECwISC30to60E3r2 is a MPAS ocean grid generated with the jigsaw/compass process using the eddy closure density function that has 30 km gridcells at the equator, 60 km at mid-latitudes, and 35 km at high latitudes. Additionally, it has ocean in ice-shelf cavities: + + @@ -2735,6 +2801,8 @@ $DIN_LOC_ROOT/share/domains/domain.lnd.r05_EC30to60E2r2.201005.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_WC14to60E2r3.200929.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_WC14to60E2r3.200929.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_ECwISC30to60E3r2.231018.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_ECwISC30to60E3r2.231018.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc r05 is 1/2 degree river routing grid: @@ -3189,6 +3257,14 @@ cpl/gridmaps/ECwISC30to60E2r1/map_ECwISC30to60E2r1-nomask_to_ne30pg2_mono.201006.nc + + cpl/gridmaps/ne30pg2/map_ne30pg2_to_ECwISC30to60E3r2_traave.20231018.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_ECwISC30to60E3r2_trintbilin.20231018.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_ECwISC30to60E3r2-nomask_trintbilin.20231018.nc + cpl/gridmaps/ECwISC30to60E3r2/map_ECwISC30to60E3r2_to_ne30pg2_traave.20231018.nc + cpl/gridmaps/ECwISC30to60E3r2/map_ECwISC30to60E3r2_to_ne30pg2_traave.20231018.nc + + cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_mono.200331.nc cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_bilin.200331.nc @@ -3402,6 +3478,14 @@ cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_ne120pg2_mono.210311.nc + + cpl/gridmaps/ne120pg2/map_ne120pg2_to_ECwISC30to60E3r2_traave.20231018.nc + cpl/gridmaps/ne120pg2/map_ne120pg2_to_ECwISC30to60E3r2_trintbilin.20231018.nc + cpl/gridmaps/ne120pg2/map_ne120pg2_to_ECwISC30to60E3r2-nomask_trintbilin.20231018.nc + cpl/gridmaps/ECwISC30to60E3r2/map_ECwISC30to60E3r2_to_ne120pg2_traave.20231018.nc + cpl/gridmaps/ECwISC30to60E3r2/map_ECwISC30to60E3r2_to_ne120pg2_traave.20231018.nc + + cpl/gridmaps/ne120pg2/map_ne120pg2_to_r05_mono.200331.nc cpl/gridmaps/ne120pg2/map_ne120pg2_to_r05_bilin.200331.nc @@ -3483,7 +3567,7 @@ cpl/gridmaps/ne256pg2/map_oRRS18to6v3_to_ne256pg2_nco.200212.nc cpl/gridmaps/ne256pg2/map_oRRS18to6v3_to_ne256pg2_nco.200212.nc - + cpl/gridmaps/ne256pg2/map_ne256pg2_to_r0125_mono.200212.nc @@ -3892,6 +3976,14 @@ cpl/gridmaps/ECwISC30to60E2r1/map_ECwISC30to60E2r1_to_T62_aave.201006.nc + + cpl/gridmaps/T62/map_T62_to_ECwISC30to60E3r2_traave.20231018.nc + cpl/gridmaps/T62/map_T62_to_ECwISC30to60E3r2-nomask_trintbilin.20231018.nc + cpl/gridmaps/T62/map_T62_to_ECwISC30to60E3r2_patch.20231018.nc + cpl/gridmaps/ECwISC30to60E3r2/map_ECwISC30to60E3r2_to_T62_traave.20231018.nc + cpl/gridmaps/ECwISC30to60E3r2/map_ECwISC30to60E3r2_to_T62_traave.20231018.nc + + cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_aave.181203.nc cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_bilin.181203.nc @@ -3980,6 +4072,14 @@ cpl/gridmaps/ECwISC30to60E2r1/map_ECwISC30to60E2r1_to_TL319_aave.201006.nc + + cpl/gridmaps/TL319/map_TL319_to_ECwISC30to60E3r2_traave.20231018.nc + cpl/gridmaps/TL319/map_TL319_to_ECwISC30to60E3r2-nomask_trintbilin.20231018.nc + cpl/gridmaps/TL319/map_TL319_to_ECwISC30to60E3r2_patch.20231018.nc + cpl/gridmaps/ECwISC30to60E3r2/map_ECwISC30to60E3r2_to_TL319_traave.20231018.nc + cpl/gridmaps/ECwISC30to60E3r2/map_ECwISC30to60E3r2_to_TL319_traave.20231018.nc + + cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_aave.220124.nc cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_bilin.220124.nc @@ -4435,6 +4535,11 @@ cpl/cpl6/map_rx1_to_ECwISC30to60E2r1_smoothed.r150e300.201006.nc + + cpl/cpl6/map_rx1_to_ECwISC30to60E3r2_smoothed.r150e300.230901.nc + cpl/cpl6/map_rx1_to_ECwISC30to60E3r2_smoothed.r150e300.230901.nc + + cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc @@ -4490,6 +4595,11 @@ cpl/cpl6/map_JRA025_to_ECwISC30to60E2r1_smoothed.r150e300.201006.nc + + cpl/cpl6/map_JRA025_to_ECwISC30to60E3r2_smoothed.r150e300.230901.nc + cpl/cpl6/map_JRA025_to_ECwISC30to60E3r2_smoothed.r150e300.230901.nc + + cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc @@ -4570,6 +4680,11 @@ cpl/cpl6/map_r05_to_ECwISC30to60E2r1_smoothed.r150e300.201006.nc + + cpl/cpl6/map_r05_to_ECwISC30to60E3r2_smoothed.r150e300.230901.nc + cpl/cpl6/map_r05_to_ECwISC30to60E3r2_smoothed.r150e300.230901.nc + + cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc diff --git a/components/elm/bld/namelist_files/namelist_definition.xml b/components/elm/bld/namelist_files/namelist_definition.xml index a113076e22df..fc563e9a3dd3 100644 --- a/components/elm/bld/namelist_files/namelist_definition.xml +++ b/components/elm/bld/namelist_files/namelist_definition.xml @@ -298,7 +298,7 @@ Toggle to turn on the FATES + group="elm_inparm" valid_values="0,1,2,3,4,5" value="0" > Turn on spitfire module to simulate fire by setting fates_spitfire_mode > 0. Allowed values are: 0 : Simulations of fire are off @@ -340,7 +340,7 @@ Toggle to turn on plant hydraulics (only relevant if FATES is on). + group="elm_inparm" valid_values="" value=".false."> Toggle to turn on the tree damage module in FATES (Only relevant if FATES is on) @@ -1022,7 +1022,7 @@ by getco2_historical.ncl - Aerosol deposition file name (only used for aerdepregrid.ncl) @@ -1309,8 +1309,8 @@ Representative concentration pathway for future scenarios [radiative forcing at + group="default_settings" + valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,TL319,cruncep,oEC60to30v3,oEC60to30v3wLI,ECwISC30to60E1r2,EC30to60E2r2,WC14to60E2r3,WCAtl12to45E2r4,SOwISC12to60E2r4,ECwISC30to60E2r1,oRRS18to6,oRRS18to6v3,oRRS15to5,oARRM60to10,oARRM60to6,ARRM10to60E2r1,oQU480,oQU240,oQU240wLI,oQU120,oRRS30to10v3,oRRS30to10v3wLI,360x720cru,NLDASww3a,NLDAS,tx0.1v2,ICOS10,ECwISC30to60E3r2"> Land mask description @@ -1823,6 +1823,7 @@ Type of saturation function used in VSFM. Runtime flag to dynamically modify PETSc SNES linesearch option when VSFM fails to converge before cutting the timestep. + Runtime flag to turn on/off variable soil thickness. - - Runtime flag to turn on/off lake water storage. @@ -1869,21 +1870,21 @@ Runtime flag to turn on/off lake water storage. - Runtime flag to turn on/off downscaling of atmosphric forcing from grid to topounit. - -Flag to switch between ERMM (Elevation Range with Maximum Elevation Method) and FNM (Froude Number Method) precipitation downscaling methods. +Flag to switch between ERMM (Elevation Range with Maximum Elevation Method) and FNM (Froude Number Method) precipitation downscaling methods. @@ -2010,14 +2011,14 @@ Type of snow grain shape -Atmospheric types: 'default' represents the default mid-latitude winter type -without considering SZA dependenece of direct irradiance, and the other types +Atmospheric types: 'default' represents the default mid-latitude winter type +without considering SZA dependenece of direct irradiance, and the other types explain the SZA dependence of direct irradiance. -Toggle to turn on the internal mixing of dust-snow. +Toggle to turn on the internal mixing of dust-snow. diff --git a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml index 08964af1cff9..f05e111ccd40 100644 --- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml +++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml @@ -48,6 +48,7 @@ '00:10:00' '00:10:00' '00:30:00' +'00:30:00' 'split_explicit' 2 @@ -71,6 +72,7 @@ .true. .true. .true. +.true. -1.0 .false. 30.0e3 @@ -86,6 +88,7 @@ .true. .true. .true. +.true. 10.0 1000.0 1000.0 @@ -95,6 +98,7 @@ 462.0 462.0 1000.0 +1000.0 .false. 10.0 @@ -119,6 +123,7 @@ 1.18e10 1.18e10 1.2e11 +1.2e11 1.0 .false. 0.0 @@ -149,6 +154,8 @@ 'ramp' 'RossbyRadius' 'RossbyRadius' + +'ramp' 20e3 30e3 30e3 @@ -173,6 +180,8 @@ 'constant' 'N2_dependent' 'N2_dependent' + +'constant' 900.0 600.0 600.0 @@ -181,6 +190,7 @@ 600.0 600.0 600.0 +600.0 0.3 'constant' 300.0 @@ -188,6 +198,8 @@ 3.0 1.0 1.0 + +3.0 0.13 1000.0 200.0 @@ -197,6 +209,8 @@ 'ramp' 'RossbyRadius' 'RossbyRadius' + +'ramp' 20e3 30e3 30e3 @@ -333,6 +347,7 @@ 'pressure_only' 'pressure_only' 'pressure_only' +'pressure_only' 'Jenkins' .false. 10.0 @@ -345,6 +360,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 1e-4 5e-2 0.011 @@ -352,11 +368,13 @@ 0.00295 0.00295 0.00295 +0.00295 3.1e-4 8.42e-5 8.42e-5 8.42e-5 8.42e-5 +8.42e-5 'flux-form' @@ -379,6 +397,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 1.0e-3 10.0 2.5e-3 @@ -456,6 +475,7 @@ '0000_00:00:15' '0000_00:00:15' '0000_00:01:00' +'0000_00:01:00' 2 .true. 2 @@ -496,6 +516,7 @@ .false. .false. .false. +.false. .false. .false. .false. @@ -1012,6 +1033,7 @@ .true. .true. .true. +.true. '0000-00-00_01:00:00' 'mocStreamfunctionOutput' .true. @@ -1093,14 +1115,17 @@ .false. .true. .true. +.true. 'dt' 'conservationCheckOutput' .false. .true. .true. +.true. .false. .true. .true. +.true. .true. 'conservationCheckRestart' diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml index 53b4677db640..dbb37d5ec5a8 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -283,6 +283,19 @@ def buildnml(case, caseroot, compname): if ocn_ismf == 'data': data_ismf_file = 'prescribed_ismf_adusumilli2020.ECwISC30to60E2r1.230429.nc' + elif ocn_grid == 'ECwISC30to60E3r2': + decomp_date = '20230901' + decomp_prefix = 'partitions/mpas-o.graph.info.' + restoring_file = 'sss.PHC2_monthlyClimatology.ECwISC30to60E3r2.20230901.nc' + analysis_mask_file = 'ECwISC30to60E3r2_mocBasinsAndTransects20210623.nc' + ic_date = '20230901' + ic_prefix = 'mpaso.ECwISC30to60E3r2' + if ocn_ic_mode == 'spunup': + ic_date = '230914' + ic_prefix = 'mpaso.ECwISC30to60E3r2.rstFromG-chrysalis' + if ocn_ismf == 'data': + data_ismf_file = 'prescribed_ismf_adusumilli2020.ECwISC30to60E3r2.20230901.nc' + #-------------------------------------------------------------------- # Set OCN_FORCING = datm_forced_restoring if restoring file is available #-------------------------------------------------------------------- diff --git a/components/mpas-ocean/cime_config/config_pes.xml b/components/mpas-ocean/cime_config/config_pes.xml index ff676b33e9f3..eb7c48d2854a 100644 --- a/components/mpas-ocean/cime_config/config_pes.xml +++ b/components/mpas-ocean/cime_config/config_pes.xml @@ -401,6 +401,32 @@ + + + + mpas-ocean+chrysalis: standard-res, compset=DATM+MPASO, 20 nodes, ~22 SYPD + 64 + + 1280 + 1280 + 1280 + 1280 + 1280 + 1 + 1280 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + diff --git a/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml b/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml index 1253fb0e1997..d4814c4e317d 100644 --- a/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml +++ b/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml @@ -24,6 +24,7 @@ 1800.0 1800.0 1800.0 +1800.0 'noleap' '2000-01-01_00:00:00' 'none' @@ -73,6 +74,8 @@ 75.0 85.0 75.0 + +70.0 75.0 85.0 85.0 @@ -81,6 +84,8 @@ -75.0 -85.0 -75.0 + +-60.0 -85.0 -85.0 -85.0 @@ -140,6 +145,7 @@ 1 1 1 +1 true true 120 diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml index 401b13b7e2bd..19e353ce065e 100755 --- a/components/mpas-seaice/cime_config/buildnml +++ b/components/mpas-seaice/cime_config/buildnml @@ -253,6 +253,16 @@ def buildnml(case, caseroot, compname): grid_date = '210414' grid_prefix = 'mpassi.ECwISC30to60E2r1.rstFromG-anvil' + elif ice_grid == 'ECwISC30to60E3r2': + grid_date = '20230901' + grid_prefix = 'mpassi.ECwISC30to60E3r2' + decomp_date = '20230901' + decomp_prefix = 'partitions/mpas-seaice.graph.info.' + data_iceberg_file = 'Iceberg_Climatology_Merino.ECwISC30to60E3r2.20230901.nc' + if ice_ic_mode == 'spunup': + grid_date = '230914' + grid_prefix = 'mpassi.ECwISC30to60E3r2.rstFromG-chrysalis' + elif ice_grid == 'ICOS10': grid_date = '211015' grid_prefix = 'seaice.ICOS10'