Skip to content

Commit

Permalink
OM4_05: Enabled rho-space diagnostics
Browse files Browse the repository at this point in the history 
- In 474b575, I enabled rho-space diagnostics for OM4_025
  but OM4_05 uses the same diag_tables (with in the FRE xml)
  so Om4_05 should have been updated at the same time.
- Also removed redundant DIAG_MISVAL from OM4_025 MOM_input.
- Closes mom-ocean#154 for OM4_05.
  • Loading branch information
@adcroft
adcroft committed Sep 22, 2017
1 parent 62bb9e6 commit b557cef
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 5 deletions.
2 changes: 0 additions & 2 deletions ice_ocean_SIS2/OM4_025/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,6 @@ DIAG_COORDS = "z Z ZSTAR,rho2 RHO2 RHO" ! default = "z Z ZSTAR"
! A list of string tuples associating diag_table modules to
! a coordinate definition used for diagnostics. Each string
! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME".
DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20
! Set the default missing value to use for diagnostics.
DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09"
! Determines how to specify the coordinate
! resolution. Valid options are:
Expand Down
22 changes: 22 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,28 @@ Z_INIT_REMAP_GENERAL = True ! [Boolean] default = False
! If true, allows initialization directly to general coordinates.

! === module MOM_diag_mediator ===
NUM_DIAG_COORDS = 2 ! default = 1
! The number of diagnostic vertical coordinates to use.
! For each coordinate, an entry in DIAG_COORDS must be provided.
DIAG_COORDS = "z Z ZSTAR,rho2 RHO2 RHO" ! default = "z Z ZSTAR"
! A list of string tuples associating diag_table modules to
! a coordinate definition used for diagnostics. Each string
! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME".
DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09"
! Determines how to specify the coordinate
! resolution. Valid options are:
! PARAM - use the vector-parameter DIAG_COORD_RES_Z
! UNIFORM[:N] - uniformly distributed
! FILE:string - read from a file. The string specifies
! the filename and variable name, separated
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
! by a comma or space, for sigma-2 and dz. e.g.
! HYBRID:vgrid.nc,sigma2,dz

! === module MOM_MEKE ===
USE_MEKE = True ! [Boolean] default = False
Expand Down
21 changes: 18 additions & 3 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,13 +639,13 @@ SPONGE = False ! [Boolean] default = False
! specified via SPONGE_CONFIG.

! === module MOM_diag_mediator ===
NUM_DIAG_COORDS = 1 ! default = 1
NUM_DIAG_COORDS = 2 ! default = 1
! The number of diagnostic vertical coordinates to use.
! For each coordinate, an entry in DIAG_COORDS must be provided.
DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR"
DIAG_COORDS = "z Z ZSTAR", "rho2 RHO2 RHO" !
! A list of string tuples associating diag_table modules to
! a coordinate definition used for diagnostics. Each string
! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME".
! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME".
DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20
! Set the default missing value to use for diagnostics.
AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000"
Expand All @@ -666,6 +666,21 @@ DIAG_COORD_DEF_Z = "WOA09" ! default = "WOA09"
! the filename and two variable names, separated
! by a comma or space, for sigma-2 and dz. e.g.
! HYBRID:vgrid.nc,sigma2,dz
DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09"
! Determines how to specify the coordinate
! resolution. Valid options are:
! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2
! UNIFORM[:N] - uniformly distributed
! FILE:string - read from a file. The string specifies
! the filename and variable name, separated
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
! by a comma or space, for sigma-2 and dz. e.g.
! HYBRID:vgrid.nc,sigma2,dz

! === module MOM_MEKE ===
USE_MEKE = True ! [Boolean] default = False
Expand Down
22 changes: 22 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,28 @@ Z_INIT_REMAP_GENERAL = True ! [Boolean] default = False
! If true, allows initialization directly to general coordinates.

! === module MOM_diag_mediator ===
NUM_DIAG_COORDS = 2 ! default = 1
! The number of diagnostic vertical coordinates to use.
! For each coordinate, an entry in DIAG_COORDS must be provided.
DIAG_COORDS = "z Z ZSTAR", "rho2 RHO2 RHO" !
! A list of string tuples associating diag_table modules to
! a coordinate definition used for diagnostics. Each string
! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME".
DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09"
! Determines how to specify the coordinate
! resolution. Valid options are:
! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2
! UNIFORM[:N] - uniformly distributed
! FILE:string - read from a file. The string specifies
! the filename and variable name, separated
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
! by a comma or space, for sigma-2 and dz. e.g.
! HYBRID:vgrid.nc,sigma2,dz

! === module MOM_MEKE ===
USE_MEKE = True ! [Boolean] default = False
Expand Down

0 comments on commit b557cef

Please sign in to comment.