(1) update MOM6 to its main branch 20220629 updating (NCAR 20220603 c…

…andidate) (2) add temperature limiter in SPPT (#1302) * pointing MOM6 to test branch add 3 new files in cmake list * add temperature limiter for SPPT in MOM6
ufs-community · Jul 21, 2022 · bb29481 · bb29481
1 parent d75bed7
commit bb29481
Show file tree

Hide file tree

Showing 10 changed files with 4,391 additions and 5,004 deletions.
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake
@@ -44,6 +44,7 @@ list(APPEND mom6_src_files
   MOM6/src/core/MOM_isopycnal_slopes.F90
   MOM6/src/core/MOM_open_boundary.F90
   MOM6/src/core/MOM_porous_barriers.F90
+  MOM6/src/core/MOM_stoch_eos.F90
   MOM6/src/core/MOM_transcribe_grid.F90
   MOM6/src/core/MOM_unit_tests.F90
   MOM6/src/core/MOM_variables.F90
@@ -77,6 +78,7 @@ list(APPEND mom6_src_files
   MOM6/src/equation_of_state/TEOS10/gsw_gibbs.f90
   MOM6/src/equation_of_state/TEOS10/gsw_gibbs_ice.f90
   MOM6/src/equation_of_state/TEOS10/gsw_gibbs_pt0_pt0.f90
+  MOM6/src/equation_of_state/TEOS10/gsw_mod_error_functions.f90
   MOM6/src/equation_of_state/TEOS10/gsw_mod_freezing_poly_coefficients.f90
   MOM6/src/equation_of_state/TEOS10/gsw_mod_gibbs_ice_coefficients.f90
   MOM6/src/equation_of_state/TEOS10/gsw_mod_kinds.f90
@@ -207,6 +209,7 @@ list(APPEND mom6_src_files
   MOM6/src/tracer/MOM_tracer_flow_control.F90
   MOM6/src/tracer/MOM_tracer_hor_diff.F90
   MOM6/src/tracer/MOM_tracer_registry.F90
+  MOM6/src/tracer/MOM_tracer_types.F90
   MOM6/src/tracer/RGC_tracer.F90
   MOM6/src/tracer/advection_test_tracer.F90
   MOM6/src/tracer/boundary_impulse_tracer.F90

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/rt.sh b/tests/rt.sh
@@ -420,7 +420,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220719
+BL_DATE=20220720
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
+2 −2		.testing/tc2/MOM_input
+1 −1		config_src/drivers/FMS_cap/ocean_model_MOM.F90
+1 −1		config_src/drivers/mct_cap/mom_ocean_model_mct.F90
+138 −61		config_src/drivers/nuopc_cap/mom_cap.F90
+206 −57		config_src/drivers/nuopc_cap/mom_cap_methods.F90
+14 −8		config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
+56 −18		config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
+3 −2		config_src/drivers/solo_driver/MOM_driver.F90
+8 −1		src/ALE/MOM_regridding.F90
+68 −11		src/core/MOM.F90
+103 −9		src/core/MOM_CoriolisAdv.F90
+44 −65		src/core/MOM_PressureForce_FV.F90
+23 −14		src/core/MOM_density_integrals.F90
+54 −3		src/core/MOM_dynamics_split_RK2.F90
+157 −109		src/core/MOM_forcing_type.F90
+67 −5		src/core/MOM_isopycnal_slopes.F90
+220 −0		src/core/MOM_stoch_eos.F90
+3 −0		src/core/MOM_variables.F90
+35 −2		src/diagnostics/MOM_diagnostics.F90
+8 −1		src/diagnostics/MOM_sum_output.F90
+9 −9		src/equation_of_state/MOM_EOS.F90
+1 −0		src/equation_of_state/TEOS10/gsw_mod_error_functions.f90
+1 −1		src/framework/MOM_diag_remap.F90
+1 −0		src/framework/MOM_random.F90
+1 −1		src/parameterizations/lateral/MOM_MEKE.F90
+7 −2		src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
+31 −3		src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+66 −76		src/parameterizations/lateral/MOM_thickness_diffuse.F90
+87 −125		src/parameterizations/vertical/MOM_CVMix_KPP.F90
+30 −20		src/parameterizations/vertical/MOM_diabatic_aux.F90
+28 −14		src/parameterizations/vertical/MOM_diabatic_driver.F90
+9 −6		src/parameterizations/vertical/MOM_tidal_mixing.F90
+109 −79		src/tracer/MOM_CFC_cap.F90
+17 −4		src/tracer/MOM_tracer_flow_control.F90
+72 −137		src/tracer/MOM_tracer_registry.F90
+130 −0		src/tracer/MOM_tracer_types.F90
+15 −3		src/tracer/pseudo_salt_tracer.F90
+469 −64		src/user/MOM_wave_interface.F90