ufs-community · jkbk2004 · Nov 21, 2022 · Nov 13, 2022 · Nov 13, 2022 · Nov 14, 2022
diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake
@@ -151,9 +151,12 @@ list(APPEND mom6_src_files
   MOM6/src/parameterizations/lateral/MOM_MEKE.F90
   MOM6/src/parameterizations/lateral/MOM_MEKE_types.F90
   MOM6/src/parameterizations/lateral/MOM_hor_visc.F90
+  MOM6/src/parameterizations/lateral/MOM_interface_filter.F90
   MOM6/src/parameterizations/lateral/MOM_internal_tides.F90
+  MOM6/src/parameterizations/lateral/MOM_load_love_numbers.F90
   MOM6/src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
   MOM6/src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+  MOM6/src/parameterizations/lateral/MOM_spherical_harmonics.F90
   MOM6/src/parameterizations/lateral/MOM_thickness_diffuse.F90
   MOM6/src/parameterizations/lateral/MOM_tidal_forcing.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/RegressionTests_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/parm/MOM_input_template_025 b/tests/parm/MOM_input_template_025
@@ -6,7 +6,6 @@
 ! This MOM_input file typically contains only the non-default values that are needed to reproduce this example.
 ! A full list of parameters for this example can be found in the corresponding MOM_parameter_doc.all file
 ! which is generated by the model at run-time.
-
 ! === module MOM_domains ===
 TRIPOLAR_N = True               !   [Boolean] default = False
                                 ! Use tripolar connectivity at the northern edge of the domain.  With
@@ -202,6 +201,7 @@ DTFREEZE_DP = -7.75E-08         !   [deg C Pa-1] default = 0.0
 PARALLEL_RESTARTFILES = True    !   [Boolean] default = False
                                 ! If true, each processor writes its own restart file, otherwise a single
                                 ! restart file is generated
+STORE_CORIOLIS_ACCEL = False
 
 ! === module MOM_tracer_flow_control ===
 USE_IDEAL_AGE_TRACER = False    !   [Boolean] default = False
@@ -510,6 +510,9 @@ USE_LAND_MASK_FOR_HVISC = False !   [Boolean] default = False
 HMIX_FIXED = 0.5                !   [m]
                                 ! The prescribed depth over which the near-surface viscosity and diffusivity are
                                 ! elevated when the bulk mixed layer is not used.
+KVML = 1.0E-04                  !   [m2 s-1] default = 1.0E-04
+                                ! The kinematic viscosity in the mixed layer.  A typical value is ~1e-2 m2 s-1.
+                                ! KVML is not used if BULKMIXEDLAYER is true.  The default is set by KV.
 MAXVEL = 6.0                    !   [m s-1] default = 3.0E+08
                                 ! The maximum velocity allowed before the velocity components are truncated.
 

diff --git a/tests/parm/MOM_input_template_050 b/tests/parm/MOM_input_template_050
@@ -6,7 +6,6 @@
 ! This MOM_input file typically contains only the non-default values that are needed to reproduce this example.
 ! A full list of parameters for this example can be found in the corresponding MOM_parameter_doc.all file
 ! which is generated by the model at run-time.
-
 ! === module MOM_domains ===
 TRIPOLAR_N = True               !   [Boolean] default = False
                                 ! Use tripolar connectivity at the northern edge of the domain.  With
@@ -200,6 +199,7 @@ DTFREEZE_DP = -7.75E-08         !   [deg C Pa-1] default = 0.0
 PARALLEL_RESTARTFILES = True    !   [Boolean] default = False
                                 ! If true, each processor writes its own restart file, otherwise a single
                                 ! restart file is generated
+STORE_CORIOLIS_ACCEL = False
 
 ! === module MOM_tracer_flow_control ===
 USE_IDEAL_AGE_TRACER = False    !   [Boolean] default = False
@@ -540,6 +540,9 @@ USE_LAND_MASK_FOR_HVISC = False !   [Boolean] default = False
 HMIX_FIXED = 0.5                !   [m]
                                 ! The prescribed depth over which the near-surface viscosity and diffusivity are
                                 ! elevated when the bulk mixed layer is not used.
+KVML = 1.0E-04                  !   [m2 s-1] default = 1.0E-04
+                                ! The kinematic viscosity in the mixed layer.  A typical value is ~1e-2 m2 s-1.
+                                ! KVML is not used if BULKMIXEDLAYER is true.  The default is set by KV.
 MAXVEL = 6.0                    !   [m s-1] default = 3.0E+08
                                 ! The maximum velocity allowed before the velocity components are truncated.
 

diff --git a/tests/parm/MOM_input_template_100 b/tests/parm/MOM_input_template_100
@@ -1,5 +1,4 @@
 ! This file was written by the model and records all non-layout or debugging parameters used at run-time.
-
 ! === module MOM ===
 
 ! === module MOM_unit_scaling ===
@@ -211,6 +210,7 @@ TFREEZE_FORM = "MILLERO_78"     ! default = "LINEAR"
 PARALLEL_RESTARTFILES = True    !   [Boolean] default = False
                                 ! If true, each processor writes its own restart file, otherwise a single
                                 ! restart file is generated
+STORE_CORIOLIS_ACCEL = False
 
 ! === module MOM_tracer_flow_control ===
 USE_IDEAL_AGE_TRACER = False     !   [Boolean] default = False
@@ -531,6 +531,9 @@ USE_KH_BG_2D = True             !   [Boolean] default = False
 HMIX_FIXED = 0.5                !   [m]
                                 ! The prescribed depth over which the near-surface viscosity and diffusivity are
                                 ! elevated when the bulk mixed layer is not used.
+KVML = 1.0E-04                  !   [m2 s-1] default = 1.0E-04
+                                ! The kinematic viscosity in the mixed layer.  A typical value is ~1e-2 m2 s-1.
+                                ! KVML is not used if BULKMIXEDLAYER is true.  The default is set by KV.
 MAXVEL = 6.0                    !   [m s-1] default = 3.0E+08
                                 ! The maximum velocity allowed before the velocity components are truncated.
 

diff --git a/tests/parm/MOM_input_template_500 b/tests/parm/MOM_input_template_500
@@ -1,5 +1,4 @@
 ! This file was written by the model and records the non-default parameters used at run-time.
-
 ! === module MOM ===
 
 ! === module MOM_unit_scaling ===
@@ -133,6 +132,7 @@ TFREEZE_FORM = "MILLERO_78"     ! default = "LINEAR"
 
 ! === module MOM_restart ===
 RESTART_CHECKSUMS_REQUIRED = False
+STORE_CORIOLIS_ACCEL = False
 ! === module MOM_tracer_flow_control ===
 
 ! === module MOM_coord_initialization ===
@@ -342,6 +342,9 @@ USE_LAND_MASK_FOR_HVISC = True  !   [Boolean] default = False
 HMIX_FIXED = 0.5                !   [m]
                                 ! The prescribed depth over which the near-surface viscosity and diffusivity are
                                 ! elevated when the bulk mixed layer is not used.
+KVML = 1.0E-04                  !   [m2 s-1] default = 1.0E-04
+                                ! The kinematic viscosity in the mixed layer.  A typical value is ~1e-2 m2 s-1.
+                                ! KVML is not used if BULKMIXEDLAYER is true.  The default is set by KV.
 MAXVEL = 6.0                    !   [m s-1] default = 3.0E+08
                                 ! The maximum velocity allowed before the velocity components are truncated.
+1 −0		.github/actions/macos-setup/action.yml
+17 −4		.testing/Makefile
+19 −12		ac/configure.ac
+9 −3		config_src/drivers/FMS_cap/ocean_model_MOM.F90
+41 −31		config_src/drivers/solo_driver/MOM_surface_forcing.F90
+121 −11		config_src/infra/FMS2/MOM_io_infra.F90
+3 −2		docs/equations.rst
+ −		docs/images/ALE_general_schematic.png
+60 −0		docs/ocean.bib
+190 −277		src/ALE/MOM_ALE.F90
+14 −31		src/ALE/MOM_regridding.F90
+163 −69		src/ALE/_ALE.dox
+60 −48		src/ALE/_ALE_timestep.dox
+195 −86		src/core/MOM.F90
+11 −10		src/core/MOM_CoriolisAdv.F90
+10 −10		src/core/MOM_PressureForce_FV.F90
+3 −2		src/core/MOM_PressureForce_Montgomery.F90
+59 −28		src/core/MOM_barotropic.F90
+4 −4		src/core/MOM_continuity.F90
+33 −35		src/core/MOM_continuity_PPM.F90
+191 −82		src/core/MOM_dynamics_split_RK2.F90
+2 −2		src/core/MOM_dynamics_unsplit.F90
+2 −2		src/core/MOM_dynamics_unsplit_RK2.F90
+12 −7		src/core/MOM_grid.F90
+177 −135		src/core/MOM_open_boundary.F90
+450 −129		src/core/MOM_porous_barriers.F90
+6 −0		src/core/MOM_transcribe_grid.F90
+12 −9		src/core/MOM_variables.F90
+141 −59		src/core/_General_coordinate.dox
+164 −59		src/core/_Governing.dox
+46 −18		src/core/_Notation.dox
+1 −0		src/diagnostics/MOM_obsolete_params.F90
+11 −6		src/framework/MOM_dyn_horgrid.F90
+200 −3		src/framework/MOM_restart.F90
+18 −0		src/framework/posix.F90
+1 −1		src/framework/posix.h
+9 −0		src/initialization/MOM_fixed_initialization.F90
+6 −0		src/initialization/MOM_grid_initialize.F90
+77 −0		src/initialization/MOM_shared_initialization.F90
+10 −6		src/initialization/MOM_state_initialization.F90
+2 −2		src/parameterizations/lateral/MOM_MEKE.F90
+471 −0		src/parameterizations/lateral/MOM_interface_filter.F90
+17 −99		src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
+1,484 −0		src/parameterizations/lateral/MOM_load_love_numbers.F90
+27 −20		src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+382 −0		src/parameterizations/lateral/MOM_spherical_harmonics.F90
+14 −14		src/parameterizations/lateral/MOM_thickness_diffuse.F90
+146 −3		src/parameterizations/lateral/MOM_tidal_forcing.F90
+49 −10		src/parameterizations/vertical/MOM_ALE_sponge.F90
+52 −67		src/parameterizations/vertical/MOM_bkgnd_mixing.F90
+12 −8		src/parameterizations/vertical/MOM_bulk_mixed_layer.F90
+1 −2		src/parameterizations/vertical/MOM_diabatic_aux.F90
+4 −1		src/parameterizations/vertical/MOM_diabatic_driver.F90
+8 −5		src/parameterizations/vertical/MOM_diapyc_energy_req.F90
+4 −2		src/parameterizations/vertical/MOM_energetic_PBL.F90
+1 −1		src/parameterizations/vertical/MOM_kappa_shear.F90
+18 −5		src/parameterizations/vertical/MOM_set_diffusivity.F90
+49 −25		src/parameterizations/vertical/MOM_set_viscosity.F90
+400 −183		src/parameterizations/vertical/MOM_vert_friction.F90
+1 −1		src/parameterizations/vertical/_CVMix_KPP.dox
+0 −20		src/parameterizations/vertical/_V_diffusivity.dox
+26 −9		src/tracer/MOM_offline_main.F90
+1 −1		src/tracer/RGC_tracer.F90
+4 −6		src/user/DOME2d_initialization.F90
+5 −6		src/user/ISOMIP_initialization.F90
+4 −2		src/user/RGC_initialization.F90
+4 −2		src/user/dense_water_initialization.F90
+4 −3		src/user/dumbbell_initialization.F90