/[MITgcm]/MITgcm/model/inc/PARAMS.h

Diff of /MITgcm/model/inc/PARAMS.h

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.167 by baylor,
Thu Sep 22 14:00:59 2005 UTC
+revision 1.215 by jmc,
Sat Apr  5 18:02:35 2008 UTC
 Line 36 
 C     UNSET_xxx :: Used to indicate vari
        PARAMETER ( UNSET_FLOAT8 = 1.234567D5 )
        Real*4 UNSET_FLOAT4
        PARAMETER ( UNSET_FLOAT4 = 1.234567E5 )
        _RL    UNSET_RL
        PARAMETER ( UNSET_RL     = 1.234567D5 )
        _RS    UNSET_RS
        PARAMETER ( UNSET_RS     = 1.234567E5 )
        INTEGER UNSET_I
        PARAMETER ( UNSET_I      = 123456789  )
- C     Checkpoint data
-       INTEGER maxNoChkptLev
-       PARAMETER ( maxNoChkptLev = 2 )
  C--   COMMON /PARM_C/ Character valued parameters used by the model.
- C     checkPtSuff :: List of checkpoint file suffices
+ C     buoyancyRelation :: Flag used to indicate which relation to use to
+ C                         get buoyancy.
+ C     eosType         :: choose the equation of state:
+ C                        LINEAR, POLY3, UNESCO, JMD95Z, JMD95P, MDJWF, IDEALGAS
+ C     pickupSuff      :: force to start from pickup files (even if nIter0=0)
+ C                        and read pickup files with this suffix (max 10 Char.)
+ C     mdsioLocalDir   :: read-write tiled file from/to this directory name
+ C                        (+ 4 digits Processor-Rank) instead of current dir.
+ C     tRefFile      :: File containing reference Potential Temperat.  tRef (1.D)
+ C     sRefFile      :: File containing reference salinity/spec.humid. sRef (1.D)
+ C     rhoRefFile    :: File containing reference density profile rhoRef (1.D)
+ C     delRFile      :: File containing vertical grid spacing delR  (1.D array)
+ C     delRcFile     :: File containing vertical grid spacing delRc (1.D array)
  C     delXFile      :: File containing X-spacing grid definition (1.D array)
  C     delYFile      :: File containing Y-spacing grid definition (1.D array)
  C     horizGridFile :: File containing horizontal-grid definition
  C                        (only when using curvilinear_grid)
- C     bathyFile   :: File containing bathymetry. If not defined bathymetry
+ C     bathyFile       :: File containing bathymetry. If not defined bathymetry
- C                   is taken from inline function.
+ C                        is taken from inline function.
- C     topoFile    :: File containing the topography of the surface (unit=m)
+ C     topoFile        :: File containing the topography of the surface (unit=m)
- C                   (mainly used for the atmosphere = ground height).
+ C                        (mainly used for the atmosphere = ground height).
- C     hydrogThetaFile :: File containing initial hydrographic data for potential
+ C     shelfIceFile    :: File containing the topography of the shelfice draught
- C                       temperature.
+ C                        (unit=m)
- C     hydrogSaltFile  :: File containing initial hydrographic data for salinity.
+ C     hydrogThetaFile :: File containing initial hydrographic data (3-D)
+ C                        for potential temperature.
+ C     hydrogSaltFile  :: File containing initial hydrographic data (3-D)
+ C                        for salinity.
+ C     diffKrFile      :: File containing 3D specification of vertical diffusivity
  C     zonalWindFile   :: File containing zonal wind data
  C     meridWindFile   :: File containing meridional wind data
- C     thetaClimFile   :: File containing theta climataology used
+ C     thetaClimFile   :: File containing surface theta climataology used
  C                       in relaxation term -lambda(theta-theta*)
- C     saltClimFile    :: File containing salt climataology used
+ C     saltClimFile    :: File containing surface salt climataology used
  C                       in relaxation term -lambda(salt-salt*)
  C     surfQfile       :: File containing surface heat flux, excluding SW
  C                        (old version, kept for backward compatibility)
-Line 72 
 C     surfQnetFile    :: File containing
+Line 84 
 C     surfQnetFile    :: File containing
  C     surfQswFile     :: File containing surface shortwave radiation
  C     dQdTfile        :: File containing thermal relaxation coefficient
  C     EmPmRfile       :: File containing surface fresh water flux
+ C           NOTE: for backward compatibility EmPmRfile is specified in
+ C                 m/s when using external_fields_load.F.  It is converted
+ C                 to kg/m2/s by multiplying by rhoConstFresh.
  C     saltFluxFile    :: File containing surface salt flux
  C     pLoadFile       :: File containing pressure loading
  C     eddyTauxFile    :: File containing zonal Eddy stress data
  C     eddyTauyFile    :: File containing meridional Eddy stress data
- C     buoyancyRelation :: Flag used to indicate which relation to use to
- C                        get buoyancy.
- C     eosType         :: choose the equation of state:
- C                        LINEAR, POLY3, UNESCO, JMD95Z, JMD95P, MDJWF, IDEALGAS
  C     the_run_name    :: string identifying the name of the model "run"
-       COMMON /PARM_C/ checkPtSuff,
+       COMMON /PARM_C/
+      &                buoyancyRelation, eosType,
+      &                pickupSuff, mdsioLocalDir,
+      &                tRefFile, sRefFile, rhoRefFile,
+      &                delRFile, delRcFile,
       &                delXFile, delYFile, horizGridFile,
-      &                bathyFile, topoFile,
+      &                bathyFile, topoFile, shelfIceFile,
-      &                hydrogThetaFile, hydrogSaltFile,
+      &                hydrogThetaFile, hydrogSaltFile, diffKrFile,
       &                zonalWindFile, meridWindFile, thetaClimFile,
-      &                saltClimFile, buoyancyRelation,
+      &                saltClimFile,
       &                EmPmRfile, saltFluxFile,
       &                surfQfile, surfQnetFile, surfQswFile,
       &                lambdaThetaFile, lambdaSaltFile,
       &                uVelInitFile, vVelInitFile, pSurfInitFile,
       &                dQdTfile, ploadFile,
       &                eddyTauxFile, eddyTauyFile,
-      &                eosType, pickupSuff,
-      &                mdsioLocalDir,
       &                the_run_name
-       CHARACTER*(5) checkPtSuff(maxNoChkptLev)
+       CHARACTER*(MAX_LEN_FNAM) buoyancyRelation
+       CHARACTER*(6)  eosType
+       CHARACTER*(10) pickupSuff
+       CHARACTER*(MAX_LEN_FNAM) mdsioLocalDir
+       CHARACTER*(MAX_LEN_FNAM) tRefFile
+       CHARACTER*(MAX_LEN_FNAM) sRefFile
+       CHARACTER*(MAX_LEN_FNAM) rhoRefFile
+       CHARACTER*(MAX_LEN_FNAM) delRFile
+       CHARACTER*(MAX_LEN_FNAM) delRcFile
        CHARACTER*(MAX_LEN_FNAM) delXFile
        CHARACTER*(MAX_LEN_FNAM) delYFile
        CHARACTER*(MAX_LEN_FNAM) horizGridFile
