Skip to content

Commit

Permalink
Z diag purge
Browse files Browse the repository at this point in the history 
This commit removes the parameters and diagnostics related to the legacy
Z level interpolation.

The following parameters are removed:

* MIN_Z_DIAG_INTERVAL
* Z_OUTPUT_GRID_FILE

Any diagnostics using a `*_zold` module have also been removed.

This commit also removes an unused ocean.stats output file for the
Baltic_OM4_025 experiment, and updates .gitignore to support stats files
without compiler suffixes.
  • Loading branch information
@marshallward
marshallward committed May 21, 2019
1 parent 3099ac3 commit 22f1cd9
Show file tree
Hide file tree
Showing 38 changed files with 4 additions and 389 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ build*
.datasets
# Ignore model output
*.out
CPU_stats
CPU_stats.*
_read_error.nml
available_diags.0*
Expand All @@ -14,7 +15,9 @@ fort.20
*.nc
*.nc.*
RESTART
ocean.stats
ocean.stats.*
seaice.stats
seaice.stats.*
# Ignore python .pyc files
*.pyc
Expand Down
12 changes: 0 additions & 12 deletions coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ DT_THERM = 7200.0 ! [s] default = 3600.0
! Ideally DT_THERM should be an integer multiple of DT
! and less than the forcing or coupling time-step.
! By default DT_THERM is set to DT.
MIN_Z_DIAG_INTERVAL = 2.16E+04 ! [s] default = 0.0
! The minimum amount of time in seconds between
! calculations of depth-space diagnostics. Making this
! larger than DT_THERM reduces the performance penalty
! of regridding to depth online.
DTBT_RESET_PERIOD = 0.0 ! [s] default = 7200.0
! The period between recalculations of DTBT (if DTBT <= 0).
! If DTBT_RESET_PERIOD is negative, DTBT is set based
Expand Down Expand Up @@ -406,13 +401,6 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0
! geostrophic kinetic energy or 1 plus the square of the
! grid spacing over the deformation radius, as detailed
! by Fox-Kemper et al. (2010)
Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = ""
! The file that specifies the vertical grid for
! depth-space diagnostics, or blank to disable
! depth-space output.
!NK_ZSPACE (from file) = 50 ! [nondim]
! The number of depth-space levels. This is determined
! from the size of the variable zw in the output grid file.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
14 changes: 0 additions & 14 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ DT_THERM = 7200.0 ! [s] default = 3600.0
! THERMO_SPANS_COUPLING is true, in which case DT_THERM
! can be an integer multiple of the coupling timestep. By
! default DT_THERM is set to DT.
MIN_Z_DIAG_INTERVAL = 2.16E+04 ! [s] default = 0.0
! The minimum amount of time in seconds between
! calculations of depth-space diagnostics. Making this
! larger than DT_THERM reduces the performance penalty
! of regridding to depth online.
FRAZIL = True ! [Boolean] default = False
! If true, water freezes if it gets too cold, and the
! the accumulated heat deficit is returned in the
Expand Down Expand Up @@ -401,15 +396,6 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0
! grid spacing over the deformation radius, as detailed
! by Fox-Kemper et al. (2010)

! === module MOM_diag_to_Z ===
Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = ""
! The file that specifies the vertical grid for
! depth-space diagnostics, or blank to disable
! depth-space output.
!NK_ZSPACE (from file) = 50 ! [nondim]
! The number of depth-space levels. This is determined
! from the size of the variable zw in the output grid file.

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

Expand Down
12 changes: 0 additions & 12 deletions coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ DT_THERM = 7200.0 ! [s] default = 3600.0
! Ideally DT_THERM should be an integer multiple of DT
! and less than the forcing or coupling time-step.
! By default DT_THERM is set to DT.
MIN_Z_DIAG_INTERVAL = 2.16E+04 ! [s] default = 0.0
! The minimum amount of time in seconds between
! calculations of depth-space diagnostics. Making this
! larger than DT_THERM reduces the performance penalty
! of regridding to depth online.
DTBT_RESET_PERIOD = 0.0 ! [s] default = 7200.0
! The period between recalculations of DTBT (if DTBT <= 0).
! If DTBT_RESET_PERIOD is negative, DTBT is set based
Expand Down Expand Up @@ -407,13 +402,6 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0
! geostrophic kinetic energy or 1 plus the square of the
! grid spacing over the deformation radius, as detailed
! by Fox-Kemper et al. (2010)
Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = ""
! The file that specifies the vertical grid for
! depth-space diagnostics, or blank to disable
! depth-space output.
!NK_ZSPACE (from file) = 50 ! [nondim]
! The number of depth-space levels. This is determined
! from the size of the variable zw in the output grid file.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
12 changes: 0 additions & 12 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ DT_THERM = 7200.0 ! [s] default = 3600.0
! Ideally DT_THERM should be an integer multiple of DT
! and less than the forcing or coupling time-step.
! By default DT_THERM is set to DT.
MIN_Z_DIAG_INTERVAL = 2.16E+04 ! [s] default = 0.0
! The minimum amount of time in seconds between
! calculations of depth-space diagnostics. Making this
! larger than DT_THERM reduces the performance penalty
! of regridding to depth online.
DTBT_RESET_PERIOD = 0.0 ! [s] default = 7200.0
! The period between recalculations of DTBT (if DTBT <= 0).
! If DTBT_RESET_PERIOD is negative, DTBT is set based
Expand Down Expand Up @@ -407,13 +402,6 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0
! geostrophic kinetic energy or 1 plus the square of the
! grid spacing over the deformation radius, as detailed
! by Fox-Kemper et al. (2010)
Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = ""
! The file that specifies the vertical grid for
! depth-space diagnostics, or blank to disable
! depth-space output.
!NK_ZSPACE (from file) = 50 ! [nondim]
! The number of depth-space levels. This is determined
! from the size of the variable zw in the output grid file.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
12 changes: 0 additions & 12 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ DT_THERM = 7200.0 ! [s] default = 3600.0
! Ideally DT_THERM should be an integer multiple of DT
! and less than the forcing or coupling time-step.
! By default DT_THERM is set to DT.
MIN_Z_DIAG_INTERVAL = 2.16E+04 ! [s] default = 0.0
! The minimum amount of time in seconds between
! calculations of depth-space diagnostics. Making this
! larger than DT_THERM reduces the performance penalty
! of regridding to depth online.
DTBT_RESET_PERIOD = 0.0 ! [s] default = 7200.0
! The period between recalculations of DTBT (if DTBT <= 0).
! If DTBT_RESET_PERIOD is negative, DTBT is set based
Expand Down Expand Up @@ -407,13 +402,6 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0
! geostrophic kinetic energy or 1 plus the square of the
! grid spacing over the deformation radius, as detailed
! by Fox-Kemper et al. (2010)
Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = ""
! The file that specifies the vertical grid for
! depth-space diagnostics, or blank to disable
! depth-space output.
!NK_ZSPACE (from file) = 50 ! [nondim]
! The number of depth-space levels. This is determined
! from the size of the variable zw in the output grid file.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
12 changes: 0 additions & 12 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@ DT_THERM = 7200.0 ! [s] default = 3600.0
! Ideally DT_THERM should be an integer multiple of DT
! and less than the forcing or coupling time-step.
! By default DT_THERM is set to DT.
MIN_Z_DIAG_INTERVAL = 2.16E+04 ! [s] default = 0.0
! The minimum amount of time in seconds between
! calculations of depth-space diagnostics. Making this
! larger than DT_THERM reduces the performance penalty
! of regridding to depth online.
DTBT_RESET_PERIOD = 0.0 ! [s] default = 7200.0
! The period between recalculations of DTBT (if DTBT <= 0).
! If DTBT_RESET_PERIOD is negative, DTBT is set based
Expand Down Expand Up @@ -411,13 +406,6 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0
! geostrophic kinetic energy or 1 plus the square of the
! grid spacing over the deformation radius, as detailed
! by Fox-Kemper et al. (2010)
Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = ""
! The file that specifies the vertical grid for
! depth-space diagnostics, or blank to disable
! depth-space output.
!NK_ZSPACE (from file) = 50 ! [nondim]
! The number of depth-space levels. This is determined
! from the size of the variable zw in the output grid file.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
11 changes: 1 addition & 10 deletions ice_ocean_SIS/Amery/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
!* appropriate, MKS units are used. *
!********+*********+*********+*********+*********+*********+*********+*

!SYMMETRIC_MEMORY_ = True
!SYMMETRIC_MEMORY_ = True

DAYMAX = 36500.0

Expand Down Expand Up @@ -191,15 +191,6 @@ SAVE_INITIAL_CONDS = True ! If defined, the inital conditions are
IC_OUTPUT_FILE = "MOM_IC" ! The name-root of a file into which the
! initial conditions are written for a new run.

Z_OUTPUT_GRID_FILE = "zgrid.nc"
! The file that specifies the vertical grid
! for depth-space diagnostics.
MIN_Z_DIAG_INTERVAL = 2.16e4 ! The minimum amount of time in seconds between
! calculations of depth-space diagnostics.
! Making this larger than DT_THERM reduces the
! performance penalty of regridding to depth
! online.

MAXCPU = 86400.0 ! The maximum amount of cpu time per processor
! for which MOM should run before saving a
! restart file and quitting with a return value
Expand Down
9 changes: 0 additions & 9 deletions ice_ocean_SIS/GIS_0125/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,6 @@ SAVE_INITIAL_CONDS = True ! If defined, the inital conditions are
IC_OUTPUT_FILE = "MOM_IC" ! The name-root of a file into which the
! initial conditions are written for a new run.

