Skip to content

Commit

Permalink
MOM6: Minor refactoring in set_viscous_BBL
Browse files Browse the repository at this point in the history
- NOAA-GFDL/MOM6@714d2da17 Minor refactoring in set_viscous_BBL
- NOAA-GFDL/MOM6@e1ea75847 Add the debugging routine test_L_open_concave
- NOAA-GFDL/MOM6@da02ffc60 +Add find_L_open_concave_iterative
- NOAA-GFDL/MOM6@2ae638504 Refactor set_viscous_BBL channel drag calculations
- NOAA-GFDL/MOM6@f9da67331 Create BUILD and WORK directory macros
- NOAA-GFDL/MOM6@fd5696ba0 Pinning package requirements for readthedocs
- NOAA-GFDL/MOM6@d0e9c25a0 *Corrected CFC diagnostics and non-Bous CFC fluxes
- NOAA-GFDL/MOM6@8f7df084d (*)non-Boussinesq Z unit update_OBC_segment_data
- NOAA-GFDL/MOM6@86c5ed989 (*)Fix bug in h_neglect used to remap diags to rho
MOM6: Use default answer date outside of block (#570)
- NOAA-GFDL/MOM6@6d7c00a83 Restore bit repro using FMA in selected runs
- NOAA-GFDL/MOM6@f92e4ac31 Update MOM_mixed_layer_restrat.F90 (#568)
- NOAA-GFDL/MOM6@3f7465a57 +tracer_Z_init can rescale tracers
- NOAA-GFDL/MOM6@f14a68107 (*)Use thickness_to_dz with BRYAN_LEWIS_DIFFUSIVITY
- NOAA-GFDL/MOM6@0fb905fdc +(*)non-Boussinesq ALE_sponges work in Z units
- NOAA-GFDL/MOM6@c37a2f0d0 Document core and linear EOS variable units
- NOAA-GFDL/MOM6@de7e5b79f Document MOM_regridding and coord variable units
- NOAA-GFDL/MOM6@4757bcb52 Remove some unused calculations if non-Boussinesq
- NOAA-GFDL/MOM6@9282cd100 +(*)Bodner param with cuberoot and non-Boussinesq
- NOAA-GFDL/MOM6@ea12532d8 Fix issue with restart filenames when using ensembles.
- NOAA-GFDL/MOM6@9a6ddee47 *+non-Boussinesq revisions to MOM_generic_tracer
- NOAA-GFDL/MOM6@e7a7a82ab (*)MOM_temp_salt_init_from_Z Z-unit tracer remap
- NOAA-GFDL/MOM6@915cfe225 +ALE_remap_scalar with arbitrary thickness units
- NOAA-GFDL/MOM6@07bace68c *Fix two bugs in convert_temp_salt_for_TEOS10
- NOAA-GFDL/MOM6@a728ceaa5 allow restarts to be set on non-interval hours
- NOAA-GFDL/MOM6@db62734a9 Merge remote-tracking branch 'MAIN/main' into feature/update-to-main-20231218
- NOAA-GFDL/MOM6@40134ed86 change target to pointer and check for association
- NOAA-GFDL/MOM6@7ef6a5725  Fix the saltFluxAdded diagnoistic, broken in NOAA-GFDL#401
- NOAA-GFDL/MOM6@f4c95ec4b Revert post_data fix to CFC concentration
- NOAA-GFDL/MOM6@80a93f633 Merge remote-tracking branch 'MAIN/main' into feature/update-NCAR-GMAO-20231031
- NOAA-GFDL/MOM6@e2c322eed Merge remote-tracking branch 'MAIN/main' into feature/update-NCAR-GMAO-20231031
- NOAA-GFDL/MOM6@abb0ad24f switch to cesm-style field names
  • Loading branch information
mom6bot committed Mar 6, 2024
1 parent f7485d4 commit 4935376
Show file tree
Hide file tree
Showing 18 changed files with 52 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1083,6 +1083,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/hycom/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/layer/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/z/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/nonBous_global/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,9 @@ SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15
! channel drag if it is enabled. The default is to use the same value as
! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
! 0.15 if the specified value is negative.
TRIG_CHANNEL_DRAG_WIDTHS = True ! [Boolean] default = True
! If true, use trigonometric expressions to determine the fractional open
! interface lengths for concave topography.
CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0
! The maximum bottom boundary layer thickness over which the channel drag is
! exerted, or a negative value for no fixed limit, instead basing the BBL
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 38 files
+1 −1 .github/actions/testing-setup/action.yml
+241 −215 .testing/Makefile
+2 −2 ac/configure.ac
+152 −83 config_src/drivers/nuopc_cap/mom_cap.F90
+90 −89 config_src/drivers/nuopc_cap/mom_cap_methods.F90
+6 −0 docs/requirements.txt
+24 −12 src/ALE/MOM_ALE.F90
+150 −70 src/ALE/MOM_regridding.F90
+21 −11 src/ALE/coord_adapt.F90
+11 −12 src/ALE/coord_rho.F90
+2 −2 src/ALE/coord_sigma.F90
+4 −4 src/core/MOM.F90
+1 −1 src/core/MOM_check_scaling.F90
+19 −12 src/core/MOM_forcing_type.F90
+4 −1 src/core/MOM_isopycnal_slopes.F90
+129 −121 src/core/MOM_open_boundary.F90
+11 −5 src/core/MOM_verticalGrid.F90
+4 −5 src/diagnostics/MOM_wave_speed.F90
+1 −1 src/equation_of_state/MOM_EOS.F90
+3 −3 src/equation_of_state/MOM_EOS_linear.F90
+1 −1 src/framework/MOM_diag_remap.F90
+11 −11 src/framework/MOM_restart.F90
+35 −15 src/initialization/MOM_state_initialization.F90
+38 −18 src/initialization/MOM_tracer_initialization_from_Z.F90
+117 −28 src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+1 −2 src/parameterizations/lateral/MOM_thickness_diffuse.F90
+156 −105 src/parameterizations/vertical/MOM_ALE_sponge.F90
+5 −1 src/parameterizations/vertical/MOM_bkgnd_mixing.F90
+2 −2 src/parameterizations/vertical/MOM_diabatic_driver.F90
+1 −1 src/parameterizations/vertical/MOM_kappa_shear.F90
+2 −2 src/parameterizations/vertical/MOM_set_diffusivity.F90
+779 −196 src/parameterizations/vertical/MOM_set_viscosity.F90
+2 −2 src/parameterizations/vertical/MOM_tidal_mixing.F90
+1 −1 src/parameterizations/vertical/MOM_vert_friction.F90
+2 −6 src/tracer/MOM_CFC_cap.F90
+83 −61 src/tracer/MOM_generic_tracer.F90
+54 −35 src/tracer/MOM_tracer_Z_init.F90
+1 −1 src/tracer/MOM_tracer_flow_control.F90

0 comments on commit 4935376

Please sign in to comment.