Skip to content

Commit

Permalink
MOM6: Merge branch 'raphaeldussin-mask_checks' into dev/gfdl
Browse files Browse the repository at this point in the history 
- Updates MOM_parameter_doc.debugging with new parameter

- NOAA-GFDL/MOM6@adf6665 Merge branch 'raphaeldussin-mask_checks' into dev/gfdl
- NOAA-GFDL/MOM6@d23d1b0 Merge branch 'mask_checks' of https://github.com/raphaeldussin/MOM6 into raphaeldussin-mask_checks
- NOAA-GFDL/MOM6@be36201 shorter lines
- NOAA-GFDL/MOM6@db3dad3 Merge branch 'mask_checks' of https://github.com/raphaeldussin/MOM6 into mask_checks
- NOAA-GFDL/MOM6@0b9eb01 add namelist param
- NOAA-GFDL/MOM6@b3a53c7 Merge branch 'ESMG-dev/esmg' into dev/gfdl
- NOAA-GFDL/MOM6@7ddef69 Merge branch 'dev/gfdl' into mask_checks
- NOAA-GFDL/MOM6@7cdcdaa fix alloc and give global indices
- NOAA-GFDL/MOM6@a537f6a Merge branch 'OBC_tracer_advect_patch2' into dev/esmg
- NOAA-GFDL/MOM6@09f2157 Tiny tweak to Matt's giant merger
- NOAA-GFDL/MOM6@69d8e0f Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into OBC_tracer_advect_patch2
- NOAA-GFDL/MOM6@5b71b37 Fixes answer changes due to incomplete copy of tracer array
- NOAA-GFDL/MOM6@e109eb7 Merge pull request NOAA-GFDL#72 from ESMG/OBC_segment_data_thickness_adjust
- NOAA-GFDL/MOM6@8828ecd Fix index error
- NOAA-GFDL/MOM6@5adefb7 *Fixed routine for adjusting segment data thicknesses.
- NOAA-GFDL/MOM6@e8b9ebf change precision output string
- NOAA-GFDL/MOM6@097f912 char len change
- NOAA-GFDL/MOM6@870c71e add more verbosity
- NOAA-GFDL/MOM6@74df31a *Adjust Segment Data Thicknesses
- NOAA-GFDL/MOM6@36ca30d pff
- NOAA-GFDL/MOM6@a8f3fb3 duh
- NOAA-GFDL/MOM6@bb231db add checks land values
- NOAA-GFDL/MOM6@8d24d16 Merge pull request NOAA-GFDL#69 from ESMG/OBC_patches
- NOAA-GFDL/MOM6@6c687e9 Merge branch 'dev/esmg' of github.com:ESMG/MOM6 into OBC_patches
- NOAA-GFDL/MOM6@ceab18a Source data are assumed to be zonally re-entrant.
- NOAA-GFDL/MOM6@49797c8 Makes OBC restart field rx_normal not required
- NOAA-GFDL/MOM6@4af643c Merge pull request NOAA-GFDL#68 from ESMG/tracer_advection_OBC
- NOAA-GFDL/MOM6@6860cec fix indexing error in advect_y
- NOAA-GFDL/MOM6@b5b081e remove commented code
- NOAA-GFDL/MOM6@b25eb9d Merge branch 'dev/esmg' of github.com:ESMG/MOM6 into tracer_advection_OBC
- NOAA-GFDL/MOM6@f0ed7f8 changes needed for reproducibility across restarts using OBCs
- NOAA-GFDL/MOM6@6b070fd Merge branch 'dev/gfdl' into dev/esmg
- NOAA-GFDL/MOM6@8cfac0f Trying to check to see that OBC data is there if needed.
- NOAA-GFDL/MOM6@7c4cfa7 Allow dyed_obcs to be used with other OBC data inputs.
- NOAA-GFDL/MOM6@9379419 *Get rid of uninitialized cff variable in OBC.
- NOAA-GFDL/MOM6@1538e96 Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
- NOAA-GFDL/MOM6@8eb9935 Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
- NOAA-GFDL/MOM6@02248a4 Merge branch 'obc_index_error_patch' into dev/esmg
- NOAA-GFDL/MOM6@9cff98c Merge branch 'dev/esmg' into obc_index_error_patch
- NOAA-GFDL/MOM6@94dc2eb fix indexing error for salt OBC reservoir
  • Loading branch information
@adcroft
adcroft committed Aug 28, 2019
1 parent 1e030ba commit a5851c0
Show file tree
Hide file tree
Showing 15 changed files with 43 additions and 1 deletion.
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.debugging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ DEBUG_KAPPA_SHEAR = False ! [Boolean] default = False
! If true, write debugging data for the kappa-shear code.
! Caution: this option is _very_ verbose and should only be used in
! single-column mode!
CHECK_NO_LAND_FLUXES = False ! [Boolean] default = False
! If true, checks that values from IOB fluxes are zero above land points (i.e.
! G%mask2dT = 0).
REPORT_UNUSED_PARAMS = False ! [Boolean] default = False
! If true, report any parameter lines that are not used in the run.
FATAL_UNUSED_PARAMS = False ! [Boolean] default = False
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 5 files
+104 −16 config_src/coupled_driver/MOM_surface_forcing.F90
+225 −29 src/core/MOM_open_boundary.F90
+2 −2 src/framework/MOM_horizontal_regridding.F90
+5 −0 src/initialization/MOM_state_initialization.F90
+144 −9 src/tracer/MOM_tracer_advect.F90

0 comments on commit a5851c0

Please sign in to comment.