diff --git a/.gitignore b/.gitignore index e1c3d9b564..abab6fca1b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ build* .datasets # Ignore model output *.out +CPU_stats CPU_stats.* _read_error.nml available_diags.0* @@ -14,7 +15,9 @@ fort.20 *.nc *.nc.* RESTART +ocean.stats ocean.stats.* +seaice.stats seaice.stats.* # Ignore python .pyc files *.pyc diff --git a/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_input b/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_input index eb7fa2cbc8..995fe51727 100644 --- a/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_input +++ b/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_input @@ -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 @@ -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. diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_input b/coupled_AM2_LM3_SIS/CM2G63L/MOM_input index 348bd4fd2a..82b31c6463 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_input +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_input @@ -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 @@ -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. diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_input b/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_input index 80535c176e..c449b39c6e 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_input +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_input @@ -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 @@ -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. diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_input b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_input index 79749cf9d4..4a0f0a4434 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_input +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_input @@ -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 @@ -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. diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_input b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_input index 79749cf9d4..4a0f0a4434 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_input +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_input @@ -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 @@ -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. diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_input b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_input index 15d92b4822..75e504ff01 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_input +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_input @@ -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 @@ -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. diff --git a/ice_ocean_SIS/Amery/MOM_input b/ice_ocean_SIS/Amery/MOM_input index ab23c72f43..c92f46911e 100644 --- a/ice_ocean_SIS/Amery/MOM_input +++ b/ice_ocean_SIS/Amery/MOM_input @@ -4,7 +4,7 @@ !* appropriate, MKS units are used. * !********+*********+*********+*********+*********+*********+*********+* -!SYMMETRIC_MEMORY_ = True +!SYMMETRIC_MEMORY_ = True DAYMAX = 36500.0 @@ -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 diff --git a/ice_ocean_SIS/GIS_0125/MOM_input b/ice_ocean_SIS/GIS_0125/MOM_input index c2ab7d1e27..b7943119bc 100644 --- a/ice_ocean_SIS/GIS_0125/MOM_input +++ b/ice_ocean_SIS/GIS_0125/MOM_input @@ -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 diff --git a/ice_ocean_SIS/GOLD_SIS/MOM_input b/ice_ocean_SIS/GOLD_SIS/MOM_input index 1344c63806..6c5812ef1a 100644 --- a/ice_ocean_SIS/GOLD_SIS/MOM_input +++ b/ice_ocean_SIS/GOLD_SIS/MOM_input @@ -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 @@ -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. diff --git a/ice_ocean_SIS/GOLD_SIS_025/MOM_input b/ice_ocean_SIS/GOLD_SIS_025/MOM_input index 52026b2024..df7c62828e 100644 --- a/ice_ocean_SIS/GOLD_SIS_025/MOM_input +++ b/ice_ocean_SIS/GOLD_SIS_025/MOM_input @@ -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 @@ -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. diff --git a/ice_ocean_SIS/GOLD_SIS_icebergs/MOM_input b/ice_ocean_SIS/GOLD_SIS_icebergs/MOM_input index 2512a0fdfe..4d7a0d5b48 100644 --- a/ice_ocean_SIS/GOLD_SIS_icebergs/MOM_input +++ b/ice_ocean_SIS/GOLD_SIS_icebergs/MOM_input @@ -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 @@ -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. diff --git a/ice_ocean_SIS2/Baltic/MOM_input b/ice_ocean_SIS2/Baltic/MOM_input index f999861a62..a1114aa210 100644 --- a/ice_ocean_SIS2/Baltic/MOM_input +++ b/ice_ocean_SIS2/Baltic/MOM_input @@ -86,11 +86,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 @@ -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. diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_input b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_input index 86192e38a6..4e29cbe08c 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_input +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_input @@ -86,11 +86,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 @@ -429,13 +424,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 = "analysis_vgrid_lev35.v1.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. diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_input b/ice_ocean_SIS2/Baltic_OM4_025/MOM_input index 4817ed6f10..dcd292b8bf 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_input +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_input @@ -37,11 +37,6 @@ THERMO_SPANS_COUPLING = True ! [Boolean] default = False ! The actual thermodynamic timestep that is used in this ! case is the largest integer multiple of the coupling ! timestep that is less than or equal to DT_THERM. -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 @@ -575,15 +570,6 @@ MLE_MLD_DECAY_TIME = 2.592E+06 ! [s] default = 0.0 ! the MLD deepens below the current running-mean the running-mean ! is instantaneously set to the current MLD. -! === module MOM_diag_to_Z === -Z_OUTPUT_GRID_FILE = "analysis_vgrid_lev35.v1.nc" ! default = "" - ! The file that specifies the vertical grid for - ! depth-space diagnostics, or blank to disable - ! depth-space output. -!NK_ZSPACE (from file) = 35 ! [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. ENERGETICS_SFC_PBL = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_input b/ice_ocean_SIS2/Baltic_OM4_05/MOM_input index 695bc5fc3e..b6ffdfdc07 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_input +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_input @@ -37,11 +37,6 @@ THERMO_SPANS_COUPLING = True ! [Boolean] default = False ! The actual thermodynamic timestep that is used in this ! case is the largest integer multiple of the coupling ! timestep that is less than or equal to DT_THERM. -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 @@ -600,15 +595,6 @@ MLE_MLD_DECAY_TIME = 2.592E+06 ! [s] default = 0.0 ! the MLD deepens below the current running-mean the running-mean ! is instantaneously set to the current MLD. -! === module MOM_diag_to_Z === -Z_OUTPUT_GRID_FILE = "analysis_vgrid_lev35.v1.nc" ! default = "" - ! The file that specifies the vertical grid for - ! depth-space diagnostics, or blank to disable - ! depth-space output. -!NK_ZSPACE (from file) = 35 ! [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. ENERGETICS_SFC_PBL = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_025/MOM_input b/ice_ocean_SIS2/OM4_025/MOM_input index 98457c9637..40b82b18b4 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_input +++ b/ice_ocean_SIS2/OM4_025/MOM_input @@ -37,11 +37,6 @@ THERMO_SPANS_COUPLING = True ! [Boolean] default = False ! The actual thermodynamic timestep that is used in this ! case is the largest integer multiple of the coupling ! timestep that is less than or equal to DT_THERM. -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 @@ -584,15 +579,6 @@ MLE_MLD_DECAY_TIME = 2.592E+06 ! [s] default = 0.0 ! the MLD deepens below the current running-mean the running-mean ! is instantaneously set to the current MLD. -! === module MOM_diag_to_Z === -Z_OUTPUT_GRID_FILE = "analysis_vgrid_lev35.v1.nc" ! default = "" - ! The file that specifies the vertical grid for - ! depth-space diagnostics, or blank to disable - ! depth-space output. -!NK_ZSPACE (from file) = 35 ! [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. ENERGETICS_SFC_PBL = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_05/MOM_input b/ice_ocean_SIS2/OM4_05/MOM_input index 53c456b602..db2f707b24 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_input +++ b/ice_ocean_SIS2/OM4_05/MOM_input @@ -37,11 +37,6 @@ THERMO_SPANS_COUPLING = True ! [Boolean] default = False ! The actual thermodynamic timestep that is used in this ! case is the largest integer multiple of the coupling ! timestep that is less than or equal to DT_THERM. -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 @@ -616,15 +611,6 @@ MLE_MLD_DECAY_TIME = 2.592E+06 ! [s] default = 0.0 ! the MLD deepens below the current running-mean the running-mean ! is instantaneously set to the current MLD. -! === module MOM_diag_to_Z === -Z_OUTPUT_GRID_FILE = "analysis_vgrid_lev35.v1.nc" ! default = "" - ! The file that specifies the vertical grid for - ! depth-space diagnostics, or blank to disable - ! depth-space output. -!NK_ZSPACE (from file) = 35 ! [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. ENERGETICS_SFC_PBL = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2/MOM_input b/ice_ocean_SIS2/SIS2/MOM_input index 2498dd6a3a..f47f981115 100644 --- a/ice_ocean_SIS2/SIS2/MOM_input +++ b/ice_ocean_SIS2/SIS2/MOM_input @@ -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 @@ -437,13 +432,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. diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_input b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_input index 07e9999e79..071d8d609b 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_input +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_input @@ -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 @@ -437,13 +432,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. diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_input b/ice_ocean_SIS2/SIS2_cgrid/MOM_input index 4ffe0a76df..82d7af77ce 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_input +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_input @@ -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 @@ -437,13 +432,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. diff --git a/ice_ocean_SIS2/SIS2_icebergs/MOM_input b/ice_ocean_SIS2/SIS2_icebergs/MOM_input index c121dff905..1cf6fd7464 100644 --- a/ice_ocean_SIS2/SIS2_icebergs/MOM_input +++ b/ice_ocean_SIS2/SIS2_icebergs/MOM_input @@ -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 @@ -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. diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_input b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_input index 72f0a6d124..a9a9bca161 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_input +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_input @@ -95,11 +95,6 @@ DT_THERM = 3600.0 ! [s] default = 1200.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. 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 @@ -490,13 +485,6 @@ FOX_KEMPER_ML_RESTRAT_COEF = 10.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 = "vgrid_75_2m.nc" ! default = "" - ! The file that specifies the vertical grid for - ! depth-space diagnostics, or blank to disable - ! depth-space output. -!NK_ZSPACE (from file) = 35 ! [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. diff --git a/ocean_only/CVmix_SCM_tests/common_BML/MOM_input b/ocean_only/CVmix_SCM_tests/common_BML/MOM_input index 6613061f50..f05e8c179b 100644 --- a/ocean_only/CVmix_SCM_tests/common_BML/MOM_input +++ b/ocean_only/CVmix_SCM_tests/common_BML/MOM_input @@ -66,10 +66,6 @@ DT = 1200.0 ! [s] ! is actually used will be an integer fraction of the ! forcing time-step (DT_FORCING in ocean-only mode or the ! coupling timestep in coupled mode.) -Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" - ! The file that specifies the vertical grid for - ! depth-space diagnostics, or blank to disable - ! depth-space output. C_P = 3992.10322329649 ! [J kg-1 K-1] default = 3991.86795711963 ! The heat capacity of sea water, approximated as a ! constant. This is only used if ENABLE_THERMODYNAMICS is diff --git a/ocean_only/CVmix_SCM_tests/common_EPBL/MOM_input b/ocean_only/CVmix_SCM_tests/common_EPBL/MOM_input index 70375d5977..6e9397ecb2 100644 --- a/ocean_only/CVmix_SCM_tests/common_EPBL/MOM_input +++ b/ocean_only/CVmix_SCM_tests/common_EPBL/MOM_input @@ -65,11 +65,6 @@ DT = 1200.0 ! [s] ! is actually used will be an integer fraction of the ! forcing time-step (DT_FORCING in ocean-only mode or the ! coupling timestep in coupled mode.) -Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" - ! The file that specifies the vertical grid for - ! depth-space diagnostics, or blank to disable - ! depth-space output. - C_P = 3992.10322329649 ! [J kg-1 K-1] default = 3991.86795711963 ! The heat capacity of sea water, approximated as a ! constant. This is only used if ENABLE_THERMODYNAMICS is diff --git a/ocean_only/CVmix_SCM_tests/common_KPP/MOM_input b/ocean_only/CVmix_SCM_tests/common_KPP/MOM_input index 54d85fe392..e96efe5b32 100644 --- a/ocean_only/CVmix_SCM_tests/common_KPP/MOM_input +++ b/ocean_only/CVmix_SCM_tests/common_KPP/MOM_input @@ -65,11 +65,6 @@ DT = 1200.0 ! [s] ! is actually used will be an integer fraction of the ! forcing time-step (DT_FORCING in ocean-only mode or the ! coupling timestep in coupled mode.) -Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" - ! The file that specifies the vertical grid for - ! depth-space diagnostics, or blank to disable - ! depth-space output. - C_P = 3992.10322329649 ! [J kg-1 K-1] default = 3991.86795711963 ! The heat capacity of sea water, approximated as a ! constant. This is only used if ENABLE_THERMODYNAMICS is diff --git a/ocean_only/MESO_025_23L/MOM_input b/ocean_only/MESO_025_23L/MOM_input index e0a6045d73..08b2d11a8b 100644 --- a/ocean_only/MESO_025_23L/MOM_input +++ b/ocean_only/MESO_025_23L/MOM_input @@ -220,15 +220,6 @@ SAVE_INITIAL_CONDS = True ! If defined, the inital conditions are ! new run. 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 = "OM3_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 diff --git a/ocean_only/MESO_025_63L/MOM_input b/ocean_only/MESO_025_63L/MOM_input index 049068eeda..a39033cd2e 100644 --- a/ocean_only/MESO_025_63L/MOM_input +++ b/ocean_only/MESO_025_63L/MOM_input @@ -79,11 +79,6 @@ DT_THERM = 3600.0 ! [s] default = 600.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 @@ -402,13 +397,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) = -1 ! [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. diff --git a/ocean_only/SCM_idealized_hurricane/MOM_input b/ocean_only/SCM_idealized_hurricane/MOM_input index 19d5465595..ea1f4bff61 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_input +++ b/ocean_only/SCM_idealized_hurricane/MOM_input @@ -73,11 +73,6 @@ DT = 1200.0 ! [s] ! is actually used will be an integer fraction of the ! forcing time-step (DT_FORCING in ocean-only mode or the ! coupling timestep in coupled mode.) -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 diff --git a/ocean_only/global/MOM_input b/ocean_only/global/MOM_input index 8cab52f584..528b99d7ce 100644 --- a/ocean_only/global/MOM_input +++ b/ocean_only/global/MOM_input @@ -81,11 +81,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 @@ -437,13 +432,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. diff --git a/ocean_only/global_ALE/common/MOM_input b/ocean_only/global_ALE/common/MOM_input index da49f18050..d4be236860 100644 --- a/ocean_only/global_ALE/common/MOM_input +++ b/ocean_only/global_ALE/common/MOM_input @@ -83,11 +83,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 @@ -436,13 +431,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 = "analysis_vgrid_lev35.v1.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. diff --git a/ocean_only/global_ALE/common/diag_table b/ocean_only/global_ALE/common/diag_table index bbb0e380f4..16d968b69c 100644 --- a/ocean_only/global_ALE/common/diag_table +++ b/ocean_only/global_ALE/common/diag_table @@ -4,7 +4,6 @@ "layer", 1,"days",1,"days","Time", "prog", 1,"days",1,"days","Time", "prog_z", 1,"days",1,"days","Time", -"prog_zold",1,"days",1,"days","Time", "ave_prog", 1,"days",1,"days","Time", "tracer", 1,"days",1,"days","Time", "cont", 1,"days",1,"days","Time", @@ -78,9 +77,6 @@ "ocean_model_z","temp","temp","prog_z","all",.true.,"none",2 "ocean_model_z","temp_xyave","temp_xyave","prog_z","all",.true.,"none",2 "ocean_model_z","salt","salt","prog_z","all",.true.,"none",2 -"ocean_model_zold","temp","temp","prog_zold","all",.true.,"none",2 -"ocean_model_zold","salt","salt","prog_zold","all",.true.,"none",2 -"ocean_model_zold","temp_xyave","temp_xyave","prog_zold","all",.true.,"none",2 # Auxilary Tracers: #================== diff --git a/ocean_only/nonBous_global/MOM_input b/ocean_only/nonBous_global/MOM_input index 3d3db8a1ee..dd2e18cd2d 100644 --- a/ocean_only/nonBous_global/MOM_input +++ b/ocean_only/nonBous_global/MOM_input @@ -87,11 +87,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 @@ -440,13 +435,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. diff --git a/ocean_only/single_column/BML/MOM_input b/ocean_only/single_column/BML/MOM_input index 5c0ebcfab7..75109d4932 100644 --- a/ocean_only/single_column/BML/MOM_input +++ b/ocean_only/single_column/BML/MOM_input @@ -68,11 +68,6 @@ DT = 3600.0 ! [s] ! is actually used will be an integer fraction of the ! forcing time-step (DT_FORCING in ocean-only mode or the ! coupling timestep in coupled mode.) -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 @@ -258,13 +253,6 @@ BBL_THICK_MIN = 0.1 ! [m] default = 0.0 ! === module MOM_thickness_diffuse === ! === module MOM_mixed_layer_restrat === -Z_OUTPUT_GRID_FILE = "../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. diff --git a/ocean_only/single_column/EPBL/MOM_input b/ocean_only/single_column/EPBL/MOM_input index 1ed37cbc9b..9eb92f22c2 100644 --- a/ocean_only/single_column/EPBL/MOM_input +++ b/ocean_only/single_column/EPBL/MOM_input @@ -77,11 +77,6 @@ DT = 3600.0 ! [s] ! is actually used will be an integer fraction of the ! forcing time-step (DT_FORCING in ocean-only mode or the ! coupling timestep in coupled mode.) -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 @@ -295,13 +290,6 @@ BBL_THICK_MIN = 0.1 ! [m] default = 0.0 ! === module MOM_thickness_diffuse === ! === module MOM_mixed_layer_restrat === -Z_OUTPUT_GRID_FILE = "../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. diff --git a/ocean_only/single_column/KPP/MOM_input b/ocean_only/single_column/KPP/MOM_input index 18032ea9f5..795f2188b6 100644 --- a/ocean_only/single_column/KPP/MOM_input +++ b/ocean_only/single_column/KPP/MOM_input @@ -77,11 +77,6 @@ DT = 3600.0 ! [s] ! is actually used will be an integer fraction of the ! forcing time-step (DT_FORCING in ocean-only mode or the ! coupling timestep in coupled mode.) -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 @@ -295,13 +290,6 @@ BBL_THICK_MIN = 0.1 ! [m] default = 0.0 ! === module MOM_thickness_diffuse === ! === module MOM_mixed_layer_restrat === -Z_OUTPUT_GRID_FILE = "../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. diff --git a/ocean_only/tides_025/MOM_input b/ocean_only/tides_025/MOM_input index 2b0611b8c8..d5f0e356bd 100644 --- a/ocean_only/tides_025/MOM_input +++ b/ocean_only/tides_025/MOM_input @@ -366,8 +366,6 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! === module MOM_mixed_layer_restrat === -! === module MOM_diag_to_Z === - ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. diff --git a/ocean_only/unit_tests/MOM_input b/ocean_only/unit_tests/MOM_input index 8d4d61bcb9..36ceaf43b9 100644 --- a/ocean_only/unit_tests/MOM_input +++ b/ocean_only/unit_tests/MOM_input @@ -189,8 +189,6 @@ HMIX_FIXED = 1.0 ! [m] ! === module MOM_mixed_layer_restrat === -! === module MOM_diag_to_Z === - ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes.