Skip to content

Commit

Permalink
MOM6: Fix to codecov file path search
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@2d19b2513 Fix to codecov file path search
- NOAA-GFDL/MOM6@1acc70e78 Fix mask bug in apply_topography_edits_from_file
- NOAA-GFDL/MOM6@1ce6fe146 Rename local variable Dmin  in initialize_masks()
- NOAA-GFDL/MOM6@34b18df6e Correct topography for masked-out land PEs halos This commit fixes the bug with NaN appearing in the halo regions of the  masked-out PEs.
- NOAA-GFDL/MOM6@819999e70 +Fixed rare issue with MOM_geothermal and cleanup
  • Loading branch information
@marshallward
marshallward committed Aug 5, 2021
1 parent a0f22bc commit eeaf2ec
Show file tree
Hide file tree
Showing 50 changed files with 150 additions and 171 deletions.
10 changes: 5 additions & 5 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 @@ -209,22 +209,22 @@ TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
! specified, then all depths shallower than MINIMUM_DEPTH but deeper than
! MASKING_DEPTH are rounded to MINIMUM_DEPTH.
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.

! === module MOM_open_boundary ===
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
! if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
CHANNEL_CONFIG = "global_1deg" ! default = "none"
! A parameter that determines which set of channels are
! restricted to specific widths. Options are:
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ TOPO_CONFIG = "file" !
! Phillips - ACC-like idealized topography used in the Phillips config.
! dense - Denmark Strait-like dense water formation and overflow.
! USER - call a user modified routine.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
! specified, then all depths shallower than MINIMUM_DEPTH but deeper than
! MASKING_DEPTH are rounded to MINIMUM_DEPTH.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
CHANNEL_CONFIG = "global_1deg" ! default = "none"
! A parameter that determines which set of channels are
! restricted to specific widths. Options are:
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
Expand All @@ -183,6 +181,8 @@ MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
CHANNEL_CONFIG = "none" ! default = "none"
! A parameter that determines which set of channels are restricted to specific
! widths. Options are:
Expand Down
10 changes: 5 additions & 5 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 @@ -209,22 +209,22 @@ TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
! specified, then all depths shallower than MINIMUM_DEPTH but deeper than
! MASKING_DEPTH are rounded to MINIMUM_DEPTH.
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.

! === module MOM_open_boundary ===
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
! if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
CHANNEL_CONFIG = "global_1deg" ! default = "none"
! A parameter that determines which set of channels are
! restricted to specific widths. Options are:
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ TOPO_CONFIG = "file" !
! Phillips - ACC-like idealized topography used in the Phillips config.
! dense - Denmark Strait-like dense water formation and overflow.
! USER - call a user modified routine.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
! specified, then all depths shallower than MINIMUM_DEPTH but deeper than
! MASKING_DEPTH are rounded to MINIMUM_DEPTH.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
CHANNEL_CONFIG = "global_1deg" ! default = "none"
! A parameter that determines which set of channels are
! restricted to specific widths. Options are:
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@ TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
Expand All @@ -160,6 +158,8 @@ MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
CHANNEL_CONFIG = "none" ! default = "none"
! A parameter that determines which set of channels are restricted to specific
! widths. Options are:
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
Expand All @@ -183,6 +181,8 @@ MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
CHANNEL_CONFIG = "none" ! default = "none"
! A parameter that determines which set of channels are restricted to specific
! widths. Options are:
Expand Down
10 changes: 5 additions & 5 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 @@ -209,22 +209,22 @@ TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
! specified, then all depths shallower than MINIMUM_DEPTH but deeper than
! MASKING_DEPTH are rounded to MINIMUM_DEPTH.
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.

! === module MOM_open_boundary ===
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
! if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
CHANNEL_CONFIG = "global_1deg" ! default = "none"
! A parameter that determines which set of channels are
! restricted to specific widths. Options are:
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ TOPO_CONFIG = "file" !
! Phillips - ACC-like idealized topography used in the Phillips config.
! dense - Denmark Strait-like dense water formation and overflow.
! USER - call a user modified routine.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
! specified, then all depths shallower than MINIMUM_DEPTH but deeper than
! MASKING_DEPTH are rounded to MINIMUM_DEPTH.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
CHANNEL_CONFIG = "global_1deg" ! default = "none"
! A parameter that determines which set of channels are
! restricted to specific widths. Options are:
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_fast_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@ TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
Expand All @@ -160,6 +158,8 @@ MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
CHANNEL_CONFIG = "none" ! default = "none"
! A parameter that determines which set of channels are restricted to specific
! widths. Options are:
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
Expand All @@ -183,6 +181,8 @@ MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
CHANNEL_CONFIG = "none" ! default = "none"
! A parameter that determines which set of channels are restricted to specific
! widths. Options are:
Expand Down
10 changes: 5 additions & 5 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,22 +209,22 @@ TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
! specified, then all depths shallower than MINIMUM_DEPTH but deeper than
! MASKING_DEPTH are rounded to MINIMUM_DEPTH.
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.

! === module MOM_open_boundary ===
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
! if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all fluxes are
! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH
CHANNEL_CONFIG = "global_1deg" ! default = "none"
! A parameter that determines which set of channels are
! restricted to specific widths. Options are:
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ TOPO_CONFIG = "file" !
! Phillips - ACC-like idealized topography used in the Phillips config.
! dense - Denmark Strait-like dense water formation and overflow.
! USER - call a user modified routine.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is
! specified, then all depths shallower than MINIMUM_DEPTH but deeper than
! MASKING_DEPTH are rounded to MINIMUM_DEPTH.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
CHANNEL_CONFIG = "global_1deg" ! default = "none"
! A parameter that determines which set of channels are
! restricted to specific widths. Options are:
Expand Down
Loading

0 comments on commit eeaf2ec

Please sign in to comment.