-       CHARACTER*(MAX_LEN_FNAM) bathyFile, topoFile
+       CHARACTER*(MAX_LEN_FNAM) bathyFile, topoFile, shelfIceFile
-       CHARACTER*(MAX_LEN_FNAM) hydrogThetaFile
+       CHARACTER*(MAX_LEN_FNAM) hydrogThetaFile, hydrogSaltFile
-       CHARACTER*(MAX_LEN_FNAM) hydrogSaltFile
+       CHARACTER*(MAX_LEN_FNAM) diffKrFile
        CHARACTER*(MAX_LEN_FNAM) zonalWindFile
        CHARACTER*(MAX_LEN_FNAM) meridWindFile
        CHARACTER*(MAX_LEN_FNAM) thetaClimFile
-Line 112 
 C     the_run_name    :: string identify
+Line 133 
 C     the_run_name    :: string identify
        CHARACTER*(MAX_LEN_FNAM) surfQswFile
        CHARACTER*(MAX_LEN_FNAM) EmPmRfile
        CHARACTER*(MAX_LEN_FNAM) saltFluxFile
-       CHARACTER*(MAX_LEN_FNAM) buoyancyRelation
        CHARACTER*(MAX_LEN_FNAM) uVelInitFile
        CHARACTER*(MAX_LEN_FNAM) vVelInitFile
        CHARACTER*(MAX_LEN_FNAM) pSurfInitFile
-Line 122 
 C     the_run_name    :: string identify
+Line 142 
 C     the_run_name    :: string identify
        CHARACTER*(MAX_LEN_FNAM) eddyTauyFile
        CHARACTER*(MAX_LEN_FNAM) lambdaThetaFile
        CHARACTER*(MAX_LEN_FNAM) lambdaSaltFile
-       CHARACTER*(MAX_LEN_FNAM) mdsioLocalDir
+       CHARACTER*(MAX_LEN_PREC/2) the_run_name
-       CHARACTER*(MAX_LEN_FNAM) the_run_name
-       CHARACTER*(6) eosType
-       CHARACTER*(10) pickupSuff
  C--   COMMON /PARM_I/ Integer valued parameters used by the model.
  C     cg2dMaxIters        :: Maximum number of iterations in the
-Line 140 
 C     cg3dChkResFreq      :: Frequency w
+Line 157 
 C     cg3dChkResFreq      :: Frequency w
  C                           in con. grad solver.
  C     nIter0              :: Start time-step number of for this run
  C     nTimeSteps          :: Number of timesteps to execute
- C     numStepsPerPickup   :: For offline setup. Frequency of pickup
- C                           of flow fields.
  C     writeStatePrec      :: Precision used for writing model state.
  C     writeBinaryPrec     :: Precision used for writing binary files
  C     readBinaryPrec      :: Precision used for reading binary files
- C     nCheckLev           :: Holds current checkpoint level
  C     nonlinFreeSurf      :: option related to non-linear free surface
  C                           =0 Linear free surface ; >0 Non-linear
  C     select_rStar        :: option related to r* vertical coordinate
  C                           =0 (default) use r coord. ; > 0 use r*
+ C     momForcingOutAB     :: =1: take momentum forcing contribution
+ C                           out of (=0: in) Adams-Bashforth time stepping.
+ C     tracForcingOutAB    :: =1: take tracer (Temp,Salt,pTracers) forcing contribution
+ C                           out of (=0: in) Adams-Bashforth time stepping.
  C     tempAdvScheme       :: Temp. Horiz.Advection scheme selector
  C     tempVertAdvScheme   :: Temp. Vert. Advection scheme selector
  C     saltAdvScheme       :: Salt. Horiz.advection scheme selector
  C     saltVertAdvScheme   :: Salt. Vert. Advection scheme selector
+ C     selectKEscheme      :: Kinetic Energy scheme selector (Vector Inv.)
+ C     selectVortScheme    :: Scheme selector for Vorticity term (Vector Inv.)
+ C     monitorSelect       :: select group of variables to monitor
+ C                            =1 : dynvars ; =2 : + vort ; =3 : + surface
  C     debugLevel          :: debug level selector: higher -> more writing
        COMMON /PARM_I/
-Line 162 
 C     debugLevel          :: debug level
+Line 184 
 C     debugLevel          :: debug level
       &        cg3dMaxIters,
       &        cg3dChkResFreq,
       &        nIter0, nTimeSteps, nEndIter,
-      &        numStepsPerPickup,
+      &        writeStatePrec,
-      &        writeStatePrec, nCheckLev,
       &        writeBinaryPrec, readBinaryPrec,
       &        nonlinFreeSurf, select_rStar,
+      &        momForcingOutAB, tracForcingOutAB,
       &        tempAdvScheme, tempVertAdvScheme,
       &        saltAdvScheme, saltVertAdvScheme,
-      &        debugLevel
+      &        selectKEscheme, selectVortScheme,
+      &        monitorSelect, debugLevel
        INTEGER cg2dMaxIters
        INTEGER cg2dChkResFreq
        INTEGER cg2dPreCondFreq
-Line 177 
 C     debugLevel          :: debug level
+Line 200 
 C     debugLevel          :: debug level
        INTEGER nIter0
        INTEGER nTimeSteps
        INTEGER nEndIter
-       INTEGER numStepsPerPickup
        INTEGER writeStatePrec
        INTEGER writeBinaryPrec
        INTEGER readBinaryPrec
-       INTEGER nCheckLev
        INTEGER nonlinFreeSurf
        INTEGER select_rStar
+       INTEGER momForcingOutAB, tracForcingOutAB
        INTEGER tempAdvScheme, tempVertAdvScheme
        INTEGER saltAdvScheme, saltVertAdvScheme
+       INTEGER selectKEscheme
+       INTEGER selectVortScheme
+       INTEGER monitorSelect
        INTEGER debugLevel
  C
-Line 197 
 C
+Line 222 
 C
        PARAMETER(debLevB=2)
  C--   COMMON /PARM_L/ Logical valued parameters used by the model.
+ C- Coordinate + Grid params:
+ C     fluidIsAir       :: Set to indicate that the fluid major constituent
+ C                        is air
+ C     fluidIsWater     :: Set to indicate that the fluid major constituent
+ C                        is water
+ C     usingPCoords     :: Set to indicate that we are working in a pressure
+ C                        type coordinate (p or p*).
+ C     usingZCoords     :: Set to indicate that we are working in a height
+ C                        type coordinate (z or z*)
+ C     useDynP_inEos_Zc :: use the dynamical pressure in EOS (with Z-coord.)
+ C                         this requires specific code for restart & exchange
  C     usingCartesianGrid :: If TRUE grid generation will be in a cartesian
  C                          coordinate frame.
  C     usingSphericalPolarGrid :: If TRUE grid generation will be in a
  C                               spherical polar frame.
+ C     rotateGrid      :: rotate grid coordinates to geographical coordinates
+ C                        according to Euler angles phiEuler, thetaEuler, psiEuler
+ C     usingCurvilinearGrid :: If TRUE, use a curvilinear grid (to be provided)
  C     usingCylindricalGrid :: If TRUE grid generation will be Cylindrical
- C     no_slip_sides :: Impose "no-slip" at lateral boundaries.
+ C     deepAtmosphere :: deep model (drop the shallow-atmosphere approximation)
+ C     setInterFDr    :: set Interface depth (put cell-Center at the middle)
+ C     setCenterDr    :: set cell-Center depth (put Interface at the middle)
+ C- Momentum params:
+ C     no_slip_sides  :: Impose "no-slip" at lateral boundaries.
  C     no_slip_bottom :: Impose "no-slip" at bottom boundary.
- C     staggerTimeStep :: enable a Stagger time stepping T,S Rho then U,V
+ C     useFullLeith   :: Set to true to use full Leith viscosity(may be unstable
+ C                       on irregular grids)
+ C     useStrainTensionVisc:: Set to true to use Strain-Tension viscous terms
+ C     useAreaViscLength :: Set to true to use old scaling for viscous lengths,
+ C                          e.g., L2=Raz.  May be preferable for cube sphere.
  C     momViscosity  :: Flag which turns momentum friction terms on and off.
  C     momAdvection  :: Flag which turns advection of momentum on and off.
  C     momForcing    :: Flag which turns external forcing of momentum on
- C                     and off.
+ C                      and off.
  C     momPressureForcing :: Flag which turns pressure term in momentum equation
  C                          on and off.
  C     metricTerms   :: Flag which turns metric terms on or off.
- C     usingSphericalPolarMTerms :: If TRUE use spherical polar metric terms.
+ C     useNHMTerms   :: If TRUE use non-hydrostatic metric terms.
- C     useNHMTerms :: If TRUE use non-hydrostatic metric terms.
  C     useCoriolis   :: Flag which turns the coriolis terms on and off.
- C     tempAdvection :: Flag which turns advection of temperature on
+ C     use3dCoriolis :: Turns the 3-D coriolis terms (in Omega.cos Phi) on - off
- C                     and off.
- C     tempForcing   :: Flag which turns external forcing of temperature on
- C                     and off.
- C     saltAdvection :: Flag which turns advection of salinity on
- C                     and off.
- C     saltForcing   :: Flag which turns external forcing of salinity on
- C                     and off.
- C     useRealFreshWaterFlux :: if True (=Natural BCS), treats P+R-E flux
- C                         as a real Fresh Water (=> changes the Sea Level)
- C                         if F, converts P+R-E to salt flux (no SL effect)
- C     useFullLeith   :: Set to true to use full Leith viscosity(may be unstable
- C                       on irregular grids)
- C     useAreaViscLength :: Set to true to use old scaling for viscous
- C              lengths, e.g., L2=Raz.  May be preferable for cube sphere.
- C     useStrainTensionVisc:: Set to true to use Strain-Tension viscous terms
- C     rigidLid            :: Set to true to use rigid lid
- C     implicitFreeSurface :: Set to true to use implcit free surface
- C     exactConserv        :: Set to true to conserve exactly the total Volume
- C     uniformLin_PhiSurf  :: Set to true to use a uniform Bo_surf in the
- C                           linear relation Phi_surf = Bo_surf*eta
- C     momStepping   :: Turns momentum equation time-stepping off
- C     tempStepping  :: Turns temperature equation time-stepping off
- C     saltStepping  :: Turns salinity equation time-stepping off
  C     useConstantF  :: Coriolis parameter set to f0
  C     useBetaPlaneF :: Coriolis parameter set to f0 + beta.y
  C     useSphereF    :: Coriolis parameter set to 2.omega.sin(phi)
  C     useCDscheme   :: use CD-scheme to calculate Coriolis terms.
- C     useJamartWetPoints :: Use wet-point method for Coriolis (Jamart and Ozer, 1986)
+ C     vectorInvariantMomentum :: use Vector-Invariant form (mom_vecinv package)
+ C                                (default = F = use mom_fluxform package)
+ C     useJamartWetPoints :: Use wet-point method for Coriolis (Jamart & Ozer 1986)
  C     useJamartMomAdv :: Use wet-point method for V.I. non-linear term
- C     SadournyCoriolis :: use the enstrophy conserving scheme by Sadourny
  C     upwindVorticity :: bias interpolation of vorticity in the Coriolis term
  C     highOrderVorticity :: use 3rd/4th order interp. of vorticity (V.I., advection)
- C     upwindShear        :: use 1rst order upwind interp. (V.I., vertical advection)
  C     useAbsVorticity :: work with f+zeta in Coriolis terms
+ C     upwindShear        :: use 1rst order upwind interp. (V.I., vertical advection)
+ C     momStepping    :: Turns momentum equation time-stepping off
+ C- Temp. & Salt params:
+ C     tempStepping   :: Turns temperature equation time-stepping off
+ C     saltStepping   :: Turns salinity equation time-stepping off
+ C     tempAdvection  :: Flag which turns advection of temperature on and off.
+ C     tempIsActiveTr :: Pot.Temp. is a dynamically active tracer
+ C     tempForcing    :: Flag which turns external forcing of temperature on
+ C                       and off.
+ C     saltAdvection  :: Flag which turns advection of salinity on and off.
+ C     saltIsActiveTr :: Salinity  is a dynamically active tracer
+ C     saltForcing    :: Flag which turns external forcing of salinity on
+ C                       and off.
+ C     useRealFreshWaterFlux :: if True (=Natural BCS), treats P+R-E flux
+ C                         as a real Fresh Water (=> changes the Sea Level)
+ C                         if F, converts P+R-E to salt flux (no SL effect)
+ C- Time-stepping params:
+ C     rigidLid            :: Set to true to use rigid lid
+ C     implicitFreeSurface :: Set to true to use implicit free surface
+ C     exactConserv        :: Set to true to conserve exactly the total Volume
+ C     linFSConserveTr     :: Set to true to correct source/sink of tracer
+ C                            at the surface due to Linear Free Surface
+ C     uniformLin_PhiSurf  :: Set to true to use a uniform Bo_surf in the
+ C                            linear relation Phi_surf = Bo_surf*eta
+ C     quasiHydrostatic :: Using non-hydrostatic terms in hydrostatic algorithm
+ C     nonHydrostatic   :: Using non-hydrostatic algorithm
+ C     use3Dsolver      :: set to true to use 3-D pressure solver
+ C     implicitIntGravWave :: treat Internal Gravity Wave implicitly
+ C     staggerTimeStep   :: enable a Stagger time stepping U,V (& W) then T,S
  C     implicitDiffusion :: Turns implicit vertical diffusion on
  C     implicitViscosity :: Turns implicit vertical viscosity on
  C     tempImplVertAdv :: Turns on implicit vertical advection for Temperature
-Line 257 
 C     saltImplVertAdv :: Turns on implic
+Line 309 
 C     saltImplVertAdv :: Turns on implic
  C     momImplVertAdv  :: Turns on implicit vertical advection for Momentum
  C     multiDimAdvection :: Flag that enable multi-dimension advection
  C     useMultiDimAdvec  :: True if multi-dim advection is used at least once
- C     forcing_In_AB :: if False, put forcing (Temp,Salt,Tracers) contribution
+ C     momDissip_In_AB   :: if False, put Dissipation tendency contribution
- C                      out off Adams-Bashforth time stepping.
+ C                          out off Adams-Bashforth time stepping.
- C     startFromPickupAB2 :: with AB-3 code, start from an AB-2 pickup
+ C     doAB_onGtGs       :: if the Adams-Bashforth time stepping is used, always
+ C                          apply AB on tracer tendencies (rather than on Tracer)
+ C- Other forcing params -
+ C     balanceEmPmR    :: substract global mean of EmPmR at every time step
+ C     balanceQnet     :: substract global mean of Qnet at every time step
+ C     balancePrintMean:: print substracted global means to STDOUT
  C     doThetaClimRelax :: Set true if relaxation to temperature
  C                        climatology is required.
  C     doSaltClimRelax  :: Set true if relaxation to salinity
  C                        climatology is required.
+ C     allowFreezing  :: Allows surface water to freeze and form ice
+ C     useOldFreezing :: use the old version (before checkpoint52a_pre, 2003-11-12)
  C     periodicExternalForcing :: Set true if forcing is time-dependant
- C     usingPCoords     :: Set to indicate that we are working in a pressure
+ C- I/O parameters -
- C                        type coordinate (p or p*).
- C     usingZCoords     :: Set to indicate that we are working in a height
- C                        type coordinate (z or z*)
- C     fluidIsAir       :: Set to indicate that the fluid major constituent
- C                        is air
- C     fluidIsWater     :: Set to indicate that the fluid major constituent
- C                        is water
- C     useDynP_inEos_Zc :: use the dynamical pressure in EOS (with Z-coord.)
- C                         this requires specific code for restart & exchange
- C     setCenterDr    :: set cell Center depth and put Interface at the middle
- C     nonHydrostatic :: Using non-hydrostatic terms
- C     quasiHydrostatic :: Using non-hydrostatic terms in hydrostatic algorithm
  C     globalFiles    :: Selects between "global" and "tiled" files
  C     useSingleCpuIO :: On SGI platforms, option globalFiles is either
  C                       slow (f77) or does not work (f90).  When
  C                       useSingleCpuIO is set, mdsio_writefield.F
  C                       outputs from master mpi process only.
- C     allowFreezing  :: Allows surface water to freeze and form ice
+ C     pickupStrictlyMatch :: check and stop if pickup-file do not stricly match
- C     useOldFreezing :: use the old version (before checkpoint52a_pre, 2003-11-12)
+ C     startFromPickupAB2 :: with AB-3 code, start from an AB-2 pickup
+ C     usePickupBeforeC54 :: start from old-pickup files, generated with code from
+ C                           before checkpoint-54a, Jul 06, 2004.
  C     pickup_write_mdsio :: use mdsio to write pickups
  C     pickup_read_mdsio  :: use mdsio to read  pickups
  C     pickup_write_immed :: echo the pickup immediately (for conversion)
+ C     writePickupAtEnd   :: write pickup at the last timestep
  C     timeave_mdsio      :: use mdsio for timeave output
  C     snapshot_mdsio     :: use mdsio for "snapshot" (dumpfreq/diagfreq) output
  C     monitor_stdio      :: use stdio for monitor output
- C     calendarDumps :: When set, approximate months (30-31 days) and years (360-372 days)
+ C     dumpInitAndLast :: dumps model state to files at Initial (nIter0)
- C                      for parameters chkPtFreq, pChkPtFreq, taveFreq, SEAICE_taveFreq,
- C                      KPP_taveFreq, and freq in pkg/diagnostics are converted to exact
- C                      calendar months and years.  Requires pkg/cal.
- C     dumpInitAndLast :: dumps model state to files at Initial (nIter0)
  C                        & Last iteration, in addition multiple of dumpFreq iter.
-       COMMON /PARM_L/ usingCartesianGrid, usingSphericalPolarGrid,
+       COMMON /PARM_L/
+      & fluidIsAir, fluidIsWater,
+      & usingPCoords, usingZCoords, useDynP_inEos_Zc,
+      & usingCartesianGrid, usingSphericalPolarGrid, rotateGrid,
       & usingCurvilinearGrid, usingCylindricalGrid,
-      & no_slip_sides,no_slip_bottom,
+      & deepAtmosphere, setInterFDr, setCenterDr,
-      & staggerTimeStep,
+      & no_slip_sides, no_slip_bottom,
-      & momViscosity, momAdvection, momForcing, useCoriolis,
+      & useFullLeith, useStrainTensionVisc, useAreaViscLength,
-      & momPressureForcing, vectorInvariantMomentum,
+      & momViscosity, momAdvection, momForcing,
-      & tempAdvection, tempForcing,
+      & momPressureForcing, metricTerms, useNHMTerms,
-      & saltAdvection, saltForcing,
+      & useCoriolis, use3dCoriolis,
-      & useRealFreshWaterFlux,
-      & useFullLeith, useStrainTensionVisc,
-      & useAreaViscLength,
-      & rigidLid, implicitFreeSurface, exactConserv, uniformLin_PhiSurf,
-      & momStepping, tempStepping, saltStepping,
-      & metricTerms, usingSphericalPolarMTerms, useNHMTerms,
       & useConstantF, useBetaPlaneF, useSphereF,
-      & useCDscheme,
+      & useCDscheme, vectorInvariantMomentum,
       & useEnergyConservingCoriolis, useJamartWetPoints, useJamartMomAdv,
-      & SadournyCoriolis, upwindVorticity, highOrderVorticity,
+      & upwindVorticity, highOrderVorticity,
       & useAbsVorticity, upwindShear,
+      & momStepping, tempStepping, saltStepping,
+      & tempAdvection, tempIsActiveTr, tempForcing,
+      & saltAdvection, saltIsActiveTr, saltForcing,
+      & useRealFreshWaterFlux,
+      & rigidLid, implicitFreeSurface, exactConserv, linFSConserveTr,
+      & uniformLin_PhiSurf,
+      & quasiHydrostatic, nonHydrostatic,
+      & use3Dsolver, implicitIntGravWave, staggerTimeStep,
       & implicitDiffusion, implicitViscosity,
       & tempImplVertAdv, saltImplVertAdv, momImplVertAdv,
-      & multiDimAdvection, useMultiDimAdvec, forcing_In_AB,
+      & multiDimAdvection, useMultiDimAdvec,
-      & doThetaClimRelax, doSaltClimRelax, doTr1ClimRelax,
+      & momDissip_In_AB, doAB_onGtGs,
-      & periodicExternalForcing,
+      & balanceEmPmR, balanceQnet, balancePrintMean,
-      & fluidIsAir, fluidIsWater,
+      & doThetaClimRelax, doSaltClimRelax,
-      & usingPCoords, usingZCoords, useDynP_inEos_Zc, setCenterDr,
-      & nonHydrostatic, quasiHydrostatic, globalFiles, useSingleCpuIO,
       & allowFreezing, useOldFreezing,
-      & usePickupBeforeC35, usePickupBeforeC54, startFromPickupAB2,
+      & periodicExternalForcing,
+      & globalFiles, useSingleCpuIO,
+      & pickupStrictlyMatch, usePickupBeforeC54, startFromPickupAB2,
       & pickup_read_mdsio, pickup_write_mdsio, pickup_write_immed,
+      & writePickupAtEnd,
       & timeave_mdsio, snapshot_mdsio, monitor_stdio,
       & outputTypesInclusive, dumpInitAndLast, debugMode,
