Skip to content

Commit

Permalink
MOM6: ice shelf dHdt and optimization
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@c9fc30d61 ice shelf dHdt and optimization
- NOAA-GFDL/MOM6@3d07e5beb Comment omega_w2x entries in nuopc_cap
- NOAA-GFDL/MOM6@3720b9920 Comment all omega_w2x entries
- NOAA-GFDL/MOM6@e2bbb08dc Set fpmix to false by default
- NOAA-GFDL/MOM6@5e6e6576f remove fms_io_mod import
- NOAA-GFDL/MOM6@de55fd6d2 fix multiinstance log filename correction and remove FMS1 io api calls.
- NOAA-GFDL/MOM6@d363034fc Deprecate mct cap (NOAA-GFDL#257)
- NOAA-GFDL/MOM6@5bc0c5e07 Pass wavebands from coupler to wave_parameters_CS (NOAA-GFDL#255)
- NOAA-GFDL/MOM6@be40a4136 add run time info (NOAA-GFDL#114)
- NOAA-GFDL/MOM6@d9aa751a4 Revert order of variables in vertFPmix
- NOAA-GFDL/MOM6@66fd876af Removed L_diag and moved variables in vertFPmix
- NOAA-GFDL/MOM6@7b7052e9b Describe local variables and make code consistent
- NOAA-GFDL/MOM6@d4aa10857 Add Leith+E (NOAA-GFDL#251)
- NOAA-GFDL/MOM6@c57789f41  Rearrange do-loops and if statements
- NOAA-GFDL/MOM6@2f34d6521 Merge latest mom-ocean main (NOAA-GFDL#254)
- NOAA-GFDL/MOM6@8ec0de7b0 Merge remote-tracking branch 'MAIN/main' into feature/update-to-main-20230811
- NOAA-GFDL/MOM6@27518f750 Make neutral diffusion work with 3D diffusivities
- NOAA-GFDL/MOM6@a58803372 Make HBD work with 3D diffusivities
- NOAA-GFDL/MOM6@36c1e266b Make tracer diffusivities 3D
- NOAA-GFDL/MOM6@cf29f1beb Allocate hbl
- NOAA-GFDL/MOM6@53ccbc329 Fix line length
- NOAA-GFDL/MOM6@8234e696d Add hbd to the control structure
- NOAA-GFDL/MOM6@b4bd22322 Output relevant fields when diff or visc < 0
- NOAA-GFDL/MOM6@61baca8ea Option to taper neutral diffusion
- NOAA-GFDL/MOM6@8812ba999 Merge remote-tracking branch 'gustavo/fpmix_draft_17may2022' into fpmix_draft_18April2023
- NOAA-GFDL/MOM6@32b969ef4 Accommodate multi-instance runs in CESM (NOAA-GFDL#241)
- NOAA-GFDL/MOM6@ebf11d7c7 migrate nearly all refs to CFC_cap into MOM_tracer_flow_control and MOM_CFC_cap
- NOAA-GFDL/MOM6@a697159a2 Obsolete the USE_LATERAL_BOUNDARY_DIFFUSION option
- NOAA-GFDL/MOM6@eff5036e0 Unit tests and final cleaning
- NOAA-GFDL/MOM6@b85581ea8 read atm CFC hemispheric aveages from CFC_BC_FILE, instead of 2D fields
- NOAA-GFDL/MOM6@db06a5494 add CFC_BC_year_offset, converts model time to time in CFC_BC_file
- NOAA-GFDL/MOM6@c2a30839c Improve performance of hor_bnd_diffusion
- NOAA-GFDL/MOM6@f666a67cb Rename module to hor_bnd_diffusion
- NOAA-GFDL/MOM6@9b4bd84b5 Add mssing call to get_param for FPMIX
- NOAA-GFDL/MOM6@864506e85 Add omega_w2x to fluxes and forces
- NOAA-GFDL/MOM6@7624a83b8 Add missing use for vertFPmix
- NOAA-GFDL/MOM6@143d11752 Updates to vertFPmix
- NOAA-GFDL/MOM6@cb65bdcef Change name of logical
- NOAA-GFDL/MOM6@9c103f1f9 First draft for fpmix
- NOAA-GFDL/MOM6@b7390f7e0 Makes set_u_at_v and set_v_at_u public
  • Loading branch information
@mom6bot
mom6bot committed Oct 25, 2023
1 parent eb97ec6 commit 48f7d1f
Show file tree
Hide file tree
Showing 64 changed files with 907 additions and 427 deletions.
16 changes: 12 additions & 4 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 @@ -949,6 +949,8 @@ BT_USE_LAYER_FLUXES = True ! [Boolean] default = True
STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
! If true, calculate the Coriolis accelerations at the end of each timestep for
! use in the predictor step of the next split RK2 timestep.
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
Expand Down Expand Up @@ -1121,6 +1123,9 @@ SMAGORINSKY_AH = True ! [Boolean] default = False
! If true, use a biharmonic Smagorinsky nonlinear eddy viscosity.
LEITH_AH = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity.
USE_LEITHY = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity together with a
! harmonic backscatter.
BOUND_AH = True ! [Boolean] default = True
! If true, the biharmonic coefficient is locally limited to be stable.
BETTER_BOUND_AH = True ! [Boolean] default = True
Expand Down Expand Up @@ -1911,6 +1916,9 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! === module MOM_tracer_hor_diff ===
KHTR = 10.0 ! [m2 s-1] default = 0.0
! The background along-isopycnal tracer diffusivity.
KHTR_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! the tracer diffusivity.
KHTR_MIN = 50.0 ! [m2 s-1] default = 0.0
! The minimum along-isopycnal tracer diffusivity.
KHTR_MAX = 900.0 ! [m2 s-1] default = 0.0
Expand Down Expand Up @@ -1946,10 +1954,10 @@ ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0
USE_NEUTRAL_DIFFUSION = False ! [Boolean] default = False
! If true, enables the neutral diffusion module.

! === module MOM_lateral_boundary_diffusion ===
! This module implements lateral diffusion of tracers near boundaries
USE_LATERAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the lateral boundary tracer's diffusion module.
! === module MOM_hor_bnd_diffusion ===
! This module implements horizontal diffusion of tracers near boundaries
USE_HORIZONTAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the horizonal boundary tracer's diffusion module.
OBSOLETE_DIAGNOSTIC_IS_FATAL = True ! [Boolean] default = True
! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
! error rather than issue a WARNING.
Expand Down
16 changes: 12 additions & 4 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 @@ -949,6 +949,8 @@ BT_USE_LAYER_FLUXES = True ! [Boolean] default = True
STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
! If true, calculate the Coriolis accelerations at the end of each timestep for
! use in the predictor step of the next split RK2 timestep.
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
Expand Down Expand Up @@ -1121,6 +1123,9 @@ SMAGORINSKY_AH = True ! [Boolean] default = False
! If true, use a biharmonic Smagorinsky nonlinear eddy viscosity.
LEITH_AH = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity.
USE_LEITHY = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity together with a
! harmonic backscatter.
BOUND_AH = True ! [Boolean] default = True
! If true, the biharmonic coefficient is locally limited to be stable.
BETTER_BOUND_AH = True ! [Boolean] default = True
Expand Down Expand Up @@ -1911,6 +1916,9 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! === module MOM_tracer_hor_diff ===
KHTR = 10.0 ! [m2 s-1] default = 0.0
! The background along-isopycnal tracer diffusivity.
KHTR_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! the tracer diffusivity.
KHTR_MIN = 50.0 ! [m2 s-1] default = 0.0
! The minimum along-isopycnal tracer diffusivity.
KHTR_MAX = 900.0 ! [m2 s-1] default = 0.0
Expand Down Expand Up @@ -1946,10 +1954,10 @@ ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0
USE_NEUTRAL_DIFFUSION = False ! [Boolean] default = False
! If true, enables the neutral diffusion module.

! === module MOM_lateral_boundary_diffusion ===
! This module implements lateral diffusion of tracers near boundaries
USE_LATERAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the lateral boundary tracer's diffusion module.
! === module MOM_hor_bnd_diffusion ===
! This module implements horizontal diffusion of tracers near boundaries
USE_HORIZONTAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the horizonal boundary tracer's diffusion module.
OBSOLETE_DIAGNOSTIC_IS_FATAL = True ! [Boolean] default = True
! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
! error rather than issue a WARNING.
Expand Down
16 changes: 12 additions & 4 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 @@ -949,6 +949,8 @@ BT_USE_LAYER_FLUXES = True ! [Boolean] default = True
STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
! If true, calculate the Coriolis accelerations at the end of each timestep for
! use in the predictor step of the next split RK2 timestep.
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
Expand Down Expand Up @@ -1121,6 +1123,9 @@ SMAGORINSKY_AH = True ! [Boolean] default = False
! If true, use a biharmonic Smagorinsky nonlinear eddy viscosity.
LEITH_AH = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity.
USE_LEITHY = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity together with a
! harmonic backscatter.
BOUND_AH = True ! [Boolean] default = True
! If true, the biharmonic coefficient is locally limited to be stable.
BETTER_BOUND_AH = True ! [Boolean] default = True
Expand Down Expand Up @@ -1911,6 +1916,9 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! === module MOM_tracer_hor_diff ===
KHTR = 10.0 ! [m2 s-1] default = 0.0
! The background along-isopycnal tracer diffusivity.
KHTR_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! the tracer diffusivity.
KHTR_MIN = 50.0 ! [m2 s-1] default = 0.0
! The minimum along-isopycnal tracer diffusivity.
KHTR_MAX = 900.0 ! [m2 s-1] default = 0.0
Expand Down Expand Up @@ -1946,10 +1954,10 @@ ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0
USE_NEUTRAL_DIFFUSION = False ! [Boolean] default = False
! If true, enables the neutral diffusion module.

! === module MOM_lateral_boundary_diffusion ===
! This module implements lateral diffusion of tracers near boundaries
USE_LATERAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the lateral boundary tracer's diffusion module.
! === module MOM_hor_bnd_diffusion ===
! This module implements horizontal diffusion of tracers near boundaries
USE_HORIZONTAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the horizonal boundary tracer's diffusion module.
OBSOLETE_DIAGNOSTIC_IS_FATAL = True ! [Boolean] default = True
! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
! error rather than issue a WARNING.
Expand Down
16 changes: 12 additions & 4 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,8 @@ BT_USE_LAYER_FLUXES = True ! [Boolean] default = True
STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
! If true, calculate the Coriolis accelerations at the end of each timestep for
! use in the predictor step of the next split RK2 timestep.
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
Expand Down Expand Up @@ -1121,6 +1123,9 @@ SMAGORINSKY_AH = True ! [Boolean] default = False
! If true, use a biharmonic Smagorinsky nonlinear eddy viscosity.
LEITH_AH = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity.
USE_LEITHY = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity together with a
! harmonic backscatter.
BOUND_AH = True ! [Boolean] default = True
! If true, the biharmonic coefficient is locally limited to be stable.
BETTER_BOUND_AH = True ! [Boolean] default = True
Expand Down Expand Up @@ -1911,6 +1916,9 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! === module MOM_tracer_hor_diff ===
KHTR = 10.0 ! [m2 s-1] default = 0.0
! The background along-isopycnal tracer diffusivity.
KHTR_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! the tracer diffusivity.
KHTR_MIN = 50.0 ! [m2 s-1] default = 0.0
! The minimum along-isopycnal tracer diffusivity.
KHTR_MAX = 900.0 ! [m2 s-1] default = 0.0
Expand Down Expand Up @@ -1946,10 +1954,10 @@ ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0
USE_NEUTRAL_DIFFUSION = False ! [Boolean] default = False
! If true, enables the neutral diffusion module.

! === module MOM_lateral_boundary_diffusion ===
! This module implements lateral diffusion of tracers near boundaries
USE_LATERAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the lateral boundary tracer's diffusion module.
! === module MOM_hor_bnd_diffusion ===
! This module implements horizontal diffusion of tracers near boundaries
USE_HORIZONTAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the horizonal boundary tracer's diffusion module.
OBSOLETE_DIAGNOSTIC_IS_FATAL = True ! [Boolean] default = True
! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
! error rather than issue a WARNING.
Expand Down
16 changes: 12 additions & 4 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 @@ -1090,6 +1090,8 @@ BT_USE_LAYER_FLUXES = True ! [Boolean] default = True
STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
! If true, calculate the Coriolis accelerations at the end of each timestep for
! use in the predictor step of the next split RK2 timestep.
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
Expand Down Expand Up @@ -1335,6 +1337,9 @@ SMAGORINSKY_AH = True ! [Boolean] default = False
! If true, use a biharmonic Smagorinsky nonlinear eddy viscosity.
LEITH_AH = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity.
USE_LEITHY = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity together with a
! harmonic backscatter.
BOUND_AH = True ! [Boolean] default = True
! If true, the biharmonic coefficient is locally limited to be stable.
BETTER_BOUND_AH = True ! [Boolean] default = True
Expand Down Expand Up @@ -2110,6 +2115,9 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
! The background along-isopycnal tracer diffusivity.
KHTR_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! the tracer diffusivity.
KHTR_MIN = 50.0 ! [m2 s-1] default = 0.0
! The minimum along-isopycnal tracer diffusivity.
KHTR_MAX = 900.0 ! [m2 s-1] default = 0.0
Expand Down Expand Up @@ -2157,10 +2165,10 @@ NDIFF_USE_UNMASKED_TRANSPORT_BUG = False ! [Boolean] default = False
! transports that were unmasked, as used prior to Jan 2018. This is not
! recommended.

! === module MOM_lateral_boundary_diffusion ===
! This module implements lateral diffusion of tracers near boundaries
USE_LATERAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the lateral boundary tracer's diffusion module.
! === module MOM_hor_bnd_diffusion ===
! This module implements horizontal diffusion of tracers near boundaries
USE_HORIZONTAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the horizonal boundary tracer's diffusion module.
OBSOLETE_DIAGNOSTIC_IS_FATAL = True ! [Boolean] default = True
! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
! error rather than issue a WARNING.
Expand Down
16 changes: 12 additions & 4 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 @@ -1184,6 +1184,8 @@ BT_USE_LAYER_FLUXES = True ! [Boolean] default = True
STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
! If true, calculate the Coriolis accelerations at the end of each timestep for
! use in the predictor step of the next split RK2 timestep.
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
Expand Down Expand Up @@ -1359,6 +1361,9 @@ SMAGORINSKY_AH = True ! [Boolean] default = False
! If true, use a biharmonic Smagorinsky nonlinear eddy viscosity.
LEITH_AH = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity.
USE_LEITHY = False ! [Boolean] default = False
! If true, use a biharmonic Leith nonlinear eddy viscosity together with a
! harmonic backscatter.
BOUND_AH = True ! [Boolean] default = True
! If true, the biharmonic coefficient is locally limited to be stable.
BETTER_BOUND_AH = True ! [Boolean] default = True
Expand Down Expand Up @@ -2203,6 +2208,9 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
! === module MOM_tracer_hor_diff ===
KHTR = 0.0 ! [m2 s-1] default = 0.0
! The background along-isopycnal tracer diffusivity.
KHTR_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! the tracer diffusivity.
KHTR_MIN = 0.0 ! [m2 s-1] default = 0.0
! The minimum along-isopycnal tracer diffusivity.
KHTR_MAX = 0.0 ! [m2 s-1] default = 0.0
Expand Down Expand Up @@ -2235,10 +2243,10 @@ RECALC_NEUTRAL_SURF = False ! [Boolean] default = False
USE_NEUTRAL_DIFFUSION = False ! [Boolean] default = False
! If true, enables the neutral diffusion module.

! === module MOM_lateral_boundary_diffusion ===
! This module implements lateral diffusion of tracers near boundaries
USE_LATERAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the lateral boundary tracer's diffusion module.
! === module MOM_hor_bnd_diffusion ===
! This module implements horizontal diffusion of tracers near boundaries
USE_HORIZONTAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
! If true, enables the horizonal boundary tracer's diffusion module.
OBSOLETE_DIAGNOSTIC_IS_FATAL = True ! [Boolean] default = True
! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
! error rather than issue a WARNING.
Expand Down
Loading

0 comments on commit 48f7d1f

Please sign in to comment.