From 1199ea104fb74e37f8b937e589909ce2087a0e77 Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Thu, 8 Sep 2022 13:32:59 -0500 Subject: [PATCH 1/6] 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 ca54900024b4..543eeb4680be 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 @@ -487,7 +486,6 @@ 96 48 48 - 48 96 From fca31d7afa73c57bb85a876f3413b7810ff5ee39 Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 13 Sep 2022 15:22:37 -0500 Subject: [PATCH 2/6] 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 | 1 + 1 file changed, 1 insertion(+) 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..85efaed17a80 100644 --- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml +++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml @@ -149,6 +149,7 @@ 0.1 .true. 6 +15 'ramp' 20e3 30e3 From 894d8321cfef7ee80018111f46d21aa7c0d8f198 Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 13 Sep 2022 15:29:15 -0500 Subject: [PATCH 3/6] 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 0c8be99f4f2d76f49650628c3aa4f6c9f0254179 Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 20 Sep 2022 09:59:58 -0500 Subject: [PATCH 4/6] 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 20f8b52339d5..0c6afcd6fed6 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 + + Date: Tue, 25 Oct 2022 10:41:18 -0500 Subject: [PATCH 5/6] Adding fsurdat and finidat for 1950 conditions for arcticx4v1 mesh --- components/elm/bld/namelist_files/namelist_defaults.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/elm/bld/namelist_files/namelist_defaults.xml b/components/elm/bld/namelist_files/namelist_defaults.xml index 0c6afcd6fed6..c78c8f7582ee 100644 --- a/components/elm/bld/namelist_files/namelist_defaults.xml +++ b/components/elm/bld/namelist_files/namelist_defaults.xml @@ -231,12 +231,13 @@ lnd/clm2/surfdata_map/surfdata_ne0np4_northamericax4v1.pg2_simyr2010_c210112.nc< lnd/clm2/initdata/arcticx4v1pg2_oARRM60to10.ICRUELM.spinup-from-interp.elm.r.0051-01-01-00000.nc +lnd/clm2/initdata/20221017.ICRUELM-1950.arcticx4v1pg2_ARRM10to60E2r1.anvil.elm.r.0051-01-01-00000.nc lnd/clm2/surfdata_map/surfdata_arcticx4v1pg2_simyr2010_c210805.nc lnd/clm2/surfdata_map/surfdata_arcticx4v1pg2_simyr2000_c210707.nc -lnd/clm2/surfdata_map/surfdata_arcticx4v1pg2_simyr2000_c210707.nc +lnd/clm2/surfdata_map/surfdata_arcticx4v1pg2_simyr1950_c221017.nc lnd/clm2/surfdata_map/surfdata_arcticx4v1pg2_simyr1850_c210707.nc From 584e78610be68a3e0d0ea8ea86392236de84d975 Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 25 Oct 2022 12:53:57 -0500 Subject: [PATCH 6/6] Adding mask specification for previous arcticx4v1 finidat --- components/elm/bld/namelist_files/namelist_defaults.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/elm/bld/namelist_files/namelist_defaults.xml b/components/elm/bld/namelist_files/namelist_defaults.xml index c78c8f7582ee..69d12d39fedf 100644 --- a/components/elm/bld/namelist_files/namelist_defaults.xml +++ b/components/elm/bld/namelist_files/namelist_defaults.xml @@ -230,7 +230,7 @@ lnd/clm2/surfdata_map/surfdata_ne0np4_northamericax4v1.pg2_simyr1850_c210112.nc< lnd/clm2/surfdata_map/surfdata_ne0np4_northamericax4v1.pg2_simyr2010_c210112.nc -lnd/clm2/initdata/arcticx4v1pg2_oARRM60to10.ICRUELM.spinup-from-interp.elm.r.0051-01-01-00000.nc +lnd/clm2/initdata/arcticx4v1pg2_oARRM60to10.ICRUELM.spinup-from-interp.elm.r.0051-01-01-00000.nc lnd/clm2/initdata/20221017.ICRUELM-1950.arcticx4v1pg2_ARRM10to60E2r1.anvil.elm.r.0051-01-01-00000.nc lnd/clm2/surfdata_map/surfdata_arcticx4v1pg2_simyr2010_c210805.nc