/[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.85 by dimitri,
Tue Feb 18 05:33:53 2003 UTC
+revision 1.129 by edhill,
Sun Oct 10 06:08:47 2004 UTC
 Line 1
  C $Header$
  C $Name$
  C
  CBOP
- C    !ROUTINE: PARAMS.h
+ C     !ROUTINE: PARAMS.h
- C    !INTERFACE:
+ C     !INTERFACE:
- C    include PARAMS.h
+ C     #include PARAMS.h
- C    !DESCRIPTION: \bv
- C     *==========================================================*
+ C     !DESCRIPTION:
- C     | PARAMS.h
+ C     Header file defining model "parameters".  The values from the
- C     | o Header file defining model "parameters".
+ C     model standard input file are stored into the variables held
- C     *==========================================================*
+ C     here. Notes describing the parameters can also be found here.
- C     | The values from the model standard input file are
- C     | stored into the variables held here. Notes describing
- C     | the parameters can also be found here.
- C     *==========================================================*
- C     \ev
  CEOP
  C     Macros for special grid options
-Line 65 
 C     thetaClimFile   :: File containing
+Line 62 
 C     thetaClimFile   :: File containing
  C                       in relaxation term -lambda(theta-theta*)
  C     saltClimFile    :: File containing salt climataology used
  C                       in relaxation term -lambda(salt-salt*)
- C     surfQfile       :: File containing surface heat flux
+ C     surfQfile       :: File containing surface heat flux, excluding SW
- C     surfQswfile     :: File containing surface shortwave radiation
+ C                        (old version, kept for backward compatibility)
+ C     surfQnetFile    :: File containing surface net heat flux
+ C     surfQswFile     :: File containing surface shortwave radiation
  C     dQdTfile        :: File containing thermal relaxation coefficient
  C     EmPmRfile       :: File containing surface fresh water flux
  C     pLoadFile       :: File containing pressure loading
  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
+ C                        LINEAR, POLY3, UNESCO, JMD95Z, JMD95P, MDJWF, IDEALGAS
+ C     the_run_name    :: string identifying the name of the model "run"
        COMMON /PARM_C/ checkPtSuff,
       &                bathyFile, topoFile,
       &                hydrogThetaFile, hydrogSaltFile,
       &                zonalWindFile, meridWindFile, thetaClimFile,
       &                saltClimFile, buoyancyRelation,
-      &                EmPmRfile, surfQfile, surfQswfile,
+      &                EmPmRfile, surfQfile, surfQnetFile, surfQswFile,
       &                uVelInitFile, vVelInitFile, pSurfInitFile,
       &                dQdTfile, ploadFile,
-      &                eosType
+      &                eosType, pickupSuff,
+      &                mdsioLocalDir,
+      &                the_run_name
        CHARACTER*(5) checkPtSuff(maxNoChkptLev)
        CHARACTER*(MAX_LEN_FNAM) bathyFile, topoFile
        CHARACTER*(MAX_LEN_FNAM) hydrogThetaFile
-Line 92 
 C                        LINEAR, POLY3,
+Line 94 
 C                        LINEAR, POLY3,
        CHARACTER*(MAX_LEN_FNAM) thetaClimFile
        CHARACTER*(MAX_LEN_FNAM) saltClimFile
        CHARACTER*(MAX_LEN_FNAM) surfQfile
-       CHARACTER*(MAX_LEN_FNAM) surfQswfile
+       CHARACTER*(MAX_LEN_FNAM) surfQnetFile
+       CHARACTER*(MAX_LEN_FNAM) surfQswFile
        CHARACTER*(MAX_LEN_FNAM) EmPmRfile
        CHARACTER*(MAX_LEN_FNAM) buoyancyRelation
        CHARACTER*(MAX_LEN_FNAM) uVelInitFile
-Line 100 
 C                        LINEAR, POLY3,
+Line 103 
 C                        LINEAR, POLY3,
        CHARACTER*(MAX_LEN_FNAM) pSurfInitFile
        CHARACTER*(MAX_LEN_FNAM) dQdTfile
        CHARACTER*(MAX_LEN_FNAM) ploadFile
+       CHARACTER*(MAX_LEN_FNAM) mdsioLocalDir
+       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
  C                           two-dimensional con. grad solver.
  C     cg2dChkResFreq      :: Frequency with which to check residual
  C                           in con. grad solver.
+ C     cg2dPreCondFreq     :: Frequency for updating cg2d preconditioner
+ C                            (non-linear free-surf.)
  C     cg3dMaxIters        :: Maximum number of iterations in the
  C                           three-dimensional con. grad solver.
  C     cg3dChkResFreq      :: Frequency with which to check residual
-Line 123 
 C     nonlinFreeSurf      :: option rela
+Line 131 
 C     nonlinFreeSurf      :: option rela
  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     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     debugLevel          :: debug level selector: higher -> more writing
        COMMON /PARM_I/
       &        cg2dMaxIters,
-      &        cg2dChkResFreq,
+      &        cg2dChkResFreq, cg2dPreCondFreq,
       &        cg3dMaxIters,
       &        cg3dChkResFreq,
       &        nIter0, nTimeSteps, nEndIter,
-Line 134 
 C                           =0 (default)
+Line 147 
 C                           =0 (default)
       &        writeStatePrec, nCheckLev,
       &        writeBinaryPrec, readBinaryPrec,
       &        nonlinFreeSurf, select_rStar,
-      &        tempAdvScheme, saltAdvScheme, tracerAdvScheme
+      &        tempAdvScheme, tempVertAdvScheme,
+      &        saltAdvScheme, saltVertAdvScheme,
+      &        tracerAdvScheme,
+      &        debugLevel
        INTEGER cg2dMaxIters
        INTEGER cg2dChkResFreq
+       INTEGER cg2dPreCondFreq
        INTEGER cg3dMaxIters
        INTEGER cg3dChkResFreq
        INTEGER nIter0
-Line 149 
 C                           =0 (default)
+Line 166 
 C                           =0 (default)
        INTEGER nCheckLev
        INTEGER nonlinFreeSurf
        INTEGER select_rStar
-       INTEGER tempAdvScheme
+       INTEGER tempAdvScheme, tempVertAdvScheme
-       INTEGER saltAdvScheme
+       INTEGER saltAdvScheme, saltVertAdvScheme
        INTEGER tracerAdvScheme
+       INTEGER debugLevel
+ C
+       INTEGER debLevZero
+       PARAMETER(debLevZero=0)
+       INTEGER debLevA
+       PARAMETER(debLevA=1)
+       INTEGER debLevB
+       PARAMETER(debLevB=2)
  C--   COMMON /PARM_L/ Logical valued parameters used by the model.
  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     usingCylindricalGrid :: If TRUE grid generation will be Cylindrical
  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
-Line 194 
 C                           linear relat
+Line 221 
 C                           linear relat
  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     tr1Stepping   :: Turns passive tracer 1 time-stepping on/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     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 in Coriolis
+ C     useAbsVorticity :: work with f+zeta in Coriolis terms
  C     implicitDiffusion :: Turns implicit vertical diffusion on
  C     implicitViscosity :: Turns implicit vertical viscosity on
+ C     tempImplVertAdv :: Turns on implicit vertical advection for Temperature
+ C     saltImplVertAdv :: Turns on implicit vertical advection for Salinity
+ 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                      out off Adams-Bashforth time stepping.
  C     doThetaClimRelax :: Set true if relaxation to temperature
-Line 210 
 C     doSaltClimRelax  :: Set true if re
+Line 246 
 C     doSaltClimRelax  :: Set true if re
  C                        climatology is required.
  C     periodicExternalForcing :: Set true if forcing is time-dependant
  C     usingPCoords     :: Set to indicate that we are working in pressure
- C                        coords.
+ C                        coords. (jmc: is it still used ?)
  C     usingZCoords     :: Set to indicate that we are working in height
- C                        coords.
+ C                        coords. (jmc: is it still used ?)
+ 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
-Line 221 
 C     useSingleCpuIO :: On SGI platforms
+Line 259 
 C     useSingleCpuIO :: On SGI platforms
  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 water to freeze and form ice
+ C     allowFreezing  :: Allows surface water to freeze and form ice
+ C     useOldFreezing :: use the old version (before checkpoint52a_pre, 2003-11-12)
  C     groundAtK1  :: put the surface(k=1) at the Lower Boundary (=ground)
+ 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     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     useMNC           :: overall package run-time flag
+ C     mnc_use_indir    :: use "mnc_indir_str" as input filename prefix
+ C     mnc_use_outdir   :: use "mnc_outdir_str" as output filename prefix
+ C     mnc_outdir_date  :: use a date string within the output dir name
+ C     mnc_echo_gvtypes :: echo type names (fails on many platforms)
+ C     pickup_write_mnc :: use mnc to write pickups
+ C     pickup_read_mnc  :: use mnc to read  pickups
+ C     mon_write_mnc    :: use mnc to write monitor output
        COMMON /PARM_L/ usingCartesianGrid, usingSphericalPolarGrid,
-      & usingCurvilinearGrid,
+      & usingCurvilinearGrid, usingCylindricalGrid,
       & no_slip_sides,no_slip_bottom,
       & staggerTimeStep,
       & momViscosity, momAdvection, momForcing, useCoriolis,
-Line 233 
 C     groundAtK1  :: put the surface(k=1
+Line 286 
 C     groundAtK1  :: put the surface(k=1
       & saltDiffusion, saltAdvection, saltForcing,
       & useRealFreshWaterFlux,
       & rigidLid, implicitFreeSurface, exactConserv, uniformLin_PhiSurf,
-      & momStepping, tempStepping, saltStepping, tr1Stepping,
+      & momStepping, tempStepping, saltStepping,
       & metricTerms, usingSphericalPolarMTerms, useNHMTerms,
       & useConstantF, useBetaPlaneF, useSphereF,
-      & useEnergyConservingCoriolis, useJamartWetPoints,
+      & useCDscheme,
+      & useEnergyConservingCoriolis, useJamartWetPoints, useJamartMomAdv,
+      & SadournyCoriolis, upwindVorticity, highOrderVorticity,
+      & useAbsVorticity,
       & implicitDiffusion, implicitViscosity,
-      & multiDimAdvection, forcing_In_AB,
+      & tempImplVertAdv, saltImplVertAdv, momImplVertAdv,
+      & multiDimAdvection, useMultiDimAdvec, forcing_In_AB,
       & doThetaClimRelax, doSaltClimRelax, doTr1ClimRelax,
       & periodicExternalForcing,
-      & usingPCoords, usingZCoords, setCenterDr,
+      & usingPCoords, usingZCoords, useDynP_inEos_Zc, setCenterDr,
       & nonHydrostatic, quasiHydrostatic, globalFiles, useSingleCpuIO,
-      & allowFreezing, groundAtK1,
+      & allowFreezing, useOldFreezing, groundAtK1,
-      & usePickupBeforeC35, debugMode,
+      & usePickupBeforeC35, usePickupBeforeC54, debugMode,
-      & readPickupWithTracer, writePickupWithTracer
+      & readPickupWithTracer, writePickupWithTracer,
+      &     useMNC,
+      &     mnc_use_indir, mnc_use_outdir, mnc_outdir_date,
+      &     mnc_echo_gvtypes,
+      &     pickup_write_mnc, pickup_read_mnc,
+      &     timeave_mnc, snapshot_mnc, monitor_mnc, autodiff_mnc,
+      & pickup_read_mdsio, pickup_write_mdsio, pickup_write_immed,
+      & timeave_mdsio, snapshot_mdsio, monitor_stdio
        LOGICAL usingCartesianGrid
        LOGICAL usingSphericalPolarGrid
+       LOGICAL usingCylindricalGrid
        LOGICAL usingCurvilinearGrid
        LOGICAL usingSphericalPolarMTerms
        LOGICAL useNHMTerms
-Line 274 
 C     groundAtK1  :: put the surface(k=1
+Line 339 
 C     groundAtK1  :: put the surface(k=1
        LOGICAL momStepping
        LOGICAL tempStepping
        LOGICAL saltStepping
-       LOGICAL tr1Stepping
        LOGICAL metricTerms
        LOGICAL useConstantF
        LOGICAL useBetaPlaneF
        LOGICAL useSphereF
+       LOGICAL useCDscheme
        LOGICAL useEnergyConservingCoriolis
        LOGICAL useJamartWetPoints
+       LOGICAL useJamartMomAdv
+       LOGICAL SadournyCoriolis
+       LOGICAL upwindVorticity
+       LOGICAL highOrderVorticity
+       LOGICAL useAbsVorticity
        LOGICAL implicitDiffusion
        LOGICAL implicitViscosity
+       LOGICAL tempImplVertAdv
+       LOGICAL saltImplVertAdv
+       LOGICAL momImplVertAdv
        LOGICAL multiDimAdvection
+       LOGICAL useMultiDimAdvec
        LOGICAL forcing_In_AB
        LOGICAL doThetaClimRelax
        LOGICAL doSaltClimRelax
-Line 291 
 C     groundAtK1  :: put the surface(k=1
+Line 365 
 C     groundAtK1  :: put the surface(k=1
        LOGICAL periodicExternalForcing
        LOGICAL usingPCoords
        LOGICAL usingZCoords
+       LOGICAL useDynP_inEos_Zc
        LOGICAL setCenterDr
        LOGICAL nonHydrostatic
        LOGICAL quasiHydrostatic
        LOGICAL globalFiles
        LOGICAL useSingleCpuIO
        LOGICAL allowFreezing
+       LOGICAL useOldFreezing
        LOGICAL groundAtK1
        LOGICAL usePickupBeforeC35
+       LOGICAL usePickupBeforeC54
        LOGICAL debugMode
        LOGICAL readPickupWithTracer
        LOGICAL writePickupWithTracer
+       LOGICAL
+      &     useMNC,
+      &     mnc_use_indir, mnc_use_outdir, mnc_outdir_date,
+      &     mnc_echo_gvtypes,
+      &     pickup_write_mnc, pickup_read_mnc,
+      &     timeave_mnc, snapshot_mnc, monitor_mnc, autodiff_mnc
+       LOGICAL pickup_read_mdsio, pickup_write_mdsio
+       LOGICAL pickup_write_immed
+       LOGICAL timeave_mdsio, snapshot_mdsio, monitor_stdio
  C--   COMMON /PARM_R/ "Real" valued parameters used by the model.
- C     gg2dTargetResidual
+ C     cg2dTargetResidual
  C          :: Target residual for cg2d solver; no unit (RHS normalisation)
  C     cg2dTargetResWunit
  C          :: Target residual for cg2d solver; W unit (No RHS normalisation)
-Line 324 
 C           number of iterations for con
+Line 410 
 C           number of iterations for con
  C           drop form 192 -> 134! Need to investigate this further!
  C           For now I have introduced a parameter cg2dpcOffDFac which
  C           defaults to 0.51 but can be set at runtime.
- C     delP      :: Vertical grid spacing ( Pa ).
- C     delZ      :: Vertical grid spacing ( m  ).
  C     delR      :: Vertical grid spacing ( units of r ).
  C     delRc     :: Vertical grid spacing between cell centers (r unit).
  C     delX      :: Separation between cell faces (m) or (deg), depending
-Line 347 
 C     f0        :: Reference coriolis pa
+Line 431 
 C     f0        :: Reference coriolis pa
  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     viscAh    :: Eddy viscosity coeff. for mixing of
  C                 momentum laterally ( m^2/s )
- C     viscAz    :: Eddy viscosity coeff. for mixing of
+ C     viscAhW   :: Eddy viscosity coeff. for mixing of vertical
- C                 momentum vertically ( m^2/s )
+ C                 momentum laterally, no effect for hydrostatic
- C     viscAp    :: Eddy viscosity coeff. for mixing of
+ C                 model, defaults to viscAh if unset ( m^2/s )
- C                 momentum vertically ( Pa^2/s )
  C     viscAr    :: Eddy viscosity coeff. for mixing of
  C                 momentum vertically ( units of r^2/s )
  C     viscA4    :: Biharmonic viscosity coeff. for mixing of
  C                 momentum laterally ( m^4/s )
+ C     viscC2leith :: Leith non-dimensional viscosity factor
+ C     viscAhMax :: Maximum eddy viscosity coeff. for mixing of
+ C                 momentum laterally ( m^2/s )
+ C     viscA4Max :: Maximum biharmonic viscosity coeff. for mixing of
+ C                 momentum laterally ( m^4/s )
+ C     viscAhGrid:: non-dimensional grid-size dependent viscosity
+ C     viscA4Grid:: non-dimensional grid-size dependent bi-harmonic viscosity
+ C     viscC4leith :: Leith non-dimensional viscosity factor
  C     diffKhT   :: Laplacian diffusion coeff. for mixing of
  C                 heat laterally ( m^2/s )
- C     diffKzT   :: Laplacian diffusion coeff. for mixing of
- C                 heat vertically ( m^2/s )
- C     diffKpT   :: Laplacian diffusion coeff. for mixing of
- C                 heat vertically ( Pa^2/s )
  C     diffKrT   :: Laplacian diffusion coeff. for mixing of
  C                 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     diffKzS   :: Laplacian diffusion coeff. for mixing of
- C                 salt vertically ( m^2/s )
- C     diffKpS   :: Laplacian diffusion coeff. for mixing of
- C                 salt vertically ( Pa^2/s )
  C     diffKrS   :: Laplacian diffusion coeff. for mixing of
  C                 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     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 428 
 C     tauThetaClimRelax :: Relaxation to
+Line 516 
 C     tauThetaClimRelax :: Relaxation to
  C     lambdaThetaClimRelax :: Inverse time scale for relaxation ( 1/s ).
  C     tauSaltClimRelax :: Relaxation to climatology time scale ( s ).
  C     lambdaSaltClimRelax :: Inverse time scale for relaxation ( 1/s ).
+ C     latBandClimRelax :: latitude band where Relaxation to Clim. is applied,
+ C                         i.e. where |yC| <= latBandClimRelax
  C     externForcingPeriod :: Is the period of which forcing varies (eg. 1 month)
  C     externForcingCycle :: Is the repeat time of the forcing (eg. 1 year)
  C                          (note: externForcingCycle must be an integer
-Line 449 
 C     bottomDragLinear   :: Drag coeffic
+Line 539 
 C     bottomDragLinear   :: Drag coeffic
  C      --"-"--  Quadratic  ( linear: 1/s, quadratic: 1/m )
        COMMON /PARM_R/ cg2dTargetResidual, cg2dTargetResWunit,
       & cg2dpcOffDFac, cg3dTargetResidual,
-      & delP, delZ, delR, delRc, delX, delY,
+      & delR, delRc, delX, delY,
       & deltaT, deltaTmom, deltaTtracer, deltaTfreesurf, deltaTClock,
       & abeps, startTime,
       & phiMin, thetaMin, rSphere, recip_RSphere, f0, beta,
       & fCori, fCoriG, fCoriCos,
-      & viscAh,  viscAz,  viscA4,  viscAr, viscAstrain, viscAtension,
+      & viscAh, viscAhW, viscAhMax, viscAhGrid, viscC2leith,
-      & diffKhT, diffKzT, diffK4T, diffKrT,
+      & viscA4,  viscA4Max, viscA4Grid, viscC4leith,
-      & diffKhS, diffKzS, diffK4S, diffKrS,
+      & viscAr, viscAstrain, viscAtension,
+      & diffKhT, diffK4T, diffKrT,
+      & diffKhS, diffK4S, diffKrS,
+      & diffKrBL79surf, diffKrBL79deep, diffKrBL79scl, diffKrBL79Ho,
       & delT, tauCD, rCD, freeSurfFac, implicSurfPress, implicDiv2Dflow,
       & hFacMin, hFacMinDz, hFacInf, hFacSup,
       & gravity, recip_Gravity, gBaro, rhonil, recip_rhonil,
       & recip_rhoConst, rhoConst,
       & rhoConstFresh, convertEmP2rUnit, tRef, sRef,
-      & endTime, chkPtFreq, pchkPtFreq, dumpFreq,
+      & endTime, chkPtFreq, pchkPtFreq, dumpFreq, adjDumpFreq,
       & diagFreq, taveFreq, tave_lastIter, monitorFreq,
       & afFacMom, vfFacMom, pfFacMom, cfFacMom, foFacMom, mtFacMom,
-      & cosPower, cAdjFreq, omega,
+      & cosPower, cAdjFreq, omega, rotationPeriod,
       & tauThetaClimRelax, lambdaThetaClimRelax,
       & tauSaltClimRelax, lambdaSaltClimRelax,
-      & tauTr1ClimRelax, lambdaTr1ClimRelax,
+      & tauTr1ClimRelax, lambdaTr1ClimRelax, latBandClimRelax,
       & externForcingCycle, externForcingPeriod,
       & convertFW2Salt, temp_EvPrRn, salt_EvPrRn, trac_EvPrRn,
-      & viscAp, diffKpT, diffKpS, hFacMinDr, hFacMinDp,
+      & hFacMinDr, hFacMinDp,
       & horiVertRatio, recip_horiVertRatio,
       & ivdc_kappa, Ro_SeaLevel,
-      & bottomDragLinear,bottomDragQuadratic
+      & bottomDragLinear,bottomDragQuadratic,
+      & tCyl
        _RL cg2dTargetResidual
        _RL cg2dTargetResWunit
        _RL cg3dTargetResidual
        _RL cg2dpcOffDFac
-       _RL delZ(Nr)
-       _RL delP(Nr)
        _RL delR(Nr)
        _RL delRc(Nr+1)
        _RL delX(Nx)
-Line 508 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 600 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL hFacSup
        _RL beta
        _RL viscAh
+       _RL viscAhW
+       _RL viscAhMax
+       _RL viscAhGrid
+       _RL viscC2leith
        _RL viscAstrain
        _RL viscAtension
-       _RL viscAz
-       _RL viscAp
        _RL viscAr
        _RL viscA4
+       _RL viscA4Max
+       _RL viscA4Grid
+       _RL viscC4leith
        _RL diffKhT
        _RL diffKrT
-       _RL diffKzT
-       _RL diffKpT
        _RL diffK4T
        _RL diffKhS
        _RL diffKrS
-       _RL diffKzS
-       _RL diffKpS
        _RL diffK4S
+       _RL diffKrBL79surf
+       _RL diffKrBL79deep
+       _RL diffKrBL79scl
+       _RL diffKrBL79Ho
        _RL delt
        _RL tauCD
        _RL rCD
-Line 546 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 643 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL chkPtFreq
        _RL pChkPtFreq
        _RL dumpFreq
+       _RL adjDumpFreq
        _RL diagFreq
        _RL taveFreq
        _RL tave_lastIter
-Line 559 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 657 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL cosPower
        _RL cAdjFreq
        _RL omega
+       _RL rotationPeriod
        _RL tauThetaClimRelax
        _RL lambdaThetaClimRelax
        _RL tauSaltClimRelax
        _RL lambdaSaltClimRelax
        _RL tauTr1ClimRelax
        _RL lambdaTr1ClimRelax
+       _RL latBandClimRelax
        _RL externForcingCycle
        _RL externForcingPeriod
        _RL convertFW2Salt
-Line 577 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 677 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL Ro_SeaLevel
        _RL bottomDragLinear
        _RL bottomDragQuadratic
+       _RL tCyl
-       COMMON /PARM_A/ HeatCapacity_Cp,recip_Cp,
+ C--   COMMON /PARM_A/ Thermodynamics constants ?
-      &                Lamba_theta
+       COMMON /PARM_A/ HeatCapacity_Cp,recip_Cp
        _RL HeatCapacity_Cp
-       _RL Lamba_theta
        _RL recip_Cp
- CmlC Equation of State (polynomial coeffients)
+ C--   COMMON /PARM_ATM/ Atmospheric physical parameters (Ideal Gas EOS, ...)
- Cml      COMMON /PARM_EOS_NL/ eosC,eosSig0,eosRefT,eosRefS
+ C     celsius2K :: convert centigrade (Celsius) degree to Kelvin
- Cml      _RL eosC(9,Nr+1),eosSig0(Nr+1),eosRefT(Nr+1),eosRefS(Nr+1)
- CmlC Linear equation of state
- CmlC     tAlpha    :: Linear EOS thermal expansion coefficient ( 1/degree ).
- CmlC     sBeta     :: Linear EOS haline contraction coefficient.
- Cml      COMMON /PARM_EOS_LIN/ tAlpha,sBeta,eosType
- Cml      _RL tAlpha
- Cml      _RL sBeta
- C Atmospheric physical parameters (Ideal Gas EOS, ...)
  C     atm_Po    :: standard reference pressure
  C     atm_Cp    :: specific heat (Cp) of the (dry) air at constant pressure
  C     atm_Rd    :: gas constant for dry air
  C     atm_kappa :: kappa = R/Cp (R: constant of Ideal Gas EOS)
+ 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/ atm_Cp, atm_Rd, atm_kappa, atm_Po,
+       COMMON /PARM_ATM/
-      &                  integr_GeoPot, selectFindRoSurf
+      &            celsius2K,
-       _RL atm_Po, atm_Cp, atm_Rd, atm_kappa
+      &            atm_Cp, atm_Rd, atm_kappa, atm_Rq, atm_Po,
+      &            integr_GeoPot, selectFindRoSurf
+       _RL celsius2K
+       _RL atm_Po, atm_Cp, atm_Rd, atm_kappa, atm_Rq
        INTEGER integr_GeoPot, selectFindRoSurf
  C Logical flags for selecting packages
+       LOGICAL useOPPS
+       LOGICAL usePP81
+       LOGICAL useMY82
+       LOGICAL useGGL90
        LOGICAL useKPP
        LOGICAL useGMRedi
        LOGICAL useOBCS
        LOGICAL useAIM
+       LOGICAL useLand
        LOGICAL useGrdchk
        LOGICAL useECCO
        LOGICAL useSHAP_FILT
        LOGICAL useZONAL_FILT
        LOGICAL useFLT
        LOGICAL usePTRACERS
+       LOGICAL useSBO
        LOGICAL useSEAICE
- cswdblk -- add ---
+       LOGICAL useBulkForce
-       LOGICAL useBulkforce
+       LOGICAL useThSIce
-       LOGICAL useThermSEAICE
+       LOGICAL usefizhi
- cswdblk --- end add ---
+       LOGICAL usegridalt
+       LOGICAL usediagnostics
+       LOGICAL useEBM
        COMMON /PARM_PACKAGES/
-      &        useKPP, useGMRedi, useOBCS, useAIM, useECCO,
+      &        useKPP, useGMRedi, useOBCS, useAIM, useLand, useECCO,
       &        useSHAP_FILT, useZONAL_FILT, useGrdchk, useFLT,
-      &        usePTRACERS, useSEAICE,
+      &        usePTRACERS,  useSBO, useSEAICE, useThSIce, useBulkForce,
- cswdblk -- add ---
+      &        usefizhi,  usegridalt, usediagnostics, useEBM,
-      &        useThermSEAICE, useBulkforce
+      &        usePP81, useMY82, useOPPS, useGGL90
- cswdblk --- end add ---
+ CEH3 ;;; Local Variables: ***
+ CEH3 ;;; mode:fortran ***
+ CEH3 ;;; End: ***

 Legend:



Removed from v.1.85
 


changed lines


 
Added in v.1.129
 Legend:



Removed from v.1.85
 


changed lines


 
Added in v.1.129
-Removed from v.1.85
+Added in v.1.129

	ViewVC Help
Powered by ViewVC 1.1.22