Z_OUTPUT_GRID_FILE = "zgrid.nc"
! The file that specifies the vertical grid
! for depth-space diagnostics.
MIN_Z_DIAG_INTERVAL = 2.16e4 ! The minimum amount of time in seconds between
! calculations of depth-space diagnostics.
! Making this larger than DT_THERM reduces the
! performance penalty of regridding to depth
! online.

MAXCPU = 86400.0 ! The maximum amount of cpu time per processor
! for which MOM should run before saving a
! restart file and quitting with a return value
Expand Down
12 changes: 0 additions & 12 deletions ice_ocean_SIS/GOLD_SIS/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ DT_THERM = 7200.0 ! [s] default = 3600.0
! Ideally DT_THERM should be an integer multiple of DT
! and less than the forcing or coupling time-step.
! By default DT_THERM is set to DT.
MIN_Z_DIAG_INTERVAL = 2.16E+04 ! [s] default = 0.0
! The minimum amount of time in seconds between
! calculations of depth-space diagnostics. Making this
! larger than DT_THERM reduces the performance penalty
! of regridding to depth online.
DTBT_RESET_PERIOD = 0.0 ! [s] default = 7200.0
! The period between recalculations of DTBT (if DTBT <= 0).
! If DTBT_RESET_PERIOD is negative, DTBT is set based
Expand Down Expand Up @@ -434,13 +429,6 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0
! geostrophic kinetic energy or 1 plus the square of the
! grid spacing over the deformation radius, as detailed
! by Fox-Kemper et al. (2010)
Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = ""
! The file that specifies the vertical grid for
! depth-space diagnostics, or blank to disable
! depth-space output.
!NK_ZSPACE (from file) = 50 ! [nondim]
! The number of depth-space levels. This is determined
! from the size of the variable zw in the output grid file.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
12 changes: 0 additions & 12 deletions ice_ocean_SIS/GOLD_SIS_025/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ DT_THERM = 3600.0 ! [s] default = 1200.0
! Ideally DT_THERM should be an integer multiple of DT
! and less than the forcing or coupling time-step.
! By default DT_THERM is set to DT.
MIN_Z_DIAG_INTERVAL = 2.16E+04 ! [s] default = 0.0
! The minimum amount of time in seconds between
! calculations of depth-space diagnostics. Making this
! larger than DT_THERM reduces the performance penalty
! of regridding to depth online.
DTBT_RESET_PERIOD = -1.0 ! [s] default = 3600.0
! The period between recalculations of DTBT (if DTBT <= 0).
! If DTBT_RESET_PERIOD is negative, DTBT is set based
Expand Down Expand Up @@ -382,13 +377,6 @@ FOX_KEMPER_ML_RESTRAT_COEF = 5.0 ! [nondim] default = 0.0
! geostrophic kinetic energy or 1 plus the square of the
! grid spacing over the deformation radius, as detailed
! by Fox-Kemper et al. (2010)
Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = ""
! The file that specifies the vertical grid for
! depth-space diagnostics, or blank to disable
! depth-space output.
!NK_ZSPACE (from file) = 50 ! [nondim]
! The number of depth-space levels. This is determined
! from the size of the variable zw in the output grid file.

! === module MOM_diabatic_driver ===
! The following parameters are used for diabatic processes.
Expand Down
12 changes: 0 additions & 12 deletions ice_ocean_SIS/GOLD_SIS_icebergs/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ DT_THERM = 7200.0 ! [s] default = 3600.0
! Ideally DT_THERM should be an integer multiple of DT
! and less than the forcing or coupling time-step.
! By default DT_THERM is set to DT.
MIN_Z_DIAG_INTERVAL = 2.16E+04 ! [s] default = 0.0
! The minimum amount of time in seconds between
! calculations of depth-space diagnostics. Making this
! larger than DT_THERM reduces the performance penalty
! of regridding to depth online.
DTBT_RESET_PERIOD = 0.0 ! [s] default = 7200.0
! The period between recalculations of DTBT (if DTBT <= 0).
! If DTBT_RESET_PERIOD is negative, DTBT is set based
Expand Down Expand Up @@ -434,13 +429,6 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0
! geostrophic kinetic energy or 1 plus the square of the
! grid spacing over the deformation radius, as detailed
! by Fox-Kemper et al. (2010)
Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = ""
! The file that specifies the vertical grid for
! depth-space diagnostics, or blank to disable
! depth-space output.
!NK_ZSPACE (from file) = 50 ! [nondim]
! The number of depth-space levels. This is determined
! from the size of the variable zw in the output grid file.

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

0 comments on commit 22f1cd9

Please sign in to comment.