-      & inAdMode, inAdTrue, inAdFalse, inAdExact,
+      & inAdMode, inAdTrue, inAdFalse, inAdExact
-      & calendarDumps
+       LOGICAL fluidIsAir
+       LOGICAL fluidIsWater
+       LOGICAL usingPCoords
+       LOGICAL usingZCoords
+       LOGICAL useDynP_inEos_Zc
        LOGICAL usingCartesianGrid
-       LOGICAL usingSphericalPolarGrid
+       LOGICAL usingSphericalPolarGrid, rotateGrid
        LOGICAL usingCylindricalGrid
        LOGICAL usingCurvilinearGrid
-       LOGICAL usingSphericalPolarMTerms
+       LOGICAL deepAtmosphere
+       LOGICAL setInterFDr
+       LOGICAL setCenterDr
        LOGICAL useNHMTerms
        LOGICAL no_slip_sides
        LOGICAL no_slip_bottom
-       LOGICAL staggerTimeStep
        LOGICAL momViscosity
        LOGICAL momAdvection
        LOGICAL momForcing
-Line 358 
 C                        & Last iteratio
+Line 416 
 C                        & Last iteratio
        LOGICAL rigidLid
        LOGICAL implicitFreeSurface
        LOGICAL exactConserv
+       LOGICAL linFSConserveTr
        LOGICAL uniformLin_PhiSurf
+       LOGICAL quasiHydrostatic
+       LOGICAL nonHydrostatic
+       LOGICAL use3Dsolver
+       LOGICAL implicitIntGravWave
+       LOGICAL staggerTimeStep
        LOGICAL momStepping
        LOGICAL tempStepping
        LOGICAL saltStepping
-Line 366 
 C                        & Last iteratio
+Line 430 
 C                        & Last iteratio
        LOGICAL useConstantF
        LOGICAL useBetaPlaneF
        LOGICAL useSphereF
+       LOGICAL use3dCoriolis
        LOGICAL useCDscheme
        LOGICAL useEnergyConservingCoriolis
        LOGICAL useJamartWetPoints
        LOGICAL useJamartMomAdv
-       LOGICAL SadournyCoriolis
        LOGICAL upwindVorticity
        LOGICAL highOrderVorticity
        LOGICAL useAbsVorticity
        LOGICAL upwindShear
        LOGICAL implicitDiffusion
        LOGICAL implicitViscosity
        LOGICAL tempImplVertAdv
        LOGICAL saltImplVertAdv
        LOGICAL momImplVertAdv
        LOGICAL multiDimAdvection
        LOGICAL useMultiDimAdvec
-       LOGICAL forcing_In_AB
+       LOGICAL momDissip_In_AB
+       LOGICAL doAB_onGtGs
+       LOGICAL balanceEmPmR
+       LOGICAL balanceQnet
+       LOGICAL balancePrintMean
        LOGICAL doThetaClimRelax
        LOGICAL doSaltClimRelax
-       LOGICAL doTr1ClimRelax
+       LOGICAL allowFreezing
+       LOGICAL useOldFreezing
        LOGICAL periodicExternalForcing
-       LOGICAL fluidIsAir
-       LOGICAL fluidIsWater
-       LOGICAL usingPCoords
-       LOGICAL usingZCoords
-       LOGICAL useDynP_inEos_Zc
-       LOGICAL setCenterDr
-       LOGICAL nonHydrostatic
-       LOGICAL quasiHydrostatic
        LOGICAL globalFiles
        LOGICAL useSingleCpuIO
-       LOGICAL allowFreezing
+       LOGICAL pickupStrictlyMatch
-       LOGICAL useOldFreezing
-       LOGICAL usePickupBeforeC35
        LOGICAL usePickupBeforeC54
        LOGICAL startFromPickupAB2
-       LOGICAL dumpInitAndLast
-       LOGICAL debugMode
        LOGICAL pickup_read_mdsio, pickup_write_mdsio
-       LOGICAL pickup_write_immed
+       LOGICAL pickup_write_immed, writePickupAtEnd
        LOGICAL timeave_mdsio, snapshot_mdsio, monitor_stdio
        LOGICAL outputTypesInclusive
+       LOGICAL dumpInitAndLast
+       LOGICAL debugMode
        LOGICAL inAdMode, inAdTrue, inAdFalse, inAdExact
-       LOGICAL calendarDumps
  C--   COMMON /PARM_R/ "Real" valued parameters used by the model.
  C     cg2dTargetResidual
-Line 440 
 C     gravity   :: Accel. due to gravity
+Line 498 
 C     gravity   :: Accel. due to gravity
  C     recip_gravity and its inverse
  C     gBaro     :: Accel. due to gravity used in barotropic equation ( m/s^2 )
  C     rhoNil    :: Reference density for the linear equation of state
  C     rhoConst  :: Vertically constant reference density
+ C     rhoFacC   :: normalized (by rhoConst) reference density at cell-Center
+ C     rhoFacF   :: normalized (by rhoConst) reference density at cell-interFace
  C     rhoConstFresh :: Constant reference density for fresh water (rain)
  C     tRef      :: reference vertical profile for potential temperature
  C     sRef      :: reference vertical profile for salinity/specific humidity
+ C     phiRef    :: reference potential (pressure/rho, geopotential) profile
+ C     dBdrRef   :: vertical gradient of reference boyancy  [(m/s/r)^2)]:
+ C               :: z-coord: = N^2_ref = Brunt-Vaissala frequency [s^-2]
+ C               :: p-coord: = -(d.alpha/dp)_ref          [(m^2.s/kg)^2]
+ C     rVel2wUnit :: units conversion factor (Non-Hydrostatic code),
+ C                :: from r-coordinate vertical velocity to vertical velocity [m/s].
+ C                :: z-coord: = 1 ; p-coord: wSpeed [m/s] = rVel [Pa/s] * rVel2wUnit
+ C     wUnit2rVel :: units conversion factor (Non-Hydrostatic code),
+ C                :: from vertical velocity [m/s] to r-coordinate vertical velocity.
+ C                :: z-coord: = 1 ; p-coord: rVel [Pa/s] = wSpeed [m/s] * wUnit2rVel
+ C     mass2rUnit :: units conversion factor (surface forcing),
+ C                :: from mass per unit area [kg/m2] to vertical r-coordinate unit.
+ C                :: z-coord: = 1/rhoConst ( [kg/m2] / rho = [m] ) ;
+ C                :: p-coord: = gravity    ( [kg/m2] *  g = [Pa] ) ;
+ C     rUnit2mass :: units conversion factor (surface forcing),
+ C                :: from vertical r-coordinate unit to mass per unit area [kg/m2].
+ C                :: z-coord: = rhoConst  ( [m] * rho = [kg/m2] ) ;
+ C                :: p-coord: = 1/gravity ( [Pa] /  g = [kg/m2] ) ;
  C     phiMin    :: Latitude of southern most cell face.
  C     thetaMin  :: Longitude of western most cell face (this
  C                 is an "inert" parameter but it is included
  C                 to make geographical references simple.)
  C     rSphere   :: Radius of sphere for a spherical polar grid ( m ).
