From 8a6c28bc26fada104ef54bcf220a526c5aede86f Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 2 Aug 2022 18:30:45 -0500 Subject: [PATCH 01/12] Adding support for ARRM10to60E2r1 ocn/ice mesh to config_grids --- cime_config/config_grids.xml | 106 +++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index 78103a253bb4..ee9ba73bb3b7 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -340,6 +340,16 @@ oARRM60to6 + + T62 + T62 + ARRM10to60E2r1 + rx1 + null + null + ARRM10to60E2r1 + + T62 T62 @@ -440,6 +450,16 @@ oARRM60to6 + + TL319 + TL319 + ARRM10to60E2r1 + JRA025 + null + null + ARRM10to60E2r1 + + TL319 TL319 @@ -1014,6 +1034,16 @@ oARRM60to10 + + ne0np4_arcticx4v1.pg2 + ne0np4_arcticx4v1.pg2 + ARRM10to60E2r1 + r0125 + null + null + ARRM10to60E2r1 + + ne0np4_svalbard_x8v1_lowcon ne0np4_svalbard_x8v1_lowcon @@ -1843,6 +1873,16 @@ oARRM60to10 + + ne30np4.pg2 + ne30np4.pg2 + ARRM10to60E2r1 + r05 + null + null + ARRM10to60E2r1 + + ne30np4.pg2 ne30np4.pg2 @@ -2223,6 +2263,7 @@ $DIN_LOC_ROOT/share/domains/domain.lnd.T62_oRRS15to5.150722.nc $DIN_LOC_ROOT/share/domains/domain.lnd.T62_oARRM60to10.180716.nc $DIN_LOC_ROOT/share/domains/domain.lnd.T62_oARRM60to6.180803.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.T62_ARRM10to60E2r1.220802.nc $DIN_LOC_ROOT/share/domains/domain.lnd.T62_EC30to60E2r2.201005.nc $DIN_LOC_ROOT/share/domains/domain.lnd.T62_WC14to60E2r3.200929.nc $DIN_LOC_ROOT/share/domains/domain.lnd.T62_WCAtl12to45E2r4.210318.nc @@ -2258,6 +2299,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oARRM60to10.180905.nc $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_oARRM60to6.180905.nc $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oARRM60to6.180905.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_ARRM10to60E2r1.220802.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ARRM10to60E2r1.220802.nc $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_EC30to60E2r2.201005.nc $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_EC30to60E2r2.201005.nc $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_WC14to60E2r3.200929.nc @@ -2359,6 +2402,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_oEC60to30v3.200220.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_ARRM60to10.200527.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_ARRM60to10.200527.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_ARRM10to60E2r1.220802.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_ARRM10to60E2r1.220802.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_EC30to60E2r2.201005.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_EC30to60E2r2.201005.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_WC14to60E2r3.200929.nc @@ -2569,6 +2614,13 @@ oARRM60to6 is an Arctic-Region-Refined MPAS ocean grid with 30 km gridcells at -90 deg latitude, 60 km gridcells at -40 deg latitude, 30 km gridcells at the equator, and 6 km gridcells at 90 deg latitude; North Atlantic and North Pacific have different resolution between 0 and 60 deg latitudes: + + 594836 + 1 + $DIN_LOC_ROOT/share/domains/domain.ocn.ARRM10to60E2r1.220802.nc + ARRM10to60E2r1 is an Arctic-Region-Refined MPAS ocean grid with 30 km gridcells at -90 deg latitude, 60 km gridcells at -40 deg latitude, 30 km gridcells at the equator, and 10 km gridcells at 90 deg latitude; North Atlantic and North Pacific have different resolution between 0 and 60 deg latitudes: + + 236853 1 @@ -2785,6 +2837,8 @@ 1 $DIN_LOC_ROOT/share/domains/domain.lnd.arcticx4v1pg2_oARRM60to10.210630.nc $DIN_LOC_ROOT/share/domains/domain.ocn.arcticx4v1pg2_oARRM60to10.210630.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.arcticx4v1pg2_ARRM10to60E2r1.220802.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.arcticx4v1pg2_ARRM10to60E2r1.220802.nc 1-deg with 1/4-deg over Arctic (version 1) pg2: @@ -3032,6 +3086,14 @@ cpl/gridmaps/oARRM60to10/map_ARRM60to10_to_ne30pg2_mono.200527.nc + + cpl/gridmaps/ne30pg2/map_ne30pg2_to_ARRM10to60E2r1_mono.220802.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_ARRM10to60E2r1_bilin.220802.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_ARRM10to60E2r1_bilin.220802.nc + cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_ne30pg2_mono.220802.nc + cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_ne30pg2_mono.220802.nc + + cpl/gridmaps/ne30pg2/map_ne30pg2_to_EC30to60E2r2_mono.201005.nc cpl/gridmaps/ne30pg2/map_ne30pg2_to_EC30to60E2r2_bilin.201005.nc @@ -3529,6 +3591,14 @@ cpl/gridmaps/oARRM60to10/map_oARRM60to10_to_arcticx4v1pg2_mono.20210407.nc + + cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_mono.220802.nc + cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_bilin.220802.nc + cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_bilin.220802.nc + cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_arcticx4v1pg2_mono.220802.nc + cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_arcticx4v1pg2_mono.220802.nc + + cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r0125_mono.20210517.nc cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r0125_mono.20210517.nc @@ -3697,6 +3767,14 @@ cpl/gridmaps/oARRM60to6/map_oARRM60to6_to_T62_aave.180803.nc + + cpl/gridmaps/T62/map_T62_to_ARRM10to60E2r1_aave.220802.nc + cpl/gridmaps/T62/map_T62_to_ARRM10to60E2r1_bilin.220802.nc + cpl/gridmaps/T62/map_T62_to_ARRM10to60E2r1_patch.220802.nc + cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_T62_aave.220802.nc + cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_T62_aave.220802.nc + + cpl/gridmaps/T62/map_T62_to_EC30to60E2r2_aave.201005.nc cpl/gridmaps/T62/map_T62_to_EC30to60E2r2_bilin.201005.nc @@ -3777,6 +3855,14 @@ cpl/gridmaps/oARRM60to6/map_oARRM60to6_to_TL319_aave.180904.nc + + cpl/gridmaps/TL319/map_TL319_to_ARRM10to60E2r1_aave.220802.nc + cpl/gridmaps/TL319/map_TL319_to_ARRM10to60E2r1_bilin.220802.nc + cpl/gridmaps/TL319/map_TL319_to_ARRM10to60E2r1_patch.220802.nc + cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_TL319_aave.220802.nc + cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_TL319_aave.220802.nc + + cpl/gridmaps/TL319/map_TL319_to_EC30to60E2r2_aave.201005.nc cpl/gridmaps/TL319/map_TL319_to_EC30to60E2r2_bilin.201005.nc @@ -4220,6 +4306,11 @@ cpl/cpl6/map_rx1_to_oARRM60to6_smoothed.r150e300.180816.nc + + cpl/cpl6/map_rx1_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc + cpl/cpl6/map_rx1_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc + + cpl/cpl6/map_rx1_to_EC30to60E2r2_smoothed.r150e300.201005.nc cpl/cpl6/map_rx1_to_EC30to60E2r2_smoothed.r150e300.201005.nc @@ -4270,6 +4361,11 @@ cpl/cpl6/map_JRA025_to_oARRM60to6_smoothed.r150e300.181220.nc + + cpl/cpl6/map_JRA025_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc + cpl/cpl6/map_JRA025_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc + + cpl/cpl6/map_JRA025_to_EC30to60E2r2_smoothed.r150e300.201005.nc cpl/cpl6/map_JRA025_to_EC30to60E2r2_smoothed.r150e300.201005.nc @@ -4335,11 +4431,21 @@ cpl/cpl6/map_r05_to_ARRM60to10_smoothed.r150e300.200413.nc + + cpl/cpl6/map_r05_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc + cpl/cpl6/map_r05_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc + + cpl/cpl6/map_r0125_to_ARRM60to10_smoothed.r50e100.220214.nc cpl/cpl6/map_r0125_to_ARRM60to10_smoothed.r50e100.220214.nc + + cpl/cpl6/map_r0125_to_ARRM10to60E2r1_smoothed.r50e100.220802.nc + cpl/cpl6/map_r0125_to_ARRM10to60E2r1_smoothed.r50e100.220802.nc + + cpl/cpl6/map_r05_to_EC30to60E2r2_smoothed.r150e300.201005.nc cpl/cpl6/map_r05_to_EC30to60E2r2_smoothed.r150e300.201005.nc From 33baa35f1039a375f5c4e3f391f01859dadc83cd Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 2 Aug 2022 18:32:16 -0500 Subject: [PATCH 02/12] Adding ARRM10to60E2r1 ocn/ice mesh to list of valid meshes for ELM --- components/elm/bld/namelist_files/namelist_definition.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/elm/bld/namelist_files/namelist_definition.xml b/components/elm/bld/namelist_files/namelist_definition.xml index 5384a7ae62be..f5bed3f85055 100644 --- a/components/elm/bld/namelist_files/namelist_definition.xml +++ b/components/elm/bld/namelist_files/namelist_definition.xml @@ -1297,7 +1297,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"> Land mask description From fa1cabf68b06f885e852a6aae9f79b9130b16ad8 Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 2 Aug 2022 19:02:46 -0500 Subject: [PATCH 03/12] Adding ARRM10to60E2r1 ocn/ice mesh to E3SM namelist/streams generation --- components/mpas-ocean/cime_config/buildnml | 11 +++++++++++ components/mpas-seaice/cime_config/buildnml | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml index 2e04d3516cf4..3f0b020aad1b 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -207,6 +207,17 @@ def buildnml(case, caseroot, compname): logger.warning("WARNING: The specified compset is requesting ocean ICs spunup from a G-case") logger.warning(" But no file available for this grid.") + elif ocn_grid == 'ARRM10to60E2r1': + decomp_date = '220730' + decomp_prefix = 'mpas-o.graph.info.' + restoring_file = 'sss.PHC3.0_monthlyClimatology.ARRM10to60E2r1.220802.nc' + analysis_mask_file = 'ARRM10to60E2r1_mocBasinsAndTransects220730.nc' + ic_date = '220730' + ic_prefix = 'mpaso.ARRM10to60E2r1' + 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.") + elif ocn_grid == 'EC30to60E2r2': decomp_date = '200904' decomp_prefix = 'mpas-o.graph.info.' diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml index 0472181b6e13..fc2ca900a7a1 100755 --- a/components/mpas-seaice/cime_config/buildnml +++ b/components/mpas-seaice/cime_config/buildnml @@ -198,6 +198,15 @@ def buildnml(case, caseroot, compname): 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 == 'ARRM10to60E2r1': + decomp_date = '220730' + decomp_prefix = 'mpas-o.graph.info.' + grid_date = '220730' + grid_prefix = 'mpassi.ARRM10to60E2r1' + 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 == 'EC30to60E2r2': decomp_date = '200908' decomp_prefix = 'mpas-seaice.graph.info.' From 761b1d3c38d48aba18b47e6dee420ba0dac83c35 Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 2 Aug 2022 19:09:09 -0500 Subject: [PATCH 04/12] Setting default namelist options for ARRM10to60E2r1 ocn/ice mesh --- .../bld/namelist_files/namelist_defaults_mpaso.xml | 5 +++++ .../bld/namelist_files/namelist_defaults_mpassi.xml | 4 ++++ 2 files changed, 9 insertions(+) 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 a1c31bf79ab2..1ca505ffa8de 100644 --- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml +++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml @@ -47,6 +47,7 @@ '00:03:45' '00:10:00' '00:05:00' +'00:10:00' '00:30:00' '00:10:00' '00:10:00' @@ -68,6 +69,7 @@ .true. .true. .true. +.true. .true. .true. .true. @@ -115,6 +117,7 @@ 1.9e09 1.5e10 3.2e09 +1.5e10 1.2e11 1.18e10 1.18e10 @@ -414,6 +417,7 @@ '0000_00:00:11.25' '0000_00:00:24' '0000_00:00:10' +'0000_00:00:24' '0000_00:01:00' '0000_00:00:15' '0000_00:00:15' @@ -958,6 +962,7 @@ .false. .false. .false. +.true. .true. .true. .true. 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 f252d353af20..6c0d1f65aaa6 100644 --- a/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml +++ b/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml @@ -18,6 +18,7 @@ 900.0 900.0 900.0 +900.0 1800.0 1800.0 1800.0 @@ -72,6 +73,7 @@ 75.0 85.0 75.0 +75.0 85.0 85.0 -60.0 @@ -79,6 +81,7 @@ -75.0 -85.0 -75.0 +-85.0 -85.0 -85.0 'uniform' @@ -125,6 +128,7 @@ 2 1 2 +1 1 1 1 From 29a12071abf1c8e9b02f69e79c98ad7389b38e6c Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Wed, 3 Aug 2022 09:25:52 -0500 Subject: [PATCH 05/12] Updating spunup ICs for ARRM10to60E2r1 ocn/ice mesh --- components/mpas-ocean/cime_config/buildnml | 4 ++-- components/mpas-seaice/cime_config/buildnml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml index 3f0b020aad1b..f7e915a153b6 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -215,8 +215,8 @@ def buildnml(case, caseroot, compname): ic_date = '220730' ic_prefix = 'mpaso.ARRM10to60E2r1' 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.") + ic_date = '220802' + ic_prefix = 'mpaso.ARRM10to60E2r1.rstFrom1monthG-chrys' elif ocn_grid == 'EC30to60E2r2': decomp_date = '200904' diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml index fc2ca900a7a1..ff19a42c0228 100755 --- a/components/mpas-seaice/cime_config/buildnml +++ b/components/mpas-seaice/cime_config/buildnml @@ -204,8 +204,8 @@ def buildnml(case, caseroot, compname): grid_date = '220730' grid_prefix = 'mpassi.ARRM10to60E2r1' 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.") + grid_date = '220802' + grid_prefix = 'mpassi.ARRM10to60E2r1.rstFrom1monthG-chrys' elif ice_grid == 'EC30to60E2r2': decomp_date = '200908' From 41f7b1d9330064ee3c3c9d14fdcb3163e4566507 Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Fri, 5 Aug 2022 12:31:30 -0500 Subject: [PATCH 06/12] Updating sea ice graph partition files to v2 --- components/mpas-seaice/cime_config/buildnml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml index ff19a42c0228..bc08b6380614 100755 --- a/components/mpas-seaice/cime_config/buildnml +++ b/components/mpas-seaice/cime_config/buildnml @@ -199,8 +199,8 @@ def buildnml(case, caseroot, compname): logger.warning(" But no file available for this grid.") elif ice_grid == 'ARRM10to60E2r1': - decomp_date = '220730' - decomp_prefix = 'mpas-o.graph.info.' + decomp_date = '220802' + decomp_prefix = 'mpas-seaice.v2.' grid_date = '220730' grid_prefix = 'mpassi.ARRM10to60E2r1' if ice_ic_mode == 'spunup': From b480ae8bd007de01bbe977e1654fced40a150da9 Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Mon, 22 Aug 2022 11:16:30 -0500 Subject: [PATCH 07/12] Changing default Redi min layers to 15 --- .../mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1ca505ffa8de..ccb6d77e9186 100644 --- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml +++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml @@ -148,7 +148,7 @@ .true. 0.1 .true. -6 +15 'ramp' 20e3 30e3 From 2e4100bac02fed6a138e7240b544eeb125876e2b Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 30 Aug 2022 15:17:14 -0500 Subject: [PATCH 08/12] Changing default coupling frequencies for G-cases so uses 15min sea ice timestep --- driver-mct/cime_config/config_component_e3sm.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/driver-mct/cime_config/config_component_e3sm.xml b/driver-mct/cime_config/config_component_e3sm.xml index 3405face4b31..aa456fe3241f 100755 --- a/driver-mct/cime_config/config_component_e3sm.xml +++ b/driver-mct/cime_config/config_component_e3sm.xml @@ -372,6 +372,7 @@ 96 96 96 + 96 48 12 96 @@ -484,6 +485,7 @@ 96 48 48 + 48 run_coupling From c0c860a2f8139fd271cfa19a35c25facb441865f Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Thu, 8 Sep 2022 13:32:59 -0500 Subject: [PATCH 09/12] Revert "Changing default coupling frequencies for G-cases so uses 15min sea ice timestep" This reverts commit 2e4100bac02fed6a138e7240b544eeb125876e2b. --- driver-mct/cime_config/config_component_e3sm.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/driver-mct/cime_config/config_component_e3sm.xml b/driver-mct/cime_config/config_component_e3sm.xml index aa456fe3241f..3405face4b31 100755 --- a/driver-mct/cime_config/config_component_e3sm.xml +++ b/driver-mct/cime_config/config_component_e3sm.xml @@ -372,7 +372,6 @@ 96 96 96 - 96 48 12 96 @@ -485,7 +484,6 @@ 96 48 48 - 48 run_coupling From debc6b0d8331d438968ada0baf2ca612e3d91c7f Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 13 Sep 2022 15:22:37 -0500 Subject: [PATCH 10/12] Making change to Redi_min_layers_diag_terms 15 for this mesh only, leaving 6 as general default --- .../mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ccb6d77e9186..85efaed17a80 100644 --- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml +++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml @@ -148,7 +148,8 @@ .true. 0.1 .true. -15 +6 +15 'ramp' 20e3 30e3 From d81b7545ffad6e9c985fa62e748d499673a4e633 Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 13 Sep 2022 15:29:15 -0500 Subject: [PATCH 11/12] Changing name of analysis_mask_file to intended ARRM10to60E2r1_mocBasinsAndTransects20210623.nc --- components/mpas-ocean/cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml index f7e915a153b6..bee38ebf2df4 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -211,7 +211,7 @@ def buildnml(case, caseroot, compname): decomp_date = '220730' decomp_prefix = 'mpas-o.graph.info.' restoring_file = 'sss.PHC3.0_monthlyClimatology.ARRM10to60E2r1.220802.nc' - analysis_mask_file = 'ARRM10to60E2r1_mocBasinsAndTransects220730.nc' + analysis_mask_file = 'ARRM10to60E2r1_mocBasinsAndTransects20210623.nc' ic_date = '220730' ic_prefix = 'mpaso.ARRM10to60E2r1' if ocn_ic_mode == 'spunup': From b87a2bffb32b7f307411aeeae4325dfb66e00e1d Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 20 Sep 2022 09:59:58 -0500 Subject: [PATCH 12/12] Adding land initial condition for WCYCL1950 compset with ne30pg2 atm --- components/elm/bld/namelist_files/namelist_defaults.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/elm/bld/namelist_files/namelist_defaults.xml b/components/elm/bld/namelist_files/namelist_defaults.xml index ea0ca18c7908..8023c1c9b18a 100644 --- a/components/elm/bld/namelist_files/namelist_defaults.xml +++ b/components/elm/bld/namelist_files/namelist_defaults.xml @@ -183,6 +183,10 @@ sim_year="1950" glc_nec="0" use_crop=".false.">lnd/clm2/initdata/20210802.ICRUEL sim_year="1950" glc_nec="0" use_crop=".false.">lnd/clm2/initdata/20210817.ICRUELM-1950.ne30pg2_SOwISC12to60E2r4.elm.r.0051-01-01-00000.nc +lnd/clm2/initdata/20220908.ICRUELM-1950.ne30pg2_ARRM10to60E2r1.anvil.elm.r.0051-01-01-00000.nc + +