Skip to content

Commit

Permalink
MOM6: +FIX_UNSPLIT_DT_VISC_BUG is now UNSPLIT_DT_VISC_BUG
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@eac3bb33c +FIX_UNSPLIT_DT_VISC_BUG is now UNSPLIT_DT_VISC_BUG
- NOAA-GFDL/MOM6@90de5de86 Rename u arg to step_MOM_dyn_split_RK2 as u_inst
- NOAA-GFDL/MOM6@d7096bdd2 fixed documented units of fN and fN_scale for ice shelf coulomb friction law
- NOAA-GFDL/MOM6@f7233e058 Optimized sub-cell grounding subroutines, increasing computational efficiency
- NOAA-GFDL/MOM6@b0ff6bd18 fixed documentation of inputs to subroutine sum_square_matrix
MOM6:
  • Loading branch information
@mom6bot @marshallward
mom6bot authored and marshallward committed Dec 21, 2023
1 parent ef58727 commit 52f0e79
Show file tree
Hide file tree
Showing 18 changed files with 52 additions and 52 deletions.
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,11 +743,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,11 +852,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,11 +852,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,11 +743,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,11 +852,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,11 +852,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,11 +743,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,11 +852,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,11 +852,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,11 +743,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,11 +852,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,11 +852,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,11 +852,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/single_column/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,11 +768,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/single_column/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -830,11 +830,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/single_column/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -830,11 +830,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
6 changes: 3 additions & 3 deletions ocean_only/unit_tests/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -619,11 +619,11 @@ PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_unsplit ===
FIX_UNSPLIT_DT_VISC_BUG = True ! [Boolean] default = True
! If true, use the correct timestep in the viscous terms applied in the first
UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False
! If false, use the correct timestep in the viscous terms applied in the first
! predictor step with the unsplit time stepping scheme, and in the calculation
! of the turbulent mixed layer properties for viscosity with unsplit or
! unsplit_RK2.
! unsplit_RK2. If true, an older incorrect value is used.
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
CALCULATE_SAL = False ! [Boolean] default = False
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 5 files
+43 −46 src/core/MOM_dynamics_split_RK2.F90
+45 −12 src/core/MOM_dynamics_unsplit.F90
+49 −16 src/core/MOM_dynamics_unsplit_RK2.F90
+599 −588 src/ice_shelf/MOM_ice_shelf_dynamics.F90
+27 −31 src/ice_shelf/MOM_ice_shelf_initialize.F90

0 comments on commit 52f0e79

Please sign in to comment.