- C     recip_RSphere  :: Reciprocal radius of sphere ( m ).
+ C     recip_rSphere  :: Reciprocal radius of sphere ( m ).
  C     f0        :: Reference coriolis parameter ( 1/s )
  C                 ( Southern edge f for beta plane )
  C     beta      :: df/dy ( s^-1.m^-1 )
  C     omega     :: Angular velocity ( rad/s )
  C     rotationPeriod :: Rotation period (s) (= 2.pi/omega)
+ C     viscAr    :: Eddy viscosity coeff. for mixing of
+ C                 momentum vertically ( units of r^2/s )
  C     viscAh    :: Eddy viscosity coeff. for mixing of
  C                 momentum laterally ( m^2/s )
  C     viscAhW   :: Eddy viscosity coeff. for mixing of vertical
  C                 momentum laterally, no effect for hydrostatic
  C                 model, defaults to viscAh if unset ( m^2/s )
- C     viscAr    :: Eddy viscosity coeff. for mixing of
+ C                 Not used if variable horiz. viscosity is used.
- C                 momentum vertically ( units of r^2/s )
  C     viscA4    :: Biharmonic viscosity coeff. for mixing of
  C                 momentum laterally ( m^4/s )
  C     viscA4W   :: Biharmonic viscosity coeff. for mixing of vertical
  C                 momentum laterally, no effect for hydrostatic
  C                 model, defaults to viscA4 if unset ( m^2/s )
+ C                 Not used if variable horiz. viscosity is used.
  C     viscAhD   :: Eddy viscosity coeff. for mixing of momentum laterally
  C                  (act on Divergence part) ( m^2/s )
  C     viscAhZ   :: Eddy viscosity coeff. for mixing of momentum laterally
-Line 475 
 C     viscA4D   :: Biharmonic viscosity
+Line 555 
 C     viscA4D   :: Biharmonic viscosity
  C                  (act on Divergence part) ( m^4/s )
  C     viscA4Z   :: Biharmonic viscosity coeff. for mixing of momentum laterally
  C                  (act on Vorticity  part) ( m^4/s )
- C     viscC2leith :: Leith non-dimensional viscosity factor (grad(vort))
+ C     viscC2leith  :: Leith non-dimensional viscosity factor (grad(vort))
  C     viscC2leithD :: Modified Leith non-dimensional visc. factor (grad(div))
- C     viscC2smag  :: Smagorinsky non-dimensional viscosity factor (harmonic)
+ C     viscC4leith  :: Leith non-dimensional viscosity factor (grad(vort))
- C     viscC4smag  :: Smagorinsky non-dimensional viscosity factor (biharmonic)
+ C     viscC4leithD :: Modified Leith non-dimensional viscosity factor (grad(div))
- C     viscAhMax :: Maximum eddy viscosity coeff. for mixing of
+ C     viscC2smag   :: Smagorinsky non-dimensional viscosity factor (harmonic)
- C                   momentum laterally ( m^2/s )
+ C     viscC4smag   :: Smagorinsky non-dimensional viscosity factor (biharmonic)
- C     viscAhReMax :: Maximum gridscale Reynolds number for eddy viscosity
+ C     viscAhMax    :: Maximum eddy viscosity coeff. for mixing of
- C                   coeff. for mixing of momentum laterally (non-dim)
+ C                    momentum laterally ( m^2/s )
+ C     viscAhReMax  :: Maximum gridscale Reynolds number for eddy viscosity
+ C                     coeff. for mixing of momentum laterally (non-dim)
+ C     viscAhGrid   :: non-dimensional grid-size dependent viscosity
  C     viscAhGridMax:: maximum and minimum harmonic viscosity coefficients ...
  C     viscAhGridMin::  in terms of non-dimensional grid-size dependent visc.
- C     viscA4Max :: Maximum biharmonic viscosity coeff. for mixing of
+ C     viscA4Max    :: Maximum biharmonic viscosity coeff. for mixing of
- C                 momentum laterally ( m^4/s )
+ C                     momentum laterally ( m^4/s )
- C     viscA4ReMax :: Maximum Gridscale Reynolds number for
+ C     viscA4ReMax  :: Maximum Gridscale Reynolds number for
- C                  biharmonic viscosity coeff. momentum laterally (non-dim)
+ C                     biharmonic viscosity coeff. momentum laterally (non-dim)
- C     viscAhGrid:: non-dimensional grid-size dependent viscosity
+ C     viscA4Grid   :: non-dimensional grid-size dependent bi-harmonic viscosity
- C     viscA4Grid:: non-dimensional grid-size dependent bi-harmonic viscosity
  C     viscA4GridMax:: maximum and minimum biharmonic viscosity coefficients ...
  C     viscA4GridMin::  in terms of non-dimensional grid-size dependent viscosity
- C     viscC4leith :: Leith non-dimensional viscosity factor (grad(vort))
- C     viscC4leithD :: Modified Leith non-dimensional viscosity factor (grad(div))
  C     diffKhT   :: Laplacian diffusion coeff. for mixing of
  C                 heat laterally ( m^2/s )
  C     diffKrNrT :: vertical profile of Laplacian diffusion coeff.
  C                 for mixing of heat vertically ( units of r^2/s )
  C     diffK4T   :: Biharmonic diffusion coeff. for mixing of
  C                 heat laterally ( m^4/s )
  C     diffKhS  ::  Laplacian diffusion coeff. for mixing of
  C                 salt laterally ( m^2/s )
  C     diffKrNrS :: vertical profile of Laplacian diffusion coeff.
  C                 for mixing of salt vertically ( units of r^2/s ),
  C     diffK4S   :: Biharmonic diffusion coeff. for mixing of
  C                 salt laterally ( m^4/s )
  C     diffKrBL79surf :: T/S surface diffusivity (m^2/s) Bryan and Lewis, 1979
  C     diffKrBL79deep :: T/S deep diffusivity (m^2/s) Bryan and Lewis, 1979
  C     diffKrBL79scl  :: depth scale for arctan fn (m) Bryan and Lewis, 1979
  C     diffKrBL79Ho   :: depth offset for arctan fn (m) Bryan and Lewis, 1979
+ C     BL79LatVary    :: polarwise of this latitude diffKrBL79 is applied with
+ C                       gradual transition to diffKrBLEQ towards Equator
+ C     diffKrBLEQsurf :: same as diffKrBL79surf but at Equator
+ C     diffKrBLEQdeep :: same as diffKrBL79deep but at Equator
+ C     diffKrBLEQscl  :: same as diffKrBL79scl but at Equator
+ C     diffKrBLEQHo   :: same as diffKrBL79Ho but at Equator
  C     deltaT    :: Default timestep ( s )
  C     deltaTClock  :: Timestep used as model "clock". This determines the
  C                    IO frequencies and is used in tagging output. It can
-Line 557 
 C     mtFacMom      :: Metric terms trac
+Line 643 
 C     mtFacMom      :: Metric terms trac
  C     cosPower      :: Power of cosine of latitude to multiply viscosity
  C     cAdjFreq      :: Frequency of convective adjustment
  C
  C     taveFreq      :: Frequency with which time-averaged model state
  C                      is written to post-processing files ( s ).
  C     tave_lastIter :: (for state variable only) fraction of the last time
  C                      step (of each taveFreq period) put in the time average.
  C                      (fraction for 1rst iter = 1 - tave_lastIter)
  C     tauThetaClimRelax :: Relaxation to climatology time scale ( s ).
  C     tauSaltClimRelax :: Relaxation to climatology time scale ( s ).
