diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index ccfb3d908d86..056973cce947 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -406,6 +406,16 @@ IcoswISC30E3r5 + + T62 + T62 + NARRM14to30E3r1 + rx1 + null + null + NARRM14to30E3r1 + + TL319 TL319 @@ -606,6 +616,16 @@ IcosXISC30E3r7 + + TL319 + TL319 + NARRM14to30E3r1 + JRA025 + null + null + NARRM14to30E3r1 + + TL319 TL319 @@ -1100,6 +1120,16 @@ WC14to60E2r3 + + ne0np4_northamericax4v1.pg2 + r025 + NARRM14to30E3r1 + r025 + null + null + NARRM14to30E3r1 + + ne0np4_northamericax4v1.pg2 ne0np4_northamericax4v1.pg2 @@ -1330,6 +1360,16 @@ IcoswISC30E3r5 + + ne30np4.pg2 + ne30np4.pg2 + NARRM14to30E3r1 + r05 + null + null + NARRM14to30E3r1 + + ne0np4_northamericax4v1 r0125 @@ -2271,6 +2311,16 @@ IcosXISC30E3r7 + + ne30np4.pg2 + r05 + NARRM14to30E3r1 + r05 + null + null + NARRM14to30E3r1 + + ne30np4.pg2 r05 @@ -2581,6 +2631,7 @@ $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_IcoswISC30E3r5.231121.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.T62_NARRM14to30E3r1.240326.nc T62 is Gaussian grid: @@ -2635,6 +2686,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcoswISC30E3r5.231121.nc $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcosXISC30E3r7.240326.nc $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcosXISC30E3r7.240326.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_NARRM14to30E3r1.240326.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_NARRM14to30E3r1.240326.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: @@ -2746,6 +2799,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcoswISC30E3r5.231121.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_IcosXISC30E3r7.240326.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcosXISC30E3r7.240326.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_NARRM14to30E3r1.240326.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_NARRM14to30E3r1.240326.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: @@ -3055,6 +3110,13 @@ IcosXISC30E3r7 is a MPAS ocean grid generated with the jigsaw/compass process using a dual mesh that is a subdivided icosahedron, resulting in a nearly uniform resolution of 30 km.: + + 662141 + 1 + $DIN_LOC_ROOT/share/domains/domain.ocn.NARRM14to30E3r1.240326.nc + NARRM14to30E3r1 is a MPAS ocean grid generated with the jigsaw/compass process XXXX TODO: + + @@ -3089,6 +3151,8 @@ $DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r5.231121.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240326.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240326.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc r05 is 1/2 degree river routing grid: @@ -3254,6 +3318,8 @@ $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 + $DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_NARRM14to30E3r1.240326.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_NARRM14to30E3r1.240326.nc 1-deg with 1/4-deg over North America (version 1) pg2: @@ -3579,6 +3645,16 @@ cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_trfvnp2.20240326.nc + + cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_traave.20240326.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240326.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240326.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240326.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240326.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc + + cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_mono.200331.nc cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_bilin.200331.nc @@ -4075,6 +4151,16 @@ cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_IcoswISC30E3r5_trfvnp2.20240331.nc + + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_traave.20240326.nc + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240326.nc + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240326.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240326.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240326.nc + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc + + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r0125_mono.20200401.nc cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r0125_bilin.20200401.nc @@ -4346,6 +4432,14 @@ cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_T62_traave.20231121.nc + + cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_traave.20240326.nc + cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_trbilin.20240326.nc + cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_esmfpatch.20240326.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240326.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240326.nc + + cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_aave.181203.nc cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_bilin.181203.nc @@ -4482,6 +4576,14 @@ cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_TL319_traave.20240326.nc + + cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_traave.20240326.nc + cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_trbilin.20240326.nc + cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_esmfpatch.20240326.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240326.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240326.nc + + cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_aave.220124.nc cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_bilin.220124.nc @@ -4862,6 +4964,14 @@ cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_r05_traave.20240326.nc + + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r05_traave.20240326.nc + + + + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r025_traave.20240326.nc + + cpl/cpl6/map_EC30to60E2r2_to_r05_neareststod.220728.nc @@ -4972,6 +5082,11 @@ cpl/cpl6/map_rx1_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc + + cpl/cpl6/map_rx1_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + cpl/cpl6/map_rx1_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + + cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc @@ -5057,6 +5172,11 @@ cpl/cpl6/map_JRA025_to_IcosXISC30E3r7_cstmnn.r150e300.20240326.nc + + cpl/cpl6/map_JRA025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + cpl/cpl6/map_JRA025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + + cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc @@ -5152,6 +5272,16 @@ cpl/cpl6/map_r025_to_IcoswISC30E3r5_cstmnn.r150e300.20240401.nc + + cpl/cpl6/map_r05_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + cpl/cpl6/map_r05_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + + + + cpl/cpl6/map_r025_to_NARRM14to30E3r1_cstmnn.r150e300.20240320.nc + cpl/cpl6/map_r025_to_NARRM14to30E3r1_cstmnn.r150e300.20240320.nc + + cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc @@ -5363,21 +5493,21 @@ - + cpl/gridmaps/r05/map_r05_to_gis1to10kmR2_traave.20240403.nc cpl/gridmaps/r05/map_r05_to_gis1to10kmR2_trbilin.20240403.nc cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_r05_traave.20240403.nc cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_r05_traave.20240403.nc - + cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis1to10kmR2_traave.20240403.nc cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis1to10kmR2_trbilin.20240403.nc cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_ne30pg2_traave.20240403.nc cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_ne30pg2_traave.20240403.nc - + cpl/gridmaps/TL319/map_TL319_to_gis1to10kmR2_traave.20240404.nc cpl/gridmaps/TL319/map_TL319_to_gis1to10kmR2_trbilin.20240404.nc diff --git a/components/elm/bld/namelist_files/namelist_definition.xml b/components/elm/bld/namelist_files/namelist_definition.xml index 0f8b03dfec38..b42d4461ddfe 100644 --- a/components/elm/bld/namelist_files/namelist_definition.xml +++ b/components/elm/bld/namelist_files/namelist_definition.xml @@ -1423,7 +1423,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,NARRM14to30E3r1,NARRM14to30E3r2"> 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 248654ef10f5..c0d79a937369 100644 --- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml +++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml @@ -54,6 +54,8 @@ '00:04:00' '00:02:00' '00:01:00' +'00:10:00' +'00:10:00' 'split_explicit_ab2' 2 @@ -83,6 +85,8 @@ .true. .true. .true. +.true. +.true. -1.0 .false. 30.0e3 @@ -104,6 +108,8 @@ .true. .true. .true. +.true. +.true. 10.0 1000.0 1000.0 @@ -119,6 +125,8 @@ 154.0 77.0 38.5 +462.0 +462.0 .false. 10.0 @@ -149,6 +157,8 @@ 4.37e08 5.46e07 6.83e06 +1.18e10 +1.18e10 1.0 .false. 0.0 @@ -215,6 +225,8 @@ 'N2_dependent' 'N2_dependent' 'N2_dependent' +'constant' +'constant' 900.0 600.0 600.0 @@ -229,6 +241,8 @@ 600.0 600.0 600.0 +600.0 +600.0 0.3 'constant' 300.0 @@ -553,6 +567,8 @@ '0000_00:00:05' '0000_00:00:02.5' '0000_00:00:01.25' +'0000_00:00:15' +'0000_00:00:15' 2 .true. 2 @@ -1124,6 +1140,8 @@ .true. .true. .true. +.true. +.true. '0000-00-00_01:00:00' 'mocStreamfunctionOutput' .true. diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml index 47076dee726a..14f4125f6611 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -365,6 +365,28 @@ def buildnml(case, caseroot, compname): ic_date = '20240314' ic_prefix = 'mpaso.IcosXISC30E3r7.rstFromPiControlSpinup-chrysalis' + elif ocn_grid == 'NARRM14to30E3r1': + decomp_date = '20240227' + decomp_prefix = 'partitions/mpas-o.graph.info.' + restoring_file = 'sss.PHC2_monthlyClimatology.NARRM14to30E3r1.20240227.nc' + analysis_mask_file = 'NARRM14to30E3r1_mocBasinsAndTransects20210623.nc' + ic_date = '20240227' + ic_prefix = 'mpaso.NARRM14to30E3r1' + if ocn_ic_mode == 'spunup': + ic_date = '20240328' + ic_prefix = 'mpaso.NARRM14to30E3r1.rstFromG-chrysalis' + + elif ocn_grid == 'NARRM14to30E3r2': + decomp_date = '20240228' + decomp_prefix = 'partitions/mpas-o.graph.info.' + restoring_file = 'sss.PHC2_monthlyClimatology.NARRM14to30E3r2.20240228.nc' + analysis_mask_file = 'NARRM14to30E3r2_mocBasinsAndTransects20210623.nc' + ic_date = '2024022088' + ic_prefix = 'mpaso.NARRM14to30E3r2' + 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.") + #-------------------------------------------------------------------- # 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 23f258f2a308..8fd8e67ed24a 100644 --- a/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml +++ b/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml @@ -30,6 +30,8 @@ 240.0 120.0 60.0 +1800.0 +1800.0 'noleap' '2000-01-01_00:00:00' 'none' @@ -168,6 +170,8 @@ 1 1 1 +1 +1 true true 120 diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml index 2e602311033d..e42572cd15d8 100755 --- a/components/mpas-seaice/cime_config/buildnml +++ b/components/mpas-seaice/cime_config/buildnml @@ -318,6 +318,24 @@ def buildnml(case, caseroot, compname): grid_date = '20240314' grid_prefix = 'mpassi.IcosXISC30E3r7.rstFromPiControlSpinup-chrysalis' + elif ice_grid == 'NARRM14to30E3r1': + decomp_date = '20240227' + decomp_prefix = 'partitions/mpas-seaice.graph.info.' + grid_date = '20240227' + grid_prefix = 'mpassi.NARRM14to30E3r1' + if ice_ic_mode == 'spunup': + grid_date = '20240328' + grid_prefix = 'mpassi.NARRM14to30E3r1.rstFromG-chrysalis' + + elif ice_grid == 'NARRM14to30E3r2': + decomp_date = '20240228' + decomp_prefix = 'partitions/mpas-seaice.graph.info.' + grid_date = '20240228' + grid_prefix = 'mpassi.NARRM14to30E3r2' + 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'