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..fd915fb38278 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 @@ -347,6 +357,7 @@ 'pressure_only' 'pressure_only' 'pressure_only' +'pressure_only' 'Jenkins' .false. 10.0 @@ -360,6 +371,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 1e-4 5e-2 0.011 @@ -368,12 +380,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 +411,7 @@ 4.48e-3 4.48e-3 4.48e-3 +4.48e-3 1.0e-3 10.0 2.5e-3 @@ -475,6 +490,7 @@ '0000_00:00:15' '0000_00:01:15' '0000_00:01:00' +'0000_00:01:00' 2 .true. 2 @@ -516,6 +532,7 @@ .false. .false. .false. +.false. .false. .false. .false. @@ -1033,6 +1050,7 @@ .true. .true. .true. +.true. '0000-00-00_01:00:00' 'mocStreamfunctionOutput' .true. @@ -1115,16 +1133,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 4dd4c228d484..06ef7f34b74f 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -300,6 +300,17 @@ def buildnml(case, caseroot, compname): if ocn_ismf == 'data': data_ismf_file = 'prescribed_ismf_adusumilli2020.IcoswISC30E3r5.20231120.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 1414ffc777de..64f93a281f0a 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 cbb6109018e2..0156774f17a2 100755 --- a/components/mpas-seaice/cime_config/buildnml +++ b/components/mpas-seaice/cime_config/buildnml @@ -267,6 +267,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'