-Line 572 
 C                          (note: extern
+Line 658 
 C                          (note: extern
  C                           number times externForcingPeriod)
  C     convertFW2Salt :: salinity, used to convert Fresh-Water Flux to Salt Flux
  C                       (use model surface (local) value if set to -1)
  C     temp_EvPrRn :: temperature of Rain & Evap.
  C     salt_EvPrRn :: salinity of Rain & Evap.
  C        (notes: a) tracer content of Rain/Evap only used if both
  C                     NonLin_FrSurf & useRealFreshWater are set.
  C                b) use model surface (local) value if set to UNSET_RL)
- C     horiVertRatio      :: Ratio on units in vertical to units in horizontal.
+ C     hMixCrit    :: criteria for mixed-layer diagnostic
- C     recip_horiVertRatio  ( 1 if horiz in m and vertical in m ).
+ C     ivdc_kappa  :: implicit vertical diffusivity for convection [m^2/s]
- C                          ( g*rho if horiz in m and vertical in Pa ).
+ C     Ro_SeaLevel :: standard position of Sea-Level in "R" coordinate, used as
- C     Ro_SeaLevel        :: standard position of Sea-Level in "R" coordinate, used as
+ C                    starting value (k=1) for vertical coordinate (rf(1)=Ro_SeaLevel)
- C                          starting value (k=1) for vertical coordinate (rf(1)=Ro_SeaLevel)
+ C     sideDragFactor     :: side-drag scaling factor (used only if no_slip_sides)
- C     bottomDragLinear   :: Drag coefficient built in to core dynamics
+ C                           (default=2: full drag ; =1: gives half-slip BC)
- C      --"-"--  Quadratic  ( linear: 1/s, quadratic: 1/m )
+ C     bottomDragLinear    :: Linear    bottom-drag coefficient (units of [r]/s)
-       COMMON /PARM_R/ cg2dTargetResidual, cg2dTargetResWunit,
+ C     bottomDragQuadratic :: Quadratic bottom-drag coefficient (units of [r]/m)
+ C               (if using zcoordinate, units becomes linear: m/s, quadratic: [-])
+ C     smoothAbsFuncRange :: 1/2 of interval around zero, for which FORTRAN ABS
+ C                           is to be replace by a smoother function
+ C                           (affects myabs, mymin, mymax)
+ C     nh_Am2        :: scales the non-hydrostatic terms and changes internal scales
+ C                      (i.e. allows convection at different Rayleigh numbers)
+ C     phiEuler      :: Euler angle, rotation about original z-axis
+ C     thetaEuler    :: Euler angle, rotation about new x-axis
+ C     psiEuler      :: Euler angle, rotation about new z-axis
+       COMMON /PARM_R/ cg2dTargetResidual, cg2dTargetResWunit,
       & cg2dpcOffDFac, cg3dTargetResidual,
       & delR, delRc, delX, delY,
       & deltaT, deltaTmom, dTtracerLev, deltaTfreesurf, deltaTClock,
-Line 595 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 691 
 C      --"-"--  Quadratic  ( linear: 1/s
       & viscC2leith, viscC2leithD,
       & viscC2smag, viscC4smag,
       & viscAhD, viscAhZ, viscA4D, viscA4Z,
-      & viscA4, viscA4W,
+      & viscA4, viscA4W, viscA4Max,
-      & viscA4Max, viscA4Grid, viscA4GridMax, viscA4GridMin,
+      & viscA4Grid, viscA4GridMax, viscA4GridMin,
-      & viscAhRemax, viscA4Remax,
+      & viscAhReMax, viscA4ReMax,
       & viscC4leith, viscC4leithD, viscAr,
       & diffKhT, diffK4T, diffKrNrT,
       & diffKhS, diffK4S, diffKrNrS,
       & diffKrBL79surf, diffKrBL79deep, diffKrBL79scl, diffKrBL79Ho,
+      & BL79LatVary,
+      & diffKrBLEQsurf, diffKrBLEQdeep, diffKrBLEQscl, diffKrBLEQHo,
       & delT, tauCD, rCD, freeSurfFac, implicSurfPress, implicDiv2Dflow,
       & hFacMin, hFacMinDz, hFacInf, hFacSup,
-      & gravity, recip_Gravity, gBaro, rhonil, recip_rhonil,
+      & gravity, recip_gravity, gBaro,
-      & recip_rhoConst, rhoConst,
+      & rhonil, recip_rhonil, rhoConst, recip_rhoConst,
-      & rhoConstFresh, convertEmP2rUnit, tRef, sRef,
+      & rhoFacC, recip_rhoFacC, rhoFacF, recip_rhoFacF,
-      & baseTime, startTime, endTime,
+      & rhoConstFresh, tRef, sRef, phiRef, dBdrRef,
-      & chkPtFreq, pchkPtFreq, dumpFreq, adjDumpFreq,
+      & rVel2wUnit, wUnit2rVel, mass2rUnit, rUnit2mass,
+      & baseTime, startTime, endTime,
+      & chkPtFreq, pChkPtFreq, dumpFreq, adjDumpFreq,
       & diagFreq, taveFreq, tave_lastIter, monitorFreq, adjMonitorFreq,
       & afFacMom, vfFacMom, pfFacMom, cfFacMom, foFacMom, mtFacMom,
       & cosPower, cAdjFreq, omega, rotationPeriod,
-      & tauThetaClimRelax,
+      & tauThetaClimRelax, tauSaltClimRelax, latBandClimRelax,
-      & tauSaltClimRelax,
-      & tauTr1ClimRelax, lambdaTr1ClimRelax, latBandClimRelax,
       & externForcingCycle, externForcingPeriod,
       & convertFW2Salt, temp_EvPrRn, salt_EvPrRn,
       & hFacMinDr, hFacMinDp,
-      & horiVertRatio, recip_horiVertRatio,
+      & ivdc_kappa, hMixCriteria, Ro_SeaLevel,
-      & ivdc_kappa, Ro_SeaLevel,
+      & sideDragFactor, bottomDragLinear, bottomDragQuadratic, nh_Am2,
-      & bottomDragLinear,bottomDragQuadratic,nh_Am2,
+      & smoothAbsFuncRange,
-      & tCylIn, tCylOut
+      & tCylIn, tCylOut,
+      & phiEuler, thetaEuler, psiEuler
-       _RL nh_Am2
        _RL cg2dTargetResidual
        _RL cg2dTargetResWunit
        _RL cg3dTargetResidual
-Line 641 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 739 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL phiMin
        _RL thetaMin
        _RL rSphere
-       _RL recip_RSphere
+       _RL recip_rSphere
        _RL f0
        _RL freeSurfFac
        _RL implicSurfPress
-Line 653 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 751 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL hFacInf
        _RL hFacSup
        _RL beta
+       _RL viscAr
        _RL viscAh
        _RL viscAhW
        _RL viscAhD
        _RL viscAhZ
        _RL viscAhMax
        _RL viscAhReMax
-       _RL viscAhGrid
+       _RL viscAhGrid, viscAhGridMax, viscAhGridMin
-       _RL viscAhGridMax
-       _RL viscAhGridMin
        _RL viscC2leith
        _RL viscC2leithD
        _RL viscC2smag
-       _RL viscC4smag
+       _RL viscA4
-       _RL viscAr
-       _RL viscA4
        _RL viscA4W
        _RL viscA4D
        _RL viscA4Z
-Line 676 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 771 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL viscA4Grid, viscA4GridMax, viscA4GridMin
        _RL viscC4leith
        _RL viscC4leithD
-       _RL diffKhT
+       _RL viscC4smag
+       _RL diffKhT
        _RL diffKrNrT(Nr)
        _RL diffK4T
        _RL diffKhS
        _RL diffKrNrS(Nr)
        _RL diffK4S
        _RL diffKrBL79surf
        _RL diffKrBL79deep
        _RL diffKrBL79scl
        _RL diffKrBL79Ho
+       _RL BL79LatVary
+       _RL diffKrBLEQsurf
+       _RL diffKrBLEQdeep
+       _RL diffKrBLEQscl
+       _RL diffKrBLEQHo
        _RL delt
        _RL tauCD
        _RL rCD
        _RL gravity
        _RL recip_gravity
        _RL gBaro
-       _RL rhonil
+       _RL rhonil,        recip_rhonil
-       _RL recip_rhonil
+       _RL rhoConst,      recip_rhoConst
-       _RL rhoConst
+       _RL rhoFacC(Nr),   recip_rhoFacC(Nr)
-       _RL recip_rhoConst
+       _RL rhoFacF(Nr+1), recip_rhoFacF(Nr+1)
        _RL rhoConstFresh
-       _RL convertEmP2rUnit
        _RL tRef(Nr)
        _RL sRef(Nr)
+       _RL phiRef(2*Nr+1)
+       _RL dBdrRef(Nr)
+       _RL rVel2wUnit(Nr+1), wUnit2rVel(Nr+1)
+       _RL mass2rUnit, rUnit2mass
        _RL baseTime
        _RL startTime
        _RL endTime
-Line 717 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 821 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL pfFacMom
        _RL cfFacMom
        _RL foFacMom
-       _RL mTFacMom
+       _RL mtFacMom
        _RL cosPower
        _RL cAdjFreq
        _RL omega
        _RL rotationPeriod
        _RL tauThetaClimRelax
        _RL tauSaltClimRelax
-       _RL tauTr1ClimRelax
-       _RL lambdaTr1ClimRelax
        _RL latBandClimRelax
        _RL externForcingCycle
        _RL externForcingPeriod
        _RL convertFW2Salt
        _RL temp_EvPrRn
        _RL salt_EvPrRn
-       _RL horiVertRatio
-       _RL recip_horiVertRatio
        _RL ivdc_kappa
+       _RL hMixCriteria
        _RL Ro_SeaLevel
+       _RL sideDragFactor
        _RL bottomDragLinear
        _RL bottomDragQuadratic
+       _RL smoothAbsFuncRange
+       _RL nh_Am2
        _RL tCylIn
        _RL tCylOut
+       _RL phiEuler, thetaEuler, psiEuler
  C--   COMMON /PARM_A/ Thermodynamics constants ?
        COMMON /PARM_A/ HeatCapacity_Cp,recip_Cp
-Line 755 
 C     atm_kappa :: kappa = R/Cp (R: cons
+Line 860 
 C     atm_kappa :: kappa = R/Cp (R: cons
  C     atm_Rq    :: water vapour specific volume anomaly relative to dry air
  C                  (e.g. typical value = (29/18 -1) 10^-3 with q [g/kg])
  C     integr_GeoPot :: option to select the way we integrate the geopotential
  C                     (still a subject of discussions ...)
  C     selectFindRoSurf :: select the way surf. ref. pressure (=Ro_surf) is
  C             derived from the orography. Implemented: 0,1 (see INI_P_GROUND)
        COMMON /PARM_ATM/
       &            celsius2K,
       &            atm_Cp, atm_Rd, atm_kappa, atm_Rq, atm_Po,
       &            integr_GeoPot, selectFindRoSurf
-Line 772 
 C Logical flags for selecting packages
+Line 877 
 C Logical flags for selecting packages
        LOGICAL useMY82
        LOGICAL useGGL90
        LOGICAL useKPP
+       LOGICAL useGAD
        LOGICAL useGMRedi
        LOGICAL useOBCS
        LOGICAL useAIM
        LOGICAL useLand
+       LOGICAL useCAL
+       LOGICAL useEXF
+       LOGICAL useEBM
        LOGICAL useGrdchk
        LOGICAL useECCO
        LOGICAL useSHAP_FILT
-Line 783 
 C Logical flags for selecting packages
+Line 892 
 C Logical flags for selecting packages
        LOGICAL useFLT
        LOGICAL usePTRACERS
        LOGICAL useGCHEM
+       LOGICAL useRBCS
+       LOGICAL useOffLine
+       LOGICAL useMATRIX
        LOGICAL useSBO
        LOGICAL useSEAICE
-       LOGICAL useBulkForce
+       LOGICAL useShelfIce
        LOGICAL useThSIce
+       LOGICAL useATM2d
+       LOGICAL useBulkForce
        LOGICAL usefizhi
        LOGICAL usegridalt
-       LOGICAL usediagnostics
+       LOGICAL useDiagnostics
-       LOGICAL useEBM
        LOGICAL useMNC
-       LOGICAL useMATRIX
+       LOGICAL useREGRID
        LOGICAL useRunClock
+       LOGICAL useEMBED_FILES
+       LOGICAL useMYPACKAGE
+       LOGICAL useSALT_PLUME
        COMMON /PARM_PACKAGES/
-      &        useKPP, useGMRedi, useOBCS, useAIM, useLand, useECCO,
+      &        useOPPS, usePP81, useMY82, useGGL90, useKPP,
-      &        useSHAP_FILT, useZONAL_FILT, useGrdchk, useFLT,
+      &        useGAD, useGMRedi, useOBCS, useAIM, useLand,
-      &        usePTRACERS, useGCHEM,
+      &        useCAL, useEXF, useEBM, useGrdchk, useECCO,
-      &        useSBO, useSEAICE, useThSIce, useBulkForce,
+      &        useSHAP_FILT, useZONAL_FILT, useFLT,
-      &        usefizhi, usegridalt, usediagnostics, useEBM, useMNC,
+      &        usePTRACERS, useGCHEM, useRBCS, useOffLine, useMATRIX,
-      &        usePP81, useMY82, useOPPS, useGGL90, useMATRIX,
+      &        useSBO, useSEAICE, useShelfIce,
-      &        useRunClock
+      &        useThSIce, useATM2D, useBulkForce,
+      &        usefizhi, usegridalt, useDiagnostics, useMNC, useREGRID,
+      &        useRunClock, useEMBED_FILES, useMYPACKAGE, useSALT_PLUME
  CEH3 ;;; Local Variables: ***
  CEH3 ;;; mode:fortran ***

 Legend:



Removed from v.1.167
 


changed lines


 
Added in v.1.215
 Legend:



Removed from v.1.167
 


changed lines


 
Added in v.1.215
-Removed from v.1.167
+Added in v.1.215

	ViewVC Help
Powered by ViewVC 1.1.22