Skip to content

Commit

Permalink
MOM6: Proto-type cricital latitude modification of Henyey
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@0efe83d74 Proto-type cricital latitude modification of Henyey
- NOAA-GFDL/MOM6@1c4d0dc88 Better document variable units in 3 user modules
MOM6: Better error report for failed parsing
- NOAA-GFDL/MOM6@6c44c5f38 Fix for using tidal amplitude in determining the BBL thickness
- NOAA-GFDL/MOM6@3a3baf12f (*)Fix Stokes drift spectrum rescaling
- NOAA-GFDL/MOM6@6f1c79eb6 CPP expression parser for makedep
- NOAA-GFDL/MOM6@5b9ae5288 Disable codecov upload requirement
- NOAA-GFDL/MOM6@b98acd861 Add units to the descriptions of 115 variables
- NOAA-GFDL/MOM6@43b2a4305 Add units to the descriptions of 141 variables
- NOAA-GFDL/MOM6@c86358b74 (*)Avoiding using RHO_0 in non-Boussinesq debugging
- NOAA-GFDL/MOM6@2d121dcc4 (*)Pass dz to user initialize_ALE_sponge calls
  • Loading branch information
@mom6bot @marshallward
mom6bot authored and marshallward committed Apr 23, 2024
1 parent fde97e5 commit 582385d
Show file tree
Hide file tree
Showing 18 changed files with 52 additions and 1 deletion.
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1843,6 +1843,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1889,6 +1889,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1908,6 +1908,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1889,6 +1889,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1908,6 +1908,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1867,6 +1867,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/hycom/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1893,6 +1893,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/layer/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1752,6 +1752,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/z/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1840,6 +1840,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/nonBous_global/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1584,6 +1584,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False
HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0
! The ratio of the typical Buoyancy frequency to twice the Earth's rotation
! period, used with the Henyey scaling from the mixing.
HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0
! A latitude poleward of which the Henyey profile is returned to the minimum
! diffusivity
KD_TANH_LAT_FN = False ! [Boolean] default = False
! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There
! is no physical justification for this form, and it can not be used with
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 49 files
+2 −16 .github/workflows/coverage.yml
+10 −3 .testing/tools/parse_perf.py
+1 −1 ac/deps/Makefile.fms.in
+194 −11 ac/makedep
+14 −7 config_src/drivers/timing_tests/time_MOM_EOS.F90
+2 −2 src/ALE/coord_adapt.F90
+4 −4 src/ALE/regrid_interp.F90
+7 −6 src/core/MOM_checksum_packages.F90
+7 −4 src/core/MOM_open_boundary.F90
+10 −8 src/diagnostics/MOM_PointAccel.F90
+2 −2 src/diagnostics/MOM_spatial_means.F90
+117 −71 src/framework/MOM_diag_mediator.F90
+5 −1 src/framework/MOM_diag_remap.F90
+16 −12 src/framework/MOM_dyn_horgrid.F90
+2 −2 src/framework/MOM_horizontal_regridding.F90
+17 −15 src/framework/MOM_interpolate.F90
+1 −1 src/framework/MOM_intrinsic_functions.F90
+9 −8 src/framework/MOM_string_functions.F90
+0 −10 src/initialization/MOM_state_initialization.F90
+1 −1 src/parameterizations/lateral/MOM_hor_visc.F90
+13 −8 src/parameterizations/lateral/MOM_internal_tides.F90
+4 −4 src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+3 −3 src/parameterizations/stochastic/MOM_stochastics.F90
+7 −0 src/parameterizations/vertical/MOM_bkgnd_mixing.F90
+47 −28 src/parameterizations/vertical/MOM_set_viscosity.F90
+3 −3 src/parameterizations/vertical/MOM_vert_friction.F90
+3 −3 src/tracer/ISOMIP_tracer.F90
+16 −13 src/tracer/MOM_CFC_cap.F90
+8 −7 src/tracer/MOM_OCMIP2_CFC.F90
+2 −1 src/tracer/MOM_neutral_diffusion.F90
+1 −1 src/tracer/MOM_offline_aux.F90
+2 −4 src/tracer/MOM_offline_main.F90
+27 −18 src/tracer/MOM_tracer_registry.F90
+3 −1 src/tracer/MOM_tracer_types.F90
+5 −5 src/tracer/boundary_impulse_tracer.F90
+2 −2 src/tracer/dyed_obc_tracer.F90
+1 −1 src/tracer/ideal_age_example.F90
+3 −3 src/tracer/nw2_tracers.F90
+1 −1 src/tracer/oil_tracer.F90
+1 −1 src/tracer/pseudo_salt_tracer.F90
+1 −11 src/user/DOME2d_initialization.F90
+1 −10 src/user/ISOMIP_initialization.F90
+2 −2 src/user/MOM_wave_interface.F90
+38 −37 src/user/Neverworld_initialization.F90
+4 −4 src/user/RGC_initialization.F90
+43 −39 src/user/basin_builder.F90
+1 −10 src/user/dense_water_initialization.F90
+1 −10 src/user/dumbbell_initialization.F90
+2 −2 src/user/tidal_bay_initialization.F90

0 comments on commit 582385d

Please sign in to comment.