Skip to content

Commit

Permalink
Changed string lengths used in ALE documentation
Browse files Browse the repository at this point in the history
- We had been using explicit lengths for fixed strings (", parameter")
  which was unnecessary and had to be updated whenever the string was
  changed. Switched to "character(len=*), parameter :: " for flexibility.
- Updates MOM_parameter_doc.* following commit 12c5838.
  • Loading branch information
adcroft committed Apr 19, 2017
1 parent 12c5838 commit 1e69aa1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions src/ALE/MOM_regridding.F90
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,18 @@ module MOM_regridding
public get_zlike_CS, get_sigma_CS, get_rho_CS

!> Documentation for coordinate options
character(len=322), parameter, public :: regriddingCoordinateModeDoc = &
character(len=*), parameter, public :: regriddingCoordinateModeDoc = &
" LAYER - Isopycnal or stacked shallow water layers\n"//&
" ZSTAR, Z* - stetched geopotential z*\n"//&
" SIGMA_SHELF_ZSTAR - stetched geopotential z* ignoring shelf\n"//&
" SIGMA - terrain following coordinates\n"//&
" RHO - continuous isopycnal\n"//&
" HYCOM1 - HyCOM-like hybrid coordinate\n"//&
" SLIGHT - stretched coordinates above continuous isopycnal\n"//&
" ADAPTIVE - optimise for smooth neutral density surfaces"
" ADAPTIVE - optimize for smooth neutral density surfaces"

! Documentation for regridding interpolation schemes
character(len=338), parameter, public :: regriddingInterpSchemeDoc = &
character(len=*), parameter, public :: regriddingInterpSchemeDoc = &
" P1M_H2 (2nd-order accurate)\n"//&
" P1M_H4 (2nd-order accurate)\n"//&
" P1M_IH4 (2nd-order accurate)\n"//&
Expand All @@ -151,7 +151,7 @@ module MOM_regridding
" P3M_IH6IH5 (4th-order accurate)\n"//&
" PQM_IH4IH3 (4th-order accurate)\n"//&
" PQM_IH6IH5 (5th-order accurate)"
character(len=6), parameter, public :: regriddingDefaultInterpScheme = "P1M_H2"
character(len=*), parameter, public :: regriddingDefaultInterpScheme = "P1M_H2"
logical, parameter, public :: regriddingDefaultBoundaryExtrapolation = .false.
real, parameter, public :: regriddingDefaultMinThickness = 1.e-3

Expand Down Expand Up @@ -539,7 +539,7 @@ subroutine initialize_regridding(CS, GV, max_depth, param_file, mod, coord_mode,
"Coefficient of buoyancy diffusivity.", &
units="nondim", default=0.8)
call get_param(param_file, mod, "ADAPT_ALPHA", adaptAlpha, &
"Scaling on optimisation tendency.", &
"Scaling on optimization tendency.", &
units="nondim", default=1.0)
call get_param(param_file, mod, "ADAPT_DO_MIN_DEPTH", tmpLogical, &
"If true, make a HyCOM-like mixed layer by preventing interfaces\n"//&
Expand Down
22 changes: 11 additions & 11 deletions src/ALE/regrid_consts.F90
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ module regrid_consts
!! lightest water, isopycnal below
integer, parameter :: REGRIDDING_ADAPTIVE = 9

character(len=6), parameter :: REGRIDDING_LAYER_STRING = "LAYER" !< Layer string
character(len=6), parameter :: REGRIDDING_ZSTAR_STRING_OLD = "Z*" !< z* string (legacy name)
character(len=6), parameter :: REGRIDDING_ZSTAR_STRING = "ZSTAR" !< z* string
character(len=6), parameter :: REGRIDDING_RHO_STRING = "RHO" !< Rho string
character(len=6), parameter :: REGRIDDING_SIGMA_STRING = "SIGMA" !< Sigma string
character(len=6), parameter :: REGRIDDING_ARBITRARY_STRING = "ARB" !< Arbitrary coordinates
character(len=6), parameter :: REGRIDDING_HYCOM1_STRING = "HYCOM1" !< Hycom string
character(len=6), parameter :: REGRIDDING_SLIGHT_STRING = "SLIGHT" !< Hybrid S-rho string
character(len=17), parameter :: REGRIDDING_SIGMA_SHELF_ZSTAR_STRING = "SIGMA_SHELF_ZSTAR" !< Hybrid z*/sigma
character(len=8), parameter :: REGRIDDING_ADAPTIVE_STRING = "ADAPTIVE"
character(len=6), parameter :: DEFAULT_COORDINATE_MODE = REGRIDDING_LAYER_STRING !< Default coordinate mode
character(len=*), parameter :: REGRIDDING_LAYER_STRING = "LAYER" !< Layer string
character(len=*), parameter :: REGRIDDING_ZSTAR_STRING_OLD = "Z*" !< z* string (legacy name)
character(len=*), parameter :: REGRIDDING_ZSTAR_STRING = "ZSTAR" !< z* string
character(len=*), parameter :: REGRIDDING_RHO_STRING = "RHO" !< Rho string
character(len=*), parameter :: REGRIDDING_SIGMA_STRING = "SIGMA" !< Sigma string
character(len=*), parameter :: REGRIDDING_ARBITRARY_STRING = "ARB" !< Arbitrary coordinates
character(len=*), parameter :: REGRIDDING_HYCOM1_STRING = "HYCOM1" !< Hycom string
character(len=*), parameter :: REGRIDDING_SLIGHT_STRING = "SLIGHT" !< Hybrid S-rho string
character(len=*), parameter :: REGRIDDING_SIGMA_SHELF_ZSTAR_STRING = "SIGMA_SHELF_ZSTAR" !< Hybrid z*/sigma
character(len=*), parameter :: REGRIDDING_ADAPTIVE_STRING = "ADAPTIVE"
character(len=*), parameter :: DEFAULT_COORDINATE_MODE = REGRIDDING_LAYER_STRING !< Default coordinate mode

integer, dimension(REGRIDDING_NUM_TYPES), parameter :: vertical_coords = &
(/ REGRIDDING_LAYER, REGRIDDING_ZSTAR /)
Expand Down

0 comments on commit 1e69aa1

Please sign in to comment.