diff --git a/cime_config/allactive/config_pesall.xml b/cime_config/allactive/config_pesall.xml index 7bcf72e44e62..ca034e18a7a5 100644 --- a/cime_config/allactive/config_pesall.xml +++ b/cime_config/allactive/config_pesall.xml @@ -1586,6 +1586,67 @@ + + + + --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 20 nodes pure-MPI, ~7.25 sypd + + 1024 + 1024 + 256 + 640 + 384 + 385 + + + 0 + 0 + 1024 + 0 + 640 + 640 + + + + --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 54 nodes pure-MPI, ~17.5 sypd + + 2752 + 2752 + 704 + 2048 + 704 + 704 + + + 0 + 0 + 2752 + 0 + 2048 + 2048 + + + + --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 105 nodes pure-MPI, ~27.7 sypd + + 5440 + 5440 + 1280 + 4352 + 1088 + 1088 + + + 0 + 0 + 5440 + 0 + 4352 + 4352 + + + + diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index 0ed744245bea..b9ae00da0195 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -599,6 +599,16 @@ IcoswISC30E3r5 + + TL319 + TL319 + IcosXISC30E3r7 + JRA025 + null + null + IcosXISC30E3r7 + + TL319 TL319 @@ -2174,6 +2184,16 @@ IcoswISC30E3r5 + + ne30np4.pg2 + r05 + IcosXISC30E3r7 + r05 + null + null + IcosXISC30E3r7 + + ne30np4.pg2 r05 @@ -2536,6 +2556,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_IcosXISC30E3r7.240326.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcosXISC30E3r7.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: @@ -2645,6 +2667,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_IcosXISC30E3r7.240326.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcosXISC30E3r7.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: @@ -2947,6 +2971,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: + + 463013 + 1 + $DIN_LOC_ROOT/share/domains/domain.ocn.IcosXISC30E3r7.240326.nc + 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.: + + @@ -2979,6 +3010,8 @@ $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_IcosXISC30E3r7.240326.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc r05 is 1/2 degree river routing grid: @@ -3451,6 +3484,16 @@ cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r5_trfvnp2.20231121.nc + + cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_traave.20240326.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_trbilin.20240326.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_trbilin.20240326.nc + cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_ne30pg2_traave.20240326.nc + cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_ne30pg2_traave.20240326.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_trfvnp2.20240326.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_trfvnp2.20240326.nc + + cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_mono.200331.nc cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_bilin.200331.nc @@ -4322,6 +4365,14 @@ cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_TL319_traave.20231121.nc + + cpl/gridmaps/TL319/map_TL319_to_IcosXISC30E3r7_traave.20240326.nc + cpl/gridmaps/TL319/map_TL319_to_IcosXISC30E3r7_trbilin.20240326.nc + cpl/gridmaps/TL319/map_TL319_to_IcosXISC30E3r7_esmfpatch.20240326.nc + cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_TL319_traave.20240326.nc + cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_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 @@ -4698,6 +4749,10 @@ cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_r05_traave.20231121.nc + + cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_r05_traave.20240326.nc + + cpl/cpl6/map_EC30to60E2r2_to_r05_neareststod.220728.nc @@ -4884,6 +4939,11 @@ cpl/cpl6/map_JRA025_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc + + cpl/cpl6/map_JRA025_to_IcosXISC30E3r7_cstmnn.r150e300.20240326.nc + cpl/cpl6/map_JRA025_to_IcosXISC30E3r7_cstmnn.r150e300.20240326.nc + + cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc @@ -4969,6 +5029,11 @@ cpl/cpl6/map_r05_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc + + cpl/cpl6/map_r05_to_IcosXISC30E3r7_cstmnn.r150e300.20240326.nc + cpl/cpl6/map_r05_to_IcosXISC30E3r7_cstmnn.r150e300.20240326.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 55abc0ef3069..61354711a376 100644 --- a/components/elm/bld/namelist_files/namelist_definition.xml +++ b/components/elm/bld/namelist_files/namelist_definition.xml @@ -1424,7 +1424,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"> 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 6541b9a5a2be..5a3359cd2d7a 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' '00:08:00' '00:04:00' '00:02:00' @@ -77,6 +78,7 @@ .true. .true. .true. +.true. .true. .true. .true. @@ -97,6 +99,7 @@ .true. .true. .true. +.true. .true. .true. .true. @@ -111,6 +114,7 @@ 462.0 1000.0 1000.0 +1000.0 308.0 154.0 77.0 @@ -140,6 +144,7 @@ 1.18e10 1.2e11 1.2e11 +1.2e11 3.50e09 4.37e08 5.46e07 @@ -175,6 +180,7 @@ 'RossbyRadius' 'RossbyRadius' 'ramp' +'ramp' 'RossbyRadius' 'RossbyRadius' 'RossbyRadius' @@ -204,6 +210,7 @@ 'N2_dependent' 'N2_dependent' 'constant' +'constant' 'N2_dependent' 'N2_dependent' 'N2_dependent' @@ -217,6 +224,7 @@ 600.0 600.0 600.0 +600.0 600.0 600.0 600.0 @@ -229,6 +237,7 @@ 1.0 1.0 3.0 +3.0 1.0 1.0 1.0 @@ -243,6 +252,7 @@ 'RossbyRadius' 'RossbyRadius' 'ramp' +'ramp' 'RossbyRadius' 'RossbyRadius' 'RossbyRadius' @@ -383,6 +393,7 @@ 'pressure_only' 'pressure_only' 'pressure_only' +'pressure_only' 'pressure_only' 'pressure_only' 'pressure_only' @@ -400,6 +411,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 4.48e-3 4.48e-3 4.48e-3 @@ -412,6 +424,7 @@ 0.00295 0.00295 0.00295 +0.00295 0.00295 0.00295 0.00295 @@ -422,6 +435,7 @@ 8.42e-5 8.42e-5 8.42e-5 +8.42e-5 8.42e-5 8.42e-5 8.42e-5 @@ -449,6 +463,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 4.48e-3 4.48e-3 4.48e-3 @@ -531,6 +546,7 @@ '0000_00:00:15' '0000_00:01:15' '0000_00:01:00' +'0000_00:01:00' '0000_00:00:10' '0000_00:00:05' '0000_00:00:02.5' @@ -576,6 +592,7 @@ .false. .false. .false. +.false. .false. .false. .false. @@ -1097,6 +1114,7 @@ .true. .true. .true. +.true. .true. .true. .true. @@ -1183,6 +1201,7 @@ .true. .true. .true. +.true. .true. .true. .true. @@ -1193,6 +1212,7 @@ .true. .true. .true. +.true. .true. .true. .true. @@ -1201,6 +1221,7 @@ .true. .true. .true. +.true. .true. .true. .true. diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml index 048e621fafad..7dca58023e0d 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -352,6 +352,17 @@ def buildnml(case, caseroot, compname): if ocn_ismf == 'data': data_ismf_file = 'prescribed_ismf_paolo2023.IcoswISC30E3r5.20240227.nc' + elif ocn_grid == 'IcosXISC30E3r7': + decomp_date = '20240314' + decomp_prefix = 'partitions/mpas-o.graph.info.' + restoring_file = 'sss.PHC2_monthlyClimatology.IcosXISC30E3r7.20240314.nc' + analysis_mask_file = 'IcosXISC30E3r7_mocBasinsAndTransects20210623.nc' + ic_date = '20240314' + ic_prefix = 'mpaso.IcosXISC30E3r7' + if ocn_ic_mode == 'spunup': + ic_date = '20240314' + ic_prefix = 'mpaso.IcosXISC30E3r7.rstFromPiControlSpinup-chrysalis' + #-------------------------------------------------------------------- # 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 a47e57981592..23f258f2a308 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 480.0 240.0 120.0 @@ -81,6 +82,7 @@ 75.0 70.0 +70.0 85.0 85.0 85.0 @@ -95,6 +97,7 @@ -75.0 -60.0 +-60.0 -85.0 -85.0 -85.0 @@ -160,6 +163,7 @@ 1 1 1 +1 1 1 1 diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml index 0aa12105bf9a..feecb0c6987b 100755 --- a/components/mpas-seaice/cime_config/buildnml +++ b/components/mpas-seaice/cime_config/buildnml @@ -307,6 +307,16 @@ def buildnml(case, caseroot, compname): grid_date = '20231121' grid_prefix = 'mpassi.IcoswISC30E3r5.rstFromG-chrysalis' + elif ice_grid == 'IcosXISC30E3r7': + grid_date = '20240314' + grid_prefix = 'mpassi.IcosXISC30E3r7' + decomp_date = '20240314' + decomp_prefix = 'partitions/mpas-seaice.graph.info.' + data_iceberg_file = 'Iceberg_Climatology_Merino.IcosXISC30E3r7.20240314.nc' + if ice_ic_mode == 'spunup': + grid_date = '20240314' + grid_prefix = 'mpassi.IcosXISC30E3r7.rstFromPiControlSpinup-chrysalis' + elif ice_grid == 'ICOS10': grid_date = '211015' grid_prefix = 'seaice.ICOS10'