From 445139fb7550b40a2962824b5c5d99d83a5b5cb0 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Wed, 10 Mar 2021 15:14:52 -0500 Subject: [PATCH 1/9] switch MOM6 to feature branch *allow topo-edits to change the land mask when run with CICE6 in ufs --- .gitmodules | 6 ++++-- MOM6-interface/MOM6 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0c3b70cc3f..8ce3f14030 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,8 +28,10 @@ branch = emc/develop [submodule "MOM6"] path = MOM6-interface/MOM6 - url = https://github.com/NOAA-EMC/MOM6 - branch = dev/emc + #url = https://github.com/NOAA-EMC/MOM6 + #branch = dev/emc + url = https://github.com/DeniseWorthen/MOM6 + branch = feature/allowmaskchanges [submodule "CICE"] path = CICE-interface/CICE url = https://github.com/NOAA-EMC/CICE diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6 index a729a7fb40..00cb11ce5c 160000 --- a/MOM6-interface/MOM6 +++ b/MOM6-interface/MOM6 @@ -1 +1 @@ -Subproject commit a729a7fb400d8d441868606abdb3e722ceb2b8f5 +Subproject commit 00cb11ce5cea0c7571929195a46a9624fa0f982c From 7b826d43b71a9daa74598f65399f7f23b85151ee Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:30:58 +0000 Subject: [PATCH 2/9] update FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 0e05075456..3f5b8d4914 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 0e05075456800f0c5abd7bfb1ce6f89b26dd7989 +Subproject commit 3f5b8d4914e5bb4e87e0a5f56d95db5cd5fc0bf5 From cea6fc69411248b50142291191fcfc9f0bd04d94 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:34:38 +0000 Subject: [PATCH 3/9] update hera.intel modulefiles for testing --- modulefiles/hera.intel/fv3 | 2 +- modulefiles/hera.intel/fv3_debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3 index 7b20135794..c9f5e76e7f 100644 --- a/modulefiles/hera.intel/fv3 +++ b/modulefiles/hera.intel/fv3 @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_27 +module load esmf/8_1_0_beta_snapshot_47 module load bacio/2.4.1 module load crtm/2.3.0 diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/hera.intel/fv3_debug index dd65fa1b95..8ee2ef433c 100644 --- a/modulefiles/hera.intel/fv3_debug +++ b/modulefiles/hera.intel/fv3_debug @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_27-debug +module load esmf/8_1_0_beta_snapshot_47-debug module load bacio/2.4.1 module load crtm/2.3.0 From 071275bcdb6e2d376aad395266803c10f6ab287e Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:37:54 +0000 Subject: [PATCH 4/9] Revert "update hera.intel modulefiles for testing" This reverts commit cea6fc69411248b50142291191fcfc9f0bd04d94. --- modulefiles/hera.intel/fv3 | 2 +- modulefiles/hera.intel/fv3_debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3 index c9f5e76e7f..7b20135794 100644 --- a/modulefiles/hera.intel/fv3 +++ b/modulefiles/hera.intel/fv3 @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_47 +module load esmf/8_1_0_beta_snapshot_27 module load bacio/2.4.1 module load crtm/2.3.0 diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/hera.intel/fv3_debug index 8ee2ef433c..dd65fa1b95 100644 --- a/modulefiles/hera.intel/fv3_debug +++ b/modulefiles/hera.intel/fv3_debug @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_47-debug +module load esmf/8_1_0_beta_snapshot_27-debug module load bacio/2.4.1 module load crtm/2.3.0 From 4db2ff2378ab69fb71b7c91ca6490c8c960b1c75 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:38:33 +0000 Subject: [PATCH 5/9] Revert "update FV3" This reverts commit 7b826d43b71a9daa74598f65399f7f23b85151ee. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 3f5b8d4914..0e05075456 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 3f5b8d4914e5bb4e87e0a5f56d95db5cd5fc0bf5 +Subproject commit 0e05075456800f0c5abd7bfb1ce6f89b26dd7989 From 041bb4286571170b42c9abfaeb5fb6c7058b29b1 Mon Sep 17 00:00:00 2001 From: jiandewang Date: Sun, 4 Apr 2021 23:53:44 -0400 Subject: [PATCH 6/9] using MOM6 branch of update-to-GFDL-20210402 from JIandewang --- .gitmodules | 4 ++-- MOM6-interface/MOM6 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0c3b70cc3f..ba530354a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,8 +28,8 @@ branch = emc/develop [submodule "MOM6"] path = MOM6-interface/MOM6 - url = https://github.com/NOAA-EMC/MOM6 - branch = dev/emc + url = https://github.com/jiandewang/MOM6 + branch = feature/update-to-GFDL-20210402 [submodule "CICE"] path = CICE-interface/CICE url = https://github.com/NOAA-EMC/CICE diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6 index 3703ca7ddc..c549ae9d93 160000 --- a/MOM6-interface/MOM6 +++ b/MOM6-interface/MOM6 @@ -1 +1 @@ -Subproject commit 3703ca7ddc3dbd18d205581d32e47aa828fed976 +Subproject commit c549ae9d93531b104492654d257e4949293d3c3a From bfe25ca17947b360e894d4b84ee08a2db33917cc Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Fri, 9 Apr 2021 08:26:35 -0400 Subject: [PATCH 7/9] update to MOM6 PR branch --- .gitmodules | 4 ++-- MOM6-interface/MOM6 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8ce3f14030..c03280d702 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,8 +30,8 @@ path = MOM6-interface/MOM6 #url = https://github.com/NOAA-EMC/MOM6 #branch = dev/emc - url = https://github.com/DeniseWorthen/MOM6 - branch = feature/allowmaskchanges + url = https://github.com/jiandewang/MOM6 + branch = feature/update-to-GFDL-20210402 [submodule "CICE"] path = CICE-interface/CICE url = https://github.com/NOAA-EMC/CICE diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6 index 3703ca7ddc..c549ae9d93 160000 --- a/MOM6-interface/MOM6 +++ b/MOM6-interface/MOM6 @@ -1 +1 @@ -Subproject commit 3703ca7ddc3dbd18d205581d32e47aa828fed976 +Subproject commit c549ae9d93531b104492654d257e4949293d3c3a From ed9cff8d9886a77709306feab5015c0b3398cb59 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Fri, 9 Apr 2021 08:31:38 -0400 Subject: [PATCH 8/9] add parameter for allowing land mask changes --- tests/default_vars.sh | 2 ++ tests/edit_inputs.sh | 1 + tests/parm/MOM_input_template_025 | 2 ++ tests/parm/MOM_input_template_050 | 2 ++ tests/parm/MOM_input_template_100 | 2 ++ 5 files changed, 9 insertions(+) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index cba4c74880..6ead9eb65c 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -586,6 +586,7 @@ export MOM6_REPRO_LA='False' export MOM6_THERMO_SPAN='False' # no WW3 export MOM6_USE_WAVES='False' +export MOM6_ALLOW_LANDMASK_CHANGES='False' # CICE6 defaults; 1 degree export NPROC_ICE='12' @@ -699,6 +700,7 @@ export MOM6_REPRO_LA='False' export MOM6_THERMO_SPAN='False' # no WW3 export MOM6_USE_WAVES='False' +export MOM6_ALLOW_LANDMASK_CHANGES='False' # CICE6 defaults; 1 degree export MESHOCN_ICE="mesh.mx${OCNRES}.nc" diff --git a/tests/edit_inputs.sh b/tests/edit_inputs.sh index 0b0a9527fc..e7ecb60649 100755 --- a/tests/edit_inputs.sh +++ b/tests/edit_inputs.sh @@ -39,6 +39,7 @@ function edit_mom_input { -e "s/MOM6_THERMO_SPAN/$MOM6_THERMO_SPAN/g" \ -e "s/MOM6_REPRO_LA/$MOM6_REPRO_LA/g" \ -e "s/MOM6_USE_WAVES/$MOM6_USE_WAVES/g" \ + -e "s/MOM6_ALLOW_LANDMASK_CHANGES/$MOM6_ALLOW_LANDMASK_CHANGES/g" \ -e "s/NX_GLB/$NX_GLB/g" \ -e "s/NY_GLB/$NY_GLB/g" \ -e "s/CHLCLIM/$CHLCLIM/g" diff --git a/tests/parm/MOM_input_template_025 b/tests/parm/MOM_input_template_025 index aa1da78029..1340db5b66 100644 --- a/tests/parm/MOM_input_template_025 +++ b/tests/parm/MOM_input_template_025 @@ -148,6 +148,8 @@ TOPO_FILE = "ocean_topog.nc" ! default = "topog.nc" ! The file from which the bathymetry is read. TOPO_EDITS_FILE = "All_edits.nc" ! default = "" ! The file from which to read a list of i,j,z topography overrides. +ALLOW_LANDMASK_CHANGES = MOM6_ALLOW_LANDMASK_CHANGES ! default = "False" + ! If true, allow topography overrides to change ocean points to land MAXIMUM_DEPTH = 6500.0 ! [m] ! The maximum depth of the ocean. MINIMUM_DEPTH = 9.5 ! [m] default = 0.0 diff --git a/tests/parm/MOM_input_template_050 b/tests/parm/MOM_input_template_050 index 46780dfc82..ceff6e98d4 100644 --- a/tests/parm/MOM_input_template_050 +++ b/tests/parm/MOM_input_template_050 @@ -147,6 +147,8 @@ TOPO_CONFIG = "file" ! ! USER - call a user modified routine. TOPO_FILE = "ocean_topog.nc" ! default = "topog.nc" ! The file from which the bathymetry is read. +ALLOW_LANDMASK_CHANGES = MOM6_ALLOW_LANDMASK_CHANGES ! default = "False" + ! If true, allow topography overrides to change ocean points to land MAXIMUM_DEPTH = 6500.0 ! [m] ! The maximum depth of the ocean. MINIMUM_DEPTH = 9.5 ! [m] default = 0.0 diff --git a/tests/parm/MOM_input_template_100 b/tests/parm/MOM_input_template_100 index ffb4c7de5e..f93bf693a0 100644 --- a/tests/parm/MOM_input_template_100 +++ b/tests/parm/MOM_input_template_100 @@ -140,6 +140,8 @@ TOPO_CONFIG = "file" ! ! USER - call a user modified routine. TOPO_EDITS_FILE = "topo_edits_011818.nc" ! default = "" ! The file from which to read a list of i,j,z topography overrides. +ALLOW_LANDMASK_CHANGES = MOM6_ALLOW_LANDMASK_CHANGES ! default = "False" + ! If true, allow topography overrides to change ocean points to land MAXIMUM_DEPTH = 6500.0 ! [m] ! The maximum depth of the ocean. MINIMUM_DEPTH = 9.5 ! [m] default = 0.0 From 8f1e9cefd249cc97368814487c60fedc109ec3c8 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Fri, 9 Apr 2021 15:17:05 +0000 Subject: [PATCH 9/9] switch two variables to character strings for nems.configure * tested cpld_controlfrac,cpld_controlfrac_c192,cpld_controlfrac_c384 datm_control_cfs,datm_control_gefs,datm_mx025_cfsr,datm_mx025_gefs * all tests passed --- tests/default_vars.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 6ead9eb65c..6db6deae9c 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -676,8 +676,8 @@ export coupling_interval_fast_sec=${CPL_FAST} export RESTART_N=${FHMAX} export CPLMODE='nems_orig_data' export cap_dbug_flag="0" -export use_coldstart=".false." -export use_mommesh=".false." +export use_coldstart="false" +export use_mommesh="false" export RUNTYPE='startup' export flux_convergence='0.0' export flux_iteration='2'