Bugfix for nest namelists, includes "feature/update mom6 20210402" (N…

…OAA-EMC#488) * switch MOM6 to feature branch *allow topo-edits to change the land mask when run with CICE6 in ufs * Comment out line that instructs cmake to not cache the configuration * tests/fv3_conf/fv3_qsub.IN_cheyenne: prepend model output with rank, similar to other platforms This reverts commit cea6fc69411248b50142291191fcfc9f0bd04d94. * Revert "update FV3" This reverts commit 7b826d43b71a9daa74598f65399f7f23b85151ee. * Change default queue on Cheyenne to economy * using MOM6 branch of update-to-GFDL-20210402 from JIandewang * update to MOM6 PR branch * add parameter for allowing land mask changes * switch two variables to character strings for nems.configure * Regression test log for hera.gnu and hera.intel; run-ci * Regression test logs for cheyenne.gnu and cheyenne.intel, * RT JOBS PASSED: gaea.intel. Log file uploaded. * RT JOBS PASSED: orion.intel. Log file uploaded. * RT JOBS PASSED: jet.intel. Log file uploaded. * Regression test logs for wcoss_dell_p3 and wcoss_cray * Revert change to .gitmodules and update submodule pointer fors for mom6 and fv3atm Co-authored-by: denise.worthen <[email protected]> Co-authored-by: jiandewang <[email protected]> Co-authored-by: Brian Curtis <[email protected]>
SamuelTrahanNOAA · Apr 12, 2021 · a2df724 · a2df724
1 parent ade15dd
commit a2df724
Show file tree

Hide file tree

Showing 18 changed files with 1,865 additions and 1,889 deletions.
diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -585,6 +585,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'
@@ -674,8 +675,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'
@@ -698,6 +699,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
@@ -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/fv3_conf/fv3_qsub.IN_cheyenne b/tests/fv3_conf/fv3_qsub.IN_cheyenne
@@ -28,7 +28,7 @@ export ESMF_RUNTIME_COMPLIANCECHECK=OFF:depth=4
 # Avoid job errors because of filesystem synchronization delays
 sync && sleep 1
 
-mpiexec_mpt -np @[TASKS] ./fv3.exe
+mpiexec_mpt -p %g: -np @[TASKS] ./fv3.exe
 
 echo "Model ended:    " `date`
 echo -n " $( date +%s )," >> job_timestamp.txt
diff --git 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
@@ -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
@@ -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

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -310,8 +310,8 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   ECFLOW_START=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/bin/ecflow_start.sh
   ECF_PORT=$(( $(id -u) + 1500 ))
 
-  QUEUE=regular
-  COMPILE_QUEUE=regular
+  QUEUE=economy
+  COMPILE_QUEUE=economy
   PARTITION=
   dprefix=/glade/scratch
   DISKNM=/glade/p/ral/jntp/GMTB/ufs-weather-model/RT
@@ -558,7 +558,7 @@ EOF
   elif [[ $MACHINE_ID = gaea.* ]]; then
     QUEUE=normal
   elif [[ $MACHINE_ID = cheyenne.* ]]; then
-    QUEUE=regular
+    QUEUE=economy
   else
     die "ecFlow is not supported on this machine $MACHINE_ID"
   fi
+6 −3		.testing/Makefile
+2 −1		config_src/drivers/ice_solo_driver/ice_shelf_driver.F90
+2 −1		config_src/drivers/mct_cap/mom_surface_forcing_mct.F90
+2 −2		config_src/drivers/nuopc_cap/mom_cap.F90
+4 −0		config_src/drivers/solo_driver/MOM_driver.F90
+2 −2		config_src/infra/FMS1/MOM_diag_manager_infra.F90
+3 −1		config_src/infra/FMS1/MOM_domain_infra.F90
+1 −1		pkg/CVMix-src
+13 −13		src/core/MOM_isopycnal_slopes.F90
+11 −0		src/ice_shelf/MOM_ice_shelf.F90
+241 −131		src/ice_shelf/MOM_ice_shelf_dynamics.F90
+194 −169		src/ice_shelf/MOM_ice_shelf_initialize.F90
+12 −2		src/initialization/MOM_shared_initialization.F90
+6 −4		src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
+31 −23		src/parameterizations/lateral/MOM_thickness_diffuse.F90
+0 −2		src/parameterizations/vertical/MOM_tidal_mixing.F90