diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index 45f886588e2b..c603ccac2d82 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -426,6 +426,16 @@ SOwISC12to30E3r3 + + T62 + T62 + SOwISC12to30E3r4 + rx1 + null + null + SOwISC12to30E3r4 + + TL319 TL319 @@ -676,6 +686,16 @@ SOwISC12to30E3r3 + + TL319 + TL319 + SOwISC12to30E3r4 + JRA025 + null + null + SOwISC12to30E3r4 + + TL319 TL319 @@ -1430,6 +1450,16 @@ SOwISC12to30E3r3 + + ne30np4.pg2 + ne30np4.pg2 + SOwISC12to30E3r4 + r05 + null + null + SOwISC12to30E3r4 + + ne0np4_northamericax4v1 r0125 @@ -2171,6 +2201,16 @@ IcoswISC30E3r5 + + TL319 + TL319 + SOwISC12to30E3r4 + JRA025 + mpas.ais4to20km + null + SOwISC12to30E3r4 + + @@ -2547,6 +2587,16 @@ SOwISC12to30E3r3 + + ne30np4.pg2 + r05 + SOwISC12to30E3r4 + r05 + null + null + SOwISC12to30E3r4 + + ne30np4.pg2 r05 @@ -2859,6 +2909,7 @@ $DIN_LOC_ROOT/share/domains/domain.lnd.T62_IcoswISC30E3r5.231121.nc $DIN_LOC_ROOT/share/domains/domain.lnd.T62_RRSwISC6to18E3r5.240328.nc $DIN_LOC_ROOT/share/domains/domain.lnd.T62_SOwISC12to30E3r3.240808.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.T62_SOwISC12to30E3r4.250122.nc T62 is Gaussian grid: @@ -2919,6 +2970,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_RRSwISC6to18E3r5.240328.nc $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_SOwISC12to30E3r3.240808.nc $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_SOwISC12to30E3r3.240808.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_SOwISC12to30E3r4.250122.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_SOwISC12to30E3r4.250122.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: @@ -3042,6 +3095,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_RRSwISC6to18E3r5.240328.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_SOwISC12to30E3r3.240808.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_SOwISC12to30E3r3.240808.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_SOwISC12to30E3r4.250122.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_SOwISC12to30E3r4.250122.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: @@ -3369,6 +3424,13 @@ SOwISC12to30E3r3 is a MPAS ocean grid generated with the jigsaw/compass process using XXXXX. Additionally, it has ocean in ice-shelf cavities: + + 807754 + 1 + $DIN_LOC_ROOT/share/domains/domain.ocn.SOwISC12to30E3r4.250122.nc + SOwISC12to30E3r4 is a MPAS ocean grid generated with the jigsaw/compass process using XXXXX. Additionally, it has ocean in ice-shelf cavities: + + @@ -3407,6 +3469,8 @@ $DIN_LOC_ROOT/share/domains/domain.lnd.r05_RRSwISC6to18E3r5.240328.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_SOwISC12to30E3r3.240808.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_SOwISC12to30E3r3.240808.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_SOwISC12to30E3r4.250122.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_SOwISC12to30E3r4.250122.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc r05 is 1/2 degree river routing grid: @@ -3947,6 +4011,16 @@ cpl/gridmaps/ne30pg2/map_ne30pg2_to_SOwISC12to30E3r3_trfvnp2.20240808.nc + + cpl/gridmaps/ne30pg2/map_ne30pg2_to_SOwISC12to30E3r4_traave.20250122.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_SOwISC12to30E3r4_trbilin.20250122.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_SOwISC12to30E3r4-nomask_trbilin.20250122.nc + cpl/gridmaps/SOwISC12to30E3r4/map_SOwISC12to30E3r4_to_ne30pg2_traave.20250122.nc + cpl/gridmaps/SOwISC12to30E3r4/map_SOwISC12to30E3r4_to_ne30pg2_traave.20250122.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_SOwISC12to30E3r4_trfvnp2.20250122.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_SOwISC12to30E3r4_trfvnp2.20250122.nc + + cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_mono.200331.nc cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_bilin.200331.nc @@ -4764,6 +4838,14 @@ cpl/gridmaps/SOwISC12to30E3r3/map_SOwISC12to30E3r3_to_T62_traave.20240808.nc + + cpl/gridmaps/T62/map_T62_to_SOwISC12to30E3r4_traave.20250122.nc + cpl/gridmaps/T62/map_T62_to_SOwISC12to30E3r4-nomask_trbilin.20250122.nc + cpl/gridmaps/T62/map_T62_to_SOwISC12to30E3r4_esmfpatch.20250122.nc + cpl/gridmaps/SOwISC12to30E3r4/map_SOwISC12to30E3r4_to_T62_traave.20250122.nc + cpl/gridmaps/SOwISC12to30E3r4/map_SOwISC12to30E3r4_to_T62_traave.20250122.nc + + cpl/gridmaps/TL319/map_TL319_to_oQU240wLI_traave.20240509.nc cpl/gridmaps/TL319/map_TL319_to_oQU240wLI-nomask_trbilin.20240509.nc @@ -4924,6 +5006,14 @@ cpl/gridmaps/SOwISC12to30E3r3/map_SOwISC12to30E3r3_to_TL319_traave.20240808.nc + + cpl/gridmaps/TL319/map_TL319_to_SOwISC12to30E3r4_traave.20250122.nc + cpl/gridmaps/TL319/map_TL319_to_SOwISC12to30E3r4-nomask_trbilin.20250122.nc + cpl/gridmaps/TL319/map_TL319_to_SOwISC12to30E3r4_esmfpatch.20250122.nc + cpl/gridmaps/SOwISC12to30E3r4/map_SOwISC12to30E3r4_to_TL319_traave.20250122.nc + cpl/gridmaps/SOwISC12to30E3r4/map_SOwISC12to30E3r4_to_TL319_traave.20250122.nc + + cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_aave.220124.nc cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_bilin.220124.nc @@ -5364,6 +5454,10 @@ cpl/gridmaps/SOwISC12to30E3r3/map_SOwISC12to30E3r3_to_r05_traave.20240808.nc + + cpl/gridmaps/SOwISC12to30E3r4/map_SOwISC12to30E3r4_to_r05_traave.20250122.nc + + cpl/cpl6/map_EC30to60E2r2_to_r05_neareststod.220728.nc @@ -5484,6 +5578,11 @@ cpl/cpl6/map_rx1_to_SOwISC12to30E3r3_cstmnn.r150e300.20240808.nc + + cpl/cpl6/map_rx1_to_SOwISC12to30E3r4_r150e300.cstmnn.20250122.nc + cpl/cpl6/map_rx1_to_SOwISC12to30E3r4_r150e300.cstmnn.20250122.nc + + cpl/cpl6/map_JRA025_to_oQU240wLI_cstmnn.r150e300.20240516.nc cpl/cpl6/map_JRA025_to_oQU240wLI_cstmnn.r150e300.20240516.nc @@ -5584,6 +5683,11 @@ cpl/cpl6/map_JRA025_to_SOwISC12to30E3r3_cstmnn.r150e300.20240808.nc + + cpl/cpl6/map_JRA025_to_SOwISC12to30E3r4_r150e300.cstmnn.20250122.nc + cpl/cpl6/map_JRA025_to_SOwISC12to30E3r4_r150e300.cstmnn.20250122.nc + + cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc @@ -5684,6 +5788,11 @@ cpl/cpl6/map_r05_to_SOwISC12to30E3r3_cstmnn.r150e300.20240808.nc + + cpl/cpl6/map_r05_to_SOwISC12to30E3r4_r150e300.cstmnn.20250122.nc + cpl/cpl6/map_r05_to_SOwISC12to30E3r4_r150e300.cstmnn.20250122.nc + + cpl/cpl6/map_r025_to_IcoswISC30E3r5_cstmnn.r150e300.20240401.nc cpl/cpl6/map_r025_to_IcoswISC30E3r5_cstmnn.r150e300.20240401.nc @@ -6068,6 +6177,17 @@ cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5_esmfnearestdtos.20240701.nc + + cpl/gridmaps/SOwISC12to30E3r4/map_SOwISC12to30E3r4-nomask_to_ais4to20_esmfaave.20250122.nc + cpl/gridmaps/SOwISC12to30E3r4/map_SOwISC12to30E3r4-nomask_to_ais4to20_esmfbilin.20250122.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_SOwISC12to30E3r4-nomask_esmfaave.20250122.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_SOwISC12to30E3r4-nomask_esmfbilin.20250122.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_SOwISC12to30E3r4-nomask_esmfaave.20250122.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_SOwISC12to30E3r4-nomask_esmfbilin.20250122.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_SOwISC12to30E3r4-nomask_esmfnearestdtos.20250122.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_SOwISC12to30E3r4_esmfnearestdtos.20250122.nc + + diff --git a/components/elm/bld/namelist_files/namelist_definition.xml b/components/elm/bld/namelist_files/namelist_definition.xml index 87a6da722af1..2c5d4067747a 100644 --- a/components/elm/bld/namelist_files/namelist_definition.xml +++ b/components/elm/bld/namelist_files/namelist_definition.xml @@ -1497,7 +1497,7 @@ Representative concentration pathway for future scenarios [radiative forcing at + 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,IcoswISC30E3r5,IcosXISC30E3r7,RRSwISC6to18E3r5,SOwISC12to30E3r3,SOwISC12to30E3r4"> Land mask description 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 73d4eeecd526..b13e606a7fc5 100644 --- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml +++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml @@ -56,6 +56,7 @@ '00:01:00' '00:05:00' '00:10:00' +'00:10:00' 'split_explicit_ab2' 2 @@ -87,6 +88,7 @@ .true. .true. .true. +.true. -1.0 .false. 30.0e3 @@ -110,6 +112,7 @@ .true. .true. .true. +.true. 10.0 1000.0 1000.0 @@ -127,6 +130,7 @@ 38.5 100.0 462.0 +462.0 .false. 10.0 @@ -159,6 +163,7 @@ 6.83e06 3.2e09 1.18e10 +1.18e10 1.0 .false. 0.0 @@ -197,6 +202,7 @@ 'RossbyRadius' 'RossbyRadius' 'RossbyRadius' +'RossbyRadius' 20e3 30e3 30e3 @@ -229,6 +235,7 @@ 'N2_dependent' 'N2_dependent' 'N2_dependent' +'N2_dependent' 900.0 600.0 600.0 @@ -244,6 +251,7 @@ 600.0 600.0 600.0 +600.0 0.3 'constant' 300.0 @@ -258,6 +266,7 @@ 1.0 1.0 1.0 +1.0 0.13 1000.0 200.0 @@ -274,6 +283,7 @@ 'RossbyRadius' 'RossbyRadius' 'RossbyRadius' +'RossbyRadius' 20e3 30e3 30e3 @@ -431,6 +441,7 @@ 'pressure_only' 'pressure_only' 'pressure_only' +'pressure_only' 'Jenkins' .false. 10.0 @@ -451,6 +462,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 1e-4 0.011 0.00295 @@ -465,6 +477,7 @@ 0.00295 0.00295 0.00295 +0.00295 3.1e-4 8.42e-5 8.42e-5 @@ -478,6 +491,7 @@ 8.42e-5 8.42e-5 8.42e-5 +8.42e-5 1.0 0.0 5e-2 @@ -511,6 +525,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 1.0e-3 10.0 2.5e-3 @@ -599,6 +614,7 @@ '0000_00:00:01.25' '0000_00:00:05' '0000_00:00:15' +'0000_00:00:15' 2 .true. 2 @@ -648,6 +664,7 @@ .false. .false. .false. +.false. .false. .false. .false. @@ -1143,6 +1160,7 @@ .false. .true. +.true. .true. '0000-00-00_01:00:00' 'eddyProductVariablesOutput' @@ -1177,6 +1195,7 @@ .true. .true. .true. +.true. '0000-00-00_01:00:00' 'mocStreamfunctionOutput' .true. @@ -1257,12 +1276,15 @@ .false. .true. +.true. 'dt' 'conservationCheckOutput' .false. .true. +.true. .false. .true. +.true. .true. 'conservationCheckRestart' diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml index b030f3fd268c..34979d56b822 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -419,6 +419,18 @@ def buildnml(case, caseroot, compname): if ocn_ismf == 'data': data_ismf_file = 'prescribed_ismf_paolo2023.SOwISC12to30E3r3.20241017.nc' + elif ocn_grid == 'SOwISC12to30E3r4': + decomp_date = '20250121' + decomp_prefix = 'partitions/mpas-o.graph.info.' + restoring_file = 'sss.WOA23_monthlyClimatology.SOwISC12to30E3r4.20250121.nc' + analysis_mask_file = 'SOwISC12to30E3r4_mocBasinsAndTransects20210623.nc' + ic_date = '20250121' + ic_prefix = 'mpaso.SOwISC12to30E3r4' + if ocn_ic_mode == 'spunup': + logger.warning("WARNING: The specified compset is requesting ocean ICs spunup from a G-case") + logger.warning(" But no file available for this grid.") + if ocn_ismf == 'data': + data_ismf_file = 'prescribed_ismf_paolo2023.SOwISC12to30E3r4.20250121.nc' #-------------------------------------------------------------------- # Set OCN_FORCING = datm_forced_restoring if restoring file is available 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 4ce60e42bcbe..898714242c8d 100644 --- a/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml +++ b/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml @@ -32,6 +32,7 @@ 60.0 900.0 1800.0 +1800.0 'noleap' '2000-01-01_00:00:00' 'none' @@ -89,6 +90,7 @@ 85.0 85.0 85.0 +85.0 75.0 85.0 85.0 @@ -105,6 +107,7 @@ -85.0 -85.0 -85.0 +-85.0 -85.0 -85.0 -85.0 @@ -174,6 +177,7 @@ 1 2 1 +1 true true 120 diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml index 5df71d69b1a8..fe5361c7bd34 100755 --- a/components/mpas-seaice/cime_config/buildnml +++ b/components/mpas-seaice/cime_config/buildnml @@ -340,6 +340,16 @@ def buildnml(case, caseroot, compname): grid_date = '20240829' grid_prefix = 'mpassi.SOwISC12to30E3r3.rstFromG-chrysalis' + elif ice_grid == 'SOwISC12to30E3r4': + grid_date = '20250121' + grid_prefix = 'mpassi.SOwISC12to30E3r4' + decomp_date = '20250121' + decomp_prefix = 'partitions/mpas-seaice.graph.info.' + data_iceberg_file = 'Iceberg_Climatology_Merino.SOwISC12to30E3r4.20250121.nc' + if ice_ic_mode == 'spunup': + logger.warning("WARNING: The specified compset is requesting seaice ICs spunup from a G-case") + logger.warning(" But no file available for this grid.") + elif ice_grid == 'ICOS10': grid_date = '211015' grid_prefix = 'seaice.ICOS10'