Skip to content

Commit

Permalink
MOM6: Fix remapping of last layer for mismatched ocean depths
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@88d9eb79f Fix remapping of last layer for mismatched ocean depths
- NOAA-GFDL/MOM6@40e6d6dda Last refactor of remap_via_sub_cells() adding remap_sub_to_tgt_grid()
- NOAA-GFDL/MOM6@99363e462 Removed debugging from remap_via_sub_cells() in MOM_remapping.F90
- NOAA-GFDL/MOM6@11c50db7b Refactor/split remap_via_sub_cells() adding remap_src_to_sub_grid()
- NOAA-GFDL/MOM6@b2629554c Refactor/split remap_via_sub_cells() adding intersect_src_tgt_grids()
- NOAA-GFDL/MOM6@622651bff Re-factored remapping_unit_tests()
- NOAA-GFDL/MOM6@a8105af75 Added drivers/unit_tests/test_MOM_remapping.F90
- NOAA-GFDL/MOM6@b4e3c64b4 Add timings_tests/time_MOM_remapping
- NOAA-GFDL/MOM6@10f431239 Cleaned up MOM_remapping to reduce compiler warnings
MOM6: parse_perf.py bugfix
  • Loading branch information
@mom6bot @marshallward
mom6bot authored and marshallward committed Jul 3, 2024
1 parent 2e0ac5a commit fbf36f8
Show file tree
Hide file tree
Showing 62 changed files with 778 additions and 1 deletion.
12 changes: 12 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 @@ -630,6 +630,10 @@ SPONGE = False ! [Boolean] default = False
NUM_DIAG_COORDS = 1 ! default = 1
! The number of diagnostic vertical coordinates to use. For each coordinate, an
! entry in DIAG_COORDS must be provided.
DIAG_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for diagnostics. See
! REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting this option to
! false.
REMAPPING_ANSWER_DATE = 20181231 ! default = 20181231
! The vintage of the expressions and order of arithmetic to use for remapping.
! Values below 20190101 result in the use of older, less accurate expressions
Expand Down Expand Up @@ -767,6 +771,10 @@ INTERNAL_WAVE_SPEED_MIN = 0.0 ! [m s-1] default = 0.0
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
! If true, use a more robust estimate of the first mode wave speed as the
! starting point for iterations.
EBT_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.
USE_QG_LEITH_GM = False ! [Boolean] default = False
! If true, use the QG Leith viscosity as the GM coefficient.

Expand Down Expand Up @@ -1399,6 +1407,10 @@ DIAG_EBT_MONO_N2_COLUMN_FRACTION = 0.0 ! [nondim] default = 0.0
DIAG_EBT_MONO_N2_DEPTH = -1.0 ! [m] default = -1.0
! The depth below which N2 is limited as monotonic for the purposes of
! calculating the equivalent barotropic wave speed.
INTWAVE_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
12 changes: 12 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 @@ -630,6 +630,10 @@ SPONGE = False ! [Boolean] default = False
NUM_DIAG_COORDS = 1 ! default = 1
! The number of diagnostic vertical coordinates to use. For each coordinate, an
! entry in DIAG_COORDS must be provided.
DIAG_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for diagnostics. See
! REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting this option to
! false.
REMAPPING_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the expressions and order of arithmetic to use for remapping.
! Values below 20190101 result in the use of older, less accurate expressions
Expand Down Expand Up @@ -767,6 +771,10 @@ INTERNAL_WAVE_SPEED_MIN = 0.0 ! [m s-1] default = 0.0
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
! If true, use a more robust estimate of the first mode wave speed as the
! starting point for iterations.
EBT_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.
USE_QG_LEITH_GM = False ! [Boolean] default = False
! If true, use the QG Leith viscosity as the GM coefficient.

