diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index 7cdd7f0a0557..6315b4613e26 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -409,6 +409,16 @@ IcoswISC30E3r5 + + T62 + T62 + RRSwISC6to18E3r4 + rx1 + null + null + RRSwISC6to18E3r4 + + TL319 TL319 @@ -529,6 +539,16 @@ IcoswISC30E3r5 + + TL319 + TL319 + RRSwISC6to18E3r4 + JRA025 + null + null + RRSwISC6to18E3r4 + + TL319 TL319 @@ -1213,6 +1233,16 @@ IcoswISC30E3r5 + + ne30np4.pg2 + ne30np4.pg2 + RRSwISC6to18E3r4 + r05 + null + null + RRSwISC6to18E3r4 + + ne0np4_northamericax4v1 r0125 @@ -1376,6 +1406,16 @@ oRRS18to6v3 + + ne120np4.pg2 + r0125 + RRSwISC6to18E3r4 + r0125 + null + null + RRSwISC6to18E3r4 + + ne60np4 ne60np4 @@ -1466,6 +1506,26 @@ IcoswISC30E3r5 + + ne120np4.pg2 + r05 + RRSwISC6to18E3r4 + r05 + null + null + RRSwISC6to18E3r4 + + + + ne120np4.pg2 + r025 + RRSwISC6to18E3r4 + r025 + null + null + RRSwISC6to18E3r4 + + ne240np4 ne240np4 @@ -2034,6 +2094,16 @@ IcoswISC30E3r5 + + ne30np4.pg2 + r05 + RRSwISC6to18E3r4 + r05 + null + null + RRSwISC6to18E3r4 + + ne30np4.pg2 r05 @@ -2344,6 +2414,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_RRSwISC6to18E3r4.240108.nc T62 is Gaussian grid: @@ -2388,6 +2459,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E2r1.201007.nc $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcoswISC30E3r5.231121.nc $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcoswISC30E3r5.231121.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_RRSwISC6to18E3r4.240108.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_RRSwISC6to18E3r4.240108.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: @@ -2497,6 +2570,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_oRRS18to6v3.211101.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_IcoswISC30E3r5.231121.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcoswISC30E3r5.231121.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_RRSwISC6to18E3r4.240108.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_RRSwISC6to18E3r4.240108.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: @@ -2568,6 +2643,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_ICOS10.230120.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_IcoswISC30E3r5.231121.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_IcoswISC30E3r5.231121.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_RRSwISC6to18E3r4.240108.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_RRSwISC6to18E3r4.240108.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 @@ -2771,6 +2848,13 @@ IcoswISC30E3r5 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. Additionally, it has ocean in ice-shelf cavities: + + 4085395 + 1 + $DIN_LOC_ROOT/share/domains/domain.ocn.RRSwISC6to18E3r4.240108.nc + RRSwISC6to18E3r4 is a MPAS ocean grid generated with the jigsaw/compass process using a mesh density function that is roughly proportional to the Rossby radius of deformation, with 18 km gridcells at low and 6 km gridcells at high latitudes. Additionally, it has ocean in ice-shelf cavities: + + @@ -2803,10 +2887,20 @@ $DIN_LOC_ROOT/share/domains/domain.lnd.r05_WC14to60E2r3.200929.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r5.231121.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r5.231121.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_RRSwISC6to18E3r4.240108.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_RRSwISC6to18E3r4.240108.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc r05 is 1/2 degree river routing grid: + + 1440 + 720 + $DIN_LOC_ROOT/share/domains/domain.lnd.r025_RRSwISC6to18E3r4.240212.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r025_RRSwISC6to18E3r4.240212.nc + r025 is 1/4 degree river routing grid: + + 3600 1800 @@ -2829,6 +2923,8 @@ $DIN_LOC_ROOT/share/domains/domain.lnd.r0125_gx1v6.191017.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r0125_oARRM60to10.210630.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r0125_oARRM60to10.210630.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r0125_RRSwISC6to18E3r4.240108.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r0125_RRSwISC6to18E3r4.240108.nc r0125 is 1/8 degree river routing grid: @@ -3265,6 +3361,14 @@ cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ne30pg2_traave.20231121.nc + + cpl/gridmaps/ne30pg2/map_ne30pg2_to_RRSwISC6to18E3r4_traave.20240108.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_RRSwISC6to18E3r4_trbilin.20240108.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_RRSwISC6to18E3r4-nomask_trbilin.20240108.nc + cpl/gridmaps/RRSwISC6to18E3r4/map_RRSwISC6to18E3r4_to_ne30pg2_traave.20240108.nc + cpl/gridmaps/RRSwISC6to18E3r4/map_RRSwISC6to18E3r4_to_ne30pg2_traave.20240108.nc + + cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_mono.200331.nc cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_bilin.200331.nc @@ -3438,6 +3542,13 @@ cpl/gridmaps/ne120pg2/map_ne120pg2_to_r0125_mono.200707.nc + + cpl/gridmaps/ne120pg2/map_ne120pg2_to_r025_traave.20240212.nc + cpl/gridmaps/ne120pg2/map_ne120pg2_to_r025_traave.20240212.nc + cpl/gridmaps/ne120pg2/map_r025_to_ne120pg2_traave.20240212.nc + cpl/gridmaps/ne120pg2/map_r025_to_ne120pg2_traave.20240212.nc + + cpl/gridmaps/ne120np4/map_ne120np4_to_oRRS18to6v3_mono.20200702.nc cpl/gridmaps/ne120np4/map_ne120np4_to_oRRS18to6v3_mono.20200702.nc @@ -3486,6 +3597,14 @@ cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ne120pg2_traave.20231121.nc + + cpl/gridmaps/ne120pg2/map_ne120pg2_to_RRSwISC6to18E3r4_traave.20240108.nc + cpl/gridmaps/ne120pg2/map_ne120pg2_to_RRSwISC6to18E3r4_trbilin.20240108.nc + cpl/gridmaps/ne120pg2/map_ne120pg2_to_RRSwISC6to18E3r4-nomask_trbilin.20240108.nc + cpl/gridmaps/RRSwISC6to18E3r4/map_RRSwISC6to18E3r4_to_ne120pg2_traave.20240108.nc + cpl/gridmaps/RRSwISC6to18E3r4/map_RRSwISC6to18E3r4_to_ne120pg2_traave.20240108.nc + + cpl/gridmaps/ne120pg2/map_ne120pg2_to_r05_mono.200331.nc cpl/gridmaps/ne120pg2/map_ne120pg2_to_r05_bilin.200331.nc @@ -3498,6 +3617,11 @@ cpl/gridmaps/ne120pg2/map_ne120pg2_to_r05_bilin.200331.nc + + cpl/gridmaps/ne120pg2/map_ne120pg2_to_r025_traave.20240212.nc + cpl/gridmaps/ne120pg2/map_ne120pg2_to_r025_trbilin.20240212.nc + + cpl/gridmaps/ne240np4/map_ne240np4_to_gx1v6_aave_110428.nc cpl/gridmaps/ne240np4/map_ne240np4_to_gx1v6_aave_110428.nc @@ -3984,6 +4108,14 @@ cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_T62_traave.20231121.nc + + cpl/gridmaps/T62/map_T62_to_RRSwISC6to18E3r4_traave.20240108.nc + cpl/gridmaps/T62/map_T62_to_RRSwISC6to18E3r4-nomask_trbilin.20240108.nc + cpl/gridmaps/T62/map_T62_to_RRSwISC6to18E3r4_esmfpatch.20240108.nc + cpl/gridmaps/RRSwISC6to18E3r4/map_RRSwISC6to18E3r4_to_T62_traave.20240108.nc + cpl/gridmaps/RRSwISC6to18E3r4/map_RRSwISC6to18E3r4_to_T62_traave.20240108.nc + + cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_aave.181203.nc cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_bilin.181203.nc @@ -4080,6 +4212,14 @@ cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_TL319_traave.20231121.nc + + cpl/gridmaps/TL319/map_TL319_to_RRSwISC6to18E3r4_traave.20240108.nc + cpl/gridmaps/TL319/map_TL319_to_RRSwISC6to18E3r4-nomask_trbilin.20240108.nc + cpl/gridmaps/TL319/map_TL319_to_RRSwISC6to18E3r4_esmfpatch.20240108.nc + cpl/gridmaps/RRSwISC6to18E3r4/map_RRSwISC6to18E3r4_to_TL319_traave.20240108.nc + cpl/gridmaps/RRSwISC6to18E3r4/map_RRSwISC6to18E3r4_to_TL319_traave.20240108.nc + + cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_aave.220124.nc cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_bilin.220124.nc @@ -4540,6 +4680,11 @@ cpl/cpl6/map_rx1_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc + + cpl/cpl6/map_rx1_to_RRSwISC6to18E3r4_cstmnn.r50e100.20240108.nc + cpl/cpl6/map_rx1_to_RRSwISC6to18E3r4_cstmnn.r50e100.20240108.nc + + cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc @@ -4600,6 +4745,11 @@ cpl/cpl6/map_JRA025_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc + + cpl/cpl6/map_JRA025_to_RRSwISC6to18E3r4_cstmnn.r50e100.20240108.nc + cpl/cpl6/map_JRA025_to_RRSwISC6to18E3r4_cstmnn.r50e100.20240108.nc + + cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc @@ -4685,6 +4835,16 @@ cpl/cpl6/map_r05_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc + + cpl/cpl6/map_r05_to_RRSwISC6to18E3r4_cstmnn.r50e100.20240108.nc + cpl/cpl6/map_r05_to_RRSwISC6to18E3r4_cstmnn.r50e100.20240108.nc + + + + cpl/cpl6/map_r025_to_RRSwISC6to18E3r4_cstmnn.r50e100.20240319.nc + cpl/cpl6/map_r025_to_RRSwISC6to18E3r4_cstmnn.r50e100.20240319.nc + + cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc @@ -4735,6 +4895,11 @@ cpl/cpl6/map_r0125_to_oRRS18to6v3_smoothed.r50e100.170111.nc + + cpl/cpl6/map_r0125_to_RRSwISC6to18E3r4_cstmnn.r50e100.20240108.nc + cpl/cpl6/map_r0125_to_RRSwISC6to18E3r4_cstmnn.r50e100.20240108.nc + + cpl/cpl6/map_r0125_to_oRRS15to5_nn.160720.nc cpl/cpl6/map_r0125_to_oRRS15to5_nn.160720.nc diff --git a/components/elm/bld/namelist_files/namelist_definition.xml b/components/elm/bld/namelist_files/namelist_definition.xml index 1353f8b84b64..9dca4e6bcf58 100644 --- a/components/elm/bld/namelist_files/namelist_definition.xml +++ b/components/elm/bld/namelist_files/namelist_definition.xml @@ -1404,7 +1404,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,RRSwISC6to18E3r4"> 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 4069eb144cff..9d68c22440d9 100644 --- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml +++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml @@ -49,6 +49,7 @@ '00:10:00' '00:30:00' '00:30:00' +'00:05:00' 'split_explicit_ab2' 2 @@ -73,6 +74,7 @@ .true. .true. .true. +.true. -1.0 .false. 30.0e3 @@ -124,6 +126,7 @@ 1.18e10 1.2e11 1.2e11 +3.2e09 1.0 .false. 0.0 @@ -140,6 +143,7 @@ .false. .false. .false. +.false. 'constant' 400.0 400.0 @@ -174,6 +178,7 @@ .false. .false. .false. +.false. 'EdenGreatbatch' 'constant' 'constant' @@ -347,6 +352,7 @@ 'pressure_only' 'pressure_only' 'pressure_only' +'pressure_only' 'Jenkins' .false. 10.0 @@ -360,6 +366,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 1e-4 5e-2 0.011 @@ -368,12 +375,14 @@ 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 +8.42e-5 'flux-form' @@ -397,6 +406,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 1.0e-3 10.0 2.5e-3 @@ -475,6 +485,7 @@ '0000_00:00:15' '0000_00:01:15' '0000_00:01:00' +'0000_00:00:10' 2 .true. 2 @@ -516,6 +527,7 @@ .false. .false. .false. +.false. .false. .false. .false. @@ -1033,6 +1045,7 @@ .true. .true. .true. +.true. '0000-00-00_01:00:00' 'mocStreamfunctionOutput' .true. @@ -1115,16 +1128,19 @@ .true. .true. .true. +.true. 'dt' 'conservationCheckOutput' .false. .true. .true. .true. +.true. .false. .true. .true. .true. +.true. .true. 'conservationCheckRestart' diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml index a363c27883a3..3bd2d15c461a 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -296,6 +296,20 @@ def buildnml(case, caseroot, compname): if ocn_ismf == 'data': data_ismf_file = 'prescribed_ismf_adusumilli2020.IcoswISC30E3r5.20231120.nc' + elif ocn_grid == 'RRSwISC6to18E3r4': + decomp_date = '20240105' + decomp_prefix = 'partitions/mpas-o.graph.info.' + restoring_file = 'sss.PHC2_monthlyClimatology.RRSwISC6to18E3r4.20240105.nc' + analysis_mask_file = 'RRSwISC6to18E3r4_mocBasinsAndTransects20210623.nc' + ic_date = '20240105' + ic_prefix = 'mpaso.RRSwISC6to18E3r4' + if ocn_ic_mode == 'spunup': + ic_date = '20240110' + ic_prefix = 'mpaso.RRSwISC6to18E3r4.rstFromG-chrysalis' + if ocn_ismf == 'data': + data_ismf_file = 'prescribed_ismf_paolo2023.RRSwISC6to18E3r4.20240227.nc' + + #-------------------------------------------------------------------- # Set OCN_FORCING = datm_forced_restoring if restoring file is available #-------------------------------------------------------------------- @@ -422,7 +436,7 @@ def buildnml(case, caseroot, compname): lines.append('') lines.append('') lines.append('') lines.append('') lines.append(' ') lines.append(' ') - if not ocn_grid.startswith("oRRS1"): + if not (ocn_grid.startswith("oRRS1") or ocn_grid.startswith("RRSwISC6")): lines.append(' ') lines.append(' ') lines.append(' ') @@ -1362,7 +1376,7 @@ def buildnml(case, caseroot, compname): lines.append('1800.0 1800.0 1800.0 +900.0 'noleap' '2000-01-01_00:00:00' 'none' @@ -80,6 +81,7 @@ 75.0 85.0 85.0 +85.0 -60.0 -75.0 -75.0 @@ -90,6 +92,7 @@ -85.0 -85.0 -85.0 +-85.0 'uniform' 0.0 0.0 @@ -148,6 +151,7 @@ 1 1 1 +2 true true 120 diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml index 92e5eaf0d004..5c0dfb67ece5 100755 --- a/components/mpas-seaice/cime_config/buildnml +++ b/components/mpas-seaice/cime_config/buildnml @@ -263,6 +263,16 @@ def buildnml(case, caseroot, compname): grid_date = '20231121' grid_prefix = 'mpassi.IcoswISC30E3r5.rstFromG-chrysalis' + elif ice_grid == 'RRSwISC6to18E3r4': + decomp_date = '20240105' + decomp_prefix = 'partitions/mpas-seaice.graph.info.' + grid_date = '20240105' + grid_prefix = 'mpassi.RRSwISC6to18E3r4' + data_iceberg_file = 'Iceberg_Climatology_Merino.RRSwISC6to18E3r4.20240105.nc' + if ice_ic_mode == 'spunup': + grid_date = '20240110' + grid_prefix = 'mpassi.RRSwISC6to18E3r4.rstFromG-chrysalis' + elif ice_grid == 'ICOS10': grid_date = '211015' grid_prefix = 'seaice.ICOS10' @@ -396,7 +406,7 @@ def buildnml(case, caseroot, compname): lines.append('') lines.append('CESM1_MOD CESM1_MOD RASM_OPTION1 + RASM_OPTION2 run_coupling env_run.xml @@ -374,6 +375,7 @@ 96 96 96 + 96 96 96 48 @@ -488,6 +490,7 @@ 48 48 48 + 96 96 48 48