diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index abed3f93ab54..0de8a945fd20 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -409,6 +409,16 @@ ECwISC30to60E3r2 + + T62 + T62 + IcoswISC30E3r4 + rx1 + null + null + IcoswISC30E3r4 + + TL319 TL319 @@ -529,6 +539,16 @@ ECwISC30to60E3r2 + + TL319 + TL319 + IcoswISC30E3r4 + JRA025 + null + null + IcoswISC30E3r4 + + TL319 TL319 @@ -1213,6 +1233,16 @@ ECwISC30to60E3r2 + + ne30np4.pg2 + ne30np4.pg2 + IcoswISC30E3r4 + r05 + null + null + IcoswISC30E3r4 + + ne0np4_northamericax4v1 r0125 @@ -1466,6 +1496,16 @@ ECwISC30to60E3r2 + + ne120np4.pg2 + r05 + IcoswISC30E3r4 + r05 + null + null + IcoswISC30E3r4 + + ne240np4 ne240np4 @@ -2034,6 +2074,16 @@ ECwISC30to60E3r2 + + ne30np4.pg2 + r05 + IcoswISC30E3r4 + r05 + null + null + IcoswISC30E3r4 + + ne30np4.pg2 r05 @@ -2344,6 +2394,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_ECwISC30to60E3r2.231018.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.T62_IcoswISC30E3r4.231121.nc T62 is Gaussian grid: @@ -2388,6 +2439,8 @@ $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_IcoswISC30E3r4.231121.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcoswISC30E3r4.231121.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 +2550,8 @@ $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_IcoswISC30E3r4.231121.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcoswISC30E3r4.231121.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 +2623,8 @@ $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_IcoswISC30E3r4.231121.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_IcoswISC30E3r4.231121.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 +2828,13 @@ 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: + + 465044 + 1 + $DIN_LOC_ROOT/share/domains/domain.ocn.IcoswISC30E3r4.231121.nc + IcoswISC30E3r4 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. Topography has been smoothed using a Gaussian filter with a standard deviation of 100 km. Additionally, the ocean includes in ice-shelf cavities: + + @@ -2803,6 +2867,8 @@ $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_IcoswISC30E3r4.231121.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r4.231121.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc r05 is 1/2 degree river routing grid: @@ -3265,6 +3331,14 @@ cpl/gridmaps/ECwISC30to60E3r2/map_ECwISC30to60E3r2_to_ne30pg2_traave.20231018.nc + + cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r4_traave.20231121.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r4_trbilin.20231121.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r4-nomask_trbilin.20231121.nc + cpl/gridmaps/IcoswISC30E3r4/map_IcoswISC30E3r4_to_ne30pg2_traave.20231121.nc + cpl/gridmaps/IcoswISC30E3r4/map_IcoswISC30E3r4_to_ne30pg2_traave.20231121.nc + + cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_mono.200331.nc cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_bilin.200331.nc @@ -3486,6 +3560,14 @@ cpl/gridmaps/ECwISC30to60E3r2/map_ECwISC30to60E3r2_to_ne120pg2_traave.20231018.nc + + cpl/gridmaps/ne120pg2/map_ne120pg2_to_IcoswISC30E3r4_traave.20231121.nc + cpl/gridmaps/ne120pg2/map_ne120pg2_to_IcoswISC30E3r4_trbilin.20231121.nc + cpl/gridmaps/ne120pg2/map_ne120pg2_to_IcoswISC30E3r4-nomask_trbilin.20231121.nc + cpl/gridmaps/IcoswISC30E3r4/map_IcoswISC30E3r4_to_ne120pg2_traave.20231121.nc + cpl/gridmaps/IcoswISC30E3r4/map_IcoswISC30E3r4_to_ne120pg2_traave.20231121.nc + + cpl/gridmaps/ne120pg2/map_ne120pg2_to_r05_mono.200331.nc cpl/gridmaps/ne120pg2/map_ne120pg2_to_r05_bilin.200331.nc @@ -3976,12 +4058,12 @@ 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/T62/map_T62_to_IcoswISC30E3r4_traave.20231121.nc + cpl/gridmaps/T62/map_T62_to_IcoswISC30E3r4-nomask_trbilin.20231121.nc + cpl/gridmaps/T62/map_T62_to_IcoswISC30E3r4_esmfpatch.20231121.nc + cpl/gridmaps/IcoswISC30E3r4/map_IcoswISC30E3r4_to_T62_traave.20231121.nc + cpl/gridmaps/IcoswISC30E3r4/map_IcoswISC30E3r4_to_T62_traave.20231121.nc @@ -4080,6 +4162,14 @@ cpl/gridmaps/ECwISC30to60E3r2/map_ECwISC30to60E3r2_to_TL319_traave.20231018.nc + + cpl/gridmaps/TL319/map_TL319_to_IcoswISC30E3r4_traave.20231121.nc + cpl/gridmaps/TL319/map_TL319_to_IcoswISC30E3r4-nomask_trbilin.20231121.nc + cpl/gridmaps/TL319/map_TL319_to_IcoswISC30E3r4_esmfpatch.20231121.nc + cpl/gridmaps/IcoswISC30E3r4/map_IcoswISC30E3r4_to_TL319_traave.20231121.nc + cpl/gridmaps/IcoswISC30E3r4/map_IcoswISC30E3r4_to_TL319_traave.20231121.nc + + cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_aave.220124.nc cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_bilin.220124.nc @@ -4540,6 +4630,11 @@ cpl/cpl6/map_rx1_to_ECwISC30to60E3r2_smoothed.r150e300.230901.nc + + cpl/cpl6/map_rx1_to_IcoswISC30E3r4_cstmnn.r150e300.20231121.nc + cpl/cpl6/map_rx1_to_IcoswISC30E3r4_cstmnn.r150e300.20231121.nc + + cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc @@ -4600,6 +4695,11 @@ cpl/cpl6/map_JRA025_to_ECwISC30to60E3r2_smoothed.r150e300.230901.nc + + cpl/cpl6/map_JRA025_to_IcoswISC30E3r4_cstmnn.r150e300.20231121.nc + cpl/cpl6/map_JRA025_to_IcoswISC30E3r4_cstmnn.r150e300.20231121.nc + + cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc @@ -4685,6 +4785,11 @@ cpl/cpl6/map_r05_to_ECwISC30to60E3r2_smoothed.r150e300.230901.nc + + cpl/cpl6/map_r05_to_IcoswISC30E3r4_cstmnn.r150e300.20231121.nc + cpl/cpl6/map_r05_to_IcoswISC30E3r4_cstmnn.r150e300.20231121.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 979c98fe1d75..e7bca9edb458 100644 --- a/components/elm/bld/namelist_files/namelist_definition.xml +++ b/components/elm/bld/namelist_files/namelist_definition.xml @@ -1330,7 +1330,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,ECwISC30to60E3r2,IcoswISC30E3r4"> 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 37f25561acbd..ce33e1078a70 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:30:00' 'split_explicit_ab2' 2 @@ -73,6 +74,7 @@ .true. .true. .true. +.true. -1.0 .false. 30.0e3 @@ -89,6 +91,7 @@ .true. .true. .true. +.true. 10.0 1000.0 1000.0 @@ -99,6 +102,7 @@ 462.0 1000.0 1000.0 +1000.0 .false. 10.0 @@ -124,6 +128,7 @@ 1.18e10 1.2e11 1.2e11 +1.2e11 1.0 .false. 0.0 @@ -156,6 +161,7 @@ 'RossbyRadius' 'ramp' +'ramp' 20e3 30e3 30e3 @@ -182,6 +188,7 @@ 'N2_dependent' 'constant' +'constant' 900.0 600.0 600.0 @@ -191,6 +198,7 @@ 600.0 600.0 600.0 +600.0 0.3 'constant' 300.0 @@ -200,6 +208,7 @@ 1.0 3.0 +3.0 0.13 1000.0 200.0 @@ -211,6 +220,7 @@ 'RossbyRadius' 'ramp' +'ramp' 20e3 30e3 30e3 @@ -348,6 +358,7 @@ 'pressure_only' 'pressure_only' 'pressure_only' +'pressure_only' 'Jenkins' .false. 10.0 @@ -361,6 +372,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 1e-4 5e-2 0.011 @@ -369,12 +381,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' @@ -398,6 +412,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 1.0e-3 10.0 2.5e-3 @@ -476,6 +491,7 @@ '0000_00:00:15' '0000_00:01:15' '0000_00:01:15' +'0000_00:01:00' 2 .true. 2 @@ -517,6 +533,7 @@ .false. .false. .false. +.false. .false. .false. .false. @@ -1034,6 +1051,7 @@ .true. .true. .true. +.true. '0000-00-00_01:00:00' 'mocStreamfunctionOutput' .true. @@ -1116,16 +1134,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 dbb37d5ec5a8..f2e7d40fed7a 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -296,6 +296,19 @@ def buildnml(case, caseroot, compname): if ocn_ismf == 'data': data_ismf_file = 'prescribed_ismf_adusumilli2020.ECwISC30to60E3r2.20230901.nc' + elif ocn_grid == 'IcoswISC30E3r4': + decomp_date = '20231120' + decomp_prefix = 'partitions/mpas-o.graph.info.' + restoring_file = 'sss.PHC2_monthlyClimatology.IcoswISC30E3r4.20231120.nc' + analysis_mask_file = 'IcoswISC30E3r4_mocBasinsAndTransects20210623.nc' + ic_date = '20231120' + ic_prefix = 'mpaso.IcoswISC30E3r4' + if ocn_ic_mode == 'spunup': + ic_date = '20231121' + ic_prefix = 'mpaso.IcoswISC30E3r4.rstFromG-chrysalis' + if ocn_ismf == 'data': + data_ismf_file = 'prescribed_ismf_adusumilli2020.IcoswISC30E3r4.20231120.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 044418599e0f..0a6905fe109c 100644 --- a/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml +++ b/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml @@ -25,6 +25,7 @@ 1800.0 1800.0 1800.0 +1800.0 'noleap' '2000-01-01_00:00:00' 'none' @@ -77,6 +78,7 @@ 75.0 70.0 +70.0 75.0 85.0 85.0 @@ -87,6 +89,7 @@ -75.0 -60.0 +-60.0 -85.0 -85.0 -85.0 @@ -148,6 +151,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 19e353ce065e..bb91daa8df72 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 = '230914' grid_prefix = 'mpassi.ECwISC30to60E3r2.rstFromG-chrysalis' + elif ice_grid == 'IcoswISC30E3r4': + grid_date = '20231120' + grid_prefix = 'mpassi.IcoswISC30E3r4' + decomp_date = '20231120' + decomp_prefix = 'partitions/mpas-seaice.graph.info.' + data_iceberg_file = 'Iceberg_Climatology_Merino.IcoswISC30E3r4.20231120.nc' + if ice_ic_mode == 'spunup': + grid_date = '20231121' + grid_prefix = 'mpassi.IcoswISC30E3r4.rstFromG-chrysalis' + elif ice_grid == 'ICOS10': grid_date = '211015' grid_prefix = 'seaice.ICOS10'