Expand Down Expand Up @@ -1399,6 +1407,10 @@ DIAG_EBT_MONO_N2_COLUMN_FRACTION = 0.0 ! [nondim] default = 0.0
DIAG_EBT_MONO_N2_DEPTH = -1.0 ! [m] default = -1.0
! The depth below which N2 is limited as monotonic for the purposes of
! calculating the equivalent barotropic wave speed.
INTWAVE_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
12 changes: 12 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 @@ -630,6 +630,10 @@ SPONGE = False ! [Boolean] default = False
NUM_DIAG_COORDS = 1 ! default = 1
! The number of diagnostic vertical coordinates to use. For each coordinate, an
! entry in DIAG_COORDS must be provided.
DIAG_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for diagnostics. See
! REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting this option to
! false.
REMAPPING_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the expressions and order of arithmetic to use for remapping.
! Values below 20190101 result in the use of older, less accurate expressions
Expand Down Expand Up @@ -767,6 +771,10 @@ INTERNAL_WAVE_SPEED_MIN = 0.0 ! [m s-1] default = 0.0
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
! If true, use a more robust estimate of the first mode wave speed as the
! starting point for iterations.
EBT_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.
USE_QG_LEITH_GM = False ! [Boolean] default = False
! If true, use the QG Leith viscosity as the GM coefficient.

Expand Down Expand Up @@ -1399,6 +1407,10 @@ DIAG_EBT_MONO_N2_COLUMN_FRACTION = 0.0 ! [nondim] default = 0.0
DIAG_EBT_MONO_N2_DEPTH = -1.0 ! [m] default = -1.0
! The depth below which N2 is limited as monotonic for the purposes of
! calculating the equivalent barotropic wave speed.
INTWAVE_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
12 changes: 12 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 @@ -630,6 +630,10 @@ SPONGE = False ! [Boolean] default = False
NUM_DIAG_COORDS = 1 ! default = 1
! The number of diagnostic vertical coordinates to use. For each coordinate, an
! entry in DIAG_COORDS must be provided.
DIAG_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for diagnostics. See
! REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting this option to
! false.
REMAPPING_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the expressions and order of arithmetic to use for remapping.
! Values below 20190101 result in the use of older, less accurate expressions
Expand Down Expand Up @@ -767,6 +771,10 @@ INTERNAL_WAVE_SPEED_MIN = 0.0 ! [m s-1] default = 0.0
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
! If true, use a more robust estimate of the first mode wave speed as the
! starting point for iterations.
EBT_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.
USE_QG_LEITH_GM = False ! [Boolean] default = False
! If true, use the QG Leith viscosity as the GM coefficient.

Expand Down Expand Up @@ -1399,6 +1407,10 @@ DIAG_EBT_MONO_N2_COLUMN_FRACTION = 0.0 ! [nondim] default = 0.0
DIAG_EBT_MONO_N2_DEPTH = -1.0 ! [m] default = -1.0
! The depth below which N2 is limited as monotonic for the purposes of
! calculating the equivalent barotropic wave speed.
INTWAVE_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
21 changes: 21 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 @@ -553,6 +553,11 @@ REMAP_BOUNDARY_EXTRAP = False ! [Boolean] default = False
INIT_BOUNDARY_EXTRAP = False ! [Boolean] default = False
! If true, values at the interfaces of boundary cells are extrapolated instead
! of piecewise constant during initialization.Defaults to REMAP_BOUNDARY_EXTRAP.
REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! This selects the remapping algorithm used in OM4 that does not use the full
! reconstruction for the top- and lower-most sub-layers, but instead assumes
! they are always vanished (untrue) and so just uses their edge values. We
! recommend setting this option to false.
REMAPPING_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the expressions and order of arithmetic to use for remapping.
! Values below 20190101 result in the use of older, less accurate expressions
Expand Down Expand Up @@ -624,6 +629,10 @@ TEMP_SALT_INIT_VERTICAL_REMAP_ONLY = False ! [Boolean] default = False
! If true, initial conditions are on the model horizontal grid. Extrapolation
! over missing ocean values is done using an ICE-9 procedure with vertical ALE
! remapping .
Z_INIT_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for initialization. See
! REMAPPING_USE_OM4_SUBCELLS for more details. We recommend setting this option
! to false.
HOR_REGRID_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the order of arithmetic for horizontal regridding. Dates
! before 20190101 give the same answers as the code did in late 2018, while
Expand Down Expand Up @@ -670,6 +679,10 @@ ODA_INCUPD = False ! [Boolean] default = False
NUM_DIAG_COORDS = 1 ! default = 1
! The number of diagnostic vertical coordinates to use. For each coordinate, an
! entry in DIAG_COORDS must be provided.
DIAG_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for diagnostics. See
! REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting this option to
! false.
USE_INDEX_DIAGNOSTIC_AXES = False ! [Boolean] default = False
! If true, use a grid index coordinate convention for diagnostic axes.
DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR"
Expand Down Expand Up @@ -929,6 +942,10 @@ INTERNAL_WAVE_SPEED_MIN = 0.0 ! [m s-1] default = 0.0
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
! If true, use a more robust estimate of the first mode wave speed as the
! starting point for iterations.
EBT_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.
USE_QG_LEITH_GM = False ! [Boolean] default = False
! If true, use the QG Leith viscosity as the GM coefficient.

Expand Down Expand Up @@ -1657,6 +1674,10 @@ DIAG_EBT_MONO_N2_COLUMN_FRACTION = 0.0 ! [nondim] default = 0.0
DIAG_EBT_MONO_N2_DEPTH = -1.0 ! [m] default = -1.0
! The depth below which N2 is limited as monotonic for the purposes of
! calculating the equivalent barotropic wave speed.
INTWAVE_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
21 changes: 21 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 @@ -605,6 +605,11 @@ REMAP_BOUNDARY_EXTRAP = False ! [Boolean] default = False
INIT_BOUNDARY_EXTRAP = False ! [Boolean] default = False
! If true, values at the interfaces of boundary cells are extrapolated instead
! of piecewise constant during initialization.Defaults to REMAP_BOUNDARY_EXTRAP.
REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! This selects the remapping algorithm used in OM4 that does not use the full
! reconstruction for the top- and lower-most sub-layers, but instead assumes
! they are always vanished (untrue) and so just uses their edge values. We
! recommend setting this option to false.
PARTIAL_CELL_VELOCITY_REMAP = False ! [Boolean] default = False
! If true, use partial cell thicknesses at velocity points that are masked out
! where they extend below the shallower of the neighboring bathymetry for
Expand Down Expand Up @@ -671,6 +676,10 @@ TEMP_SALT_INIT_VERTICAL_REMAP_ONLY = False ! [Boolean] default = False
! If true, initial conditions are on the model horizontal grid. Extrapolation
! over missing ocean values is done using an ICE-9 procedure with vertical ALE
! remapping .
Z_INIT_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for initialization. See
! REMAPPING_USE_OM4_SUBCELLS for more details. We recommend setting this option
! to false.
HOR_REGRID_ANSWER_DATE = 20181231 ! default = 20181231
! The vintage of the order of arithmetic for horizontal regridding. Dates
! before 20190101 give the same answers as the code did in late 2018, while
Expand Down Expand Up @@ -720,6 +729,10 @@ SPONGE = False ! [Boolean] default = False
NUM_DIAG_COORDS = 2 ! default = 1
! The number of diagnostic vertical coordinates to use. For each coordinate, an
! entry in DIAG_COORDS must be provided.
DIAG_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for diagnostics. See
! REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting this option to
! false.
USE_INDEX_DIAGNOSTIC_AXES = False ! [Boolean] default = False
! If true, use a grid index coordinate convention for diagnostic axes.
DIAG_COORDS = "z Z ZSTAR", "rho2 RHO2 RHO" !
Expand Down Expand Up @@ -1023,6 +1036,10 @@ INTERNAL_WAVE_SPEED_MIN = 0.0 ! [m s-1] default = 0.0
INTERNAL_WAVE_SPEED_BETTER_EST = False ! [Boolean] default = True
! If true, use a more robust estimate of the first mode wave speed as the
! starting point for iterations.
EBT_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.
USE_QG_LEITH_GM = False ! [Boolean] default = False
! If true, use the QG Leith viscosity as the GM coefficient.

Expand Down Expand Up @@ -1684,6 +1701,10 @@ DIAG_EBT_MONO_N2_COLUMN_FRACTION = 0.0 ! [nondim] default = 0.0
DIAG_EBT_MONO_N2_DEPTH = -1.0 ! [m] default = -1.0
! The depth below which N2 is limited as monotonic for the purposes of
! calculating the equivalent barotropic wave speed.
INTWAVE_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
! this option to false.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
Loading

0 comments on commit fbf36f8

Please sign in to comment.