/[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.155 by edhill,
Sun Apr 17 00:25:45 2005 UTC
+revision 1.190 by jscott,
Wed Sep  6 15:01:55 2006 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  )
 Line 49 
 C     Checkpoint data
  C--   COMMON /PARM_C/ Character valued parameters used by the model.
  C     checkPtSuff :: List of checkpoint file suffices
+ 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                   is taken from inline function.
  C     topoFile    :: File containing the topography of the surface (unit=m)
  C                   (mainly used for the atmosphere = ground height).
+ C     shelfIceFile:: File containing the topography of the shelfice draught
+ C                    (unit=m)
  C     hydrogThetaFile :: File containing initial hydrographic data for potential
  C                       temperature.
  C     hydrogSaltFile  :: File containing initial hydrographic data for salinity.
-Line 78 
 C     eosType         :: choose the equa
+Line 84 
 C     eosType         :: choose the equa
  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,
+      &                delXFile, delYFile, horizGridFile,
+      &                bathyFile, topoFile, shelfIceFile,
       &                hydrogThetaFile, hydrogSaltFile,
       &                zonalWindFile, meridWindFile, thetaClimFile,
       &                saltClimFile, buoyancyRelation,
-Line 89 
 C     the_run_name    :: string identify
+Line 96 
 C     the_run_name    :: string identify
       &                dQdTfile, ploadFile,
       &                eddyTauxFile, eddyTauyFile,
       &                eosType, pickupSuff,
       &                mdsioLocalDir,
       &                the_run_name
        CHARACTER*(5) checkPtSuff(maxNoChkptLev)
-       CHARACTER*(MAX_LEN_FNAM) bathyFile, topoFile
+       CHARACTER*(MAX_LEN_FNAM) delXFile
+       CHARACTER*(MAX_LEN_FNAM) delYFile
+       CHARACTER*(MAX_LEN_FNAM) horizGridFile
+       CHARACTER*(MAX_LEN_FNAM) bathyFile, topoFile, shelfIceFile
        CHARACTER*(MAX_LEN_FNAM) hydrogThetaFile
        CHARACTER*(MAX_LEN_FNAM) hydrogSaltFile
        CHARACTER*(MAX_LEN_FNAM) zonalWindFile
-Line 142 
 C     nonlinFreeSurf      :: option rela
+Line 152 
 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     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     debugLevel          :: debug level selector: higher -> more writing
        COMMON /PARM_I/
-Line 158 
 C     debugLevel          :: debug level
+Line 173 
 C     debugLevel          :: debug level
       &        writeStatePrec, nCheckLev,
       &        writeBinaryPrec, readBinaryPrec,
       &        nonlinFreeSurf, select_rStar,
+      &        momForcingOutAB, tracForcingOutAB,
       &        tempAdvScheme, tempVertAdvScheme,
       &        saltAdvScheme, saltVertAdvScheme,
+      &        selectKEscheme,
       &        debugLevel
        INTEGER cg2dMaxIters
        INTEGER cg2dChkResFreq
-Line 176 
 C     debugLevel          :: debug level
+Line 193 
 C     debugLevel          :: debug level
        INTEGER nCheckLev
        INTEGER nonlinFreeSurf
        INTEGER select_rStar
+       INTEGER momForcingOutAB, tracForcingOutAB
        INTEGER tempAdvScheme, tempVertAdvScheme
        INTEGER saltAdvScheme, saltVertAdvScheme
+       INTEGER selectKEscheme
        INTEGER debugLevel
  C
-Line 196 
 C                               spherica
+Line 215 
 C                               spherica
  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
  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
-Line 204 
 C                     and off.
+Line 222 
 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                     and off.
-Line 218 
 C                     and off.
+Line 235 
 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     useFullLeith   :: Set to true to use full Leith viscosity(may be unstable
  C                       on irregular grids)
- C     useAnisotropicViscAGridMax :: Set to true to use Alistair's latest
+ C     useAreaViscLength :: Set to true to use old scaling for viscous
- C              anisotropic length scale.  It is used only for maximum viscosity
+ C              lengths, e.g., L2=Raz.  May be preferable for cube sphere.
- C              calculations.  Alistair recommends a value of viscA*GridMax=.25
+ 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     implicitFreeSurface :: Set to true to use implicit 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     use3Dsolver   :: set to true to use 3-D pressure solver
+ C     implicitIntGravWave :: treat Internal Gravity Wave implicitly
+ C     staggerTimeStep :: enable a Stagger time stepping T,S Rho then U,V
  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     use3dCoriolis :: Turns the 3-D coriolis terms (in Omega.cos Phi) on - off
  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     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     implicitDiffusion :: Turns implicit vertical diffusion on
  C     implicitViscosity :: Turns implicit vertical viscosity on
-Line 248 
 C     saltImplVertAdv :: Turns on implic
+Line 270 
 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     doAB_onGtGs       :: if the Adams-Bashforth time stepping is used, always
+ C                          apply AB on tracer tendencies (rather than on Tracer)
  C     startFromPickupAB2 :: with AB-3 code, start from an AB-2 pickup
  C     doThetaClimRelax :: Set true if relaxation to temperature
  C                        climatology is required.
-Line 276 
 C                       useSingleCpuIO i
+Line 300 
 C                       useSingleCpuIO i
  C                       outputs from master mpi process only.
  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     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                        & Last iteration, in addition multiple of dumpFreq iter.
- C                      KPP_taveFreq, and freq in pkg/diagnostics are converted to exact
+ C     balanceEmPmR    :: substract global mean of EmPmR at every time step
- C                      calendar months and years.  Requires pkg/cal.
+ C     balanceQnet     :: substract global mean of Qnet at every time step
+ C     balancePrintMean:: print substracted global means to STDOUT
        COMMON /PARM_L/ usingCartesianGrid, usingSphericalPolarGrid,
       & usingCurvilinearGrid, usingCylindricalGrid,
       & no_slip_sides,no_slip_bottom,
-      & staggerTimeStep,
+      & momViscosity, momAdvection, momForcing, useCoriolis,
-      & momViscosity, momAdvection, momForcing, useCoriolis,
       & momPressureForcing, vectorInvariantMomentum,
       & tempAdvection, tempForcing,
       & saltAdvection, saltForcing,
       & useRealFreshWaterFlux,
-      & useFullLeith, useAnisotropicViscAGridMax,
+      & useFullLeith, useStrainTensionVisc,
+      & useAreaViscLength,
       & rigidLid, implicitFreeSurface, exactConserv, uniformLin_PhiSurf,
+      & use3Dsolver, implicitIntGravWave, staggerTimeStep,
       & momStepping, tempStepping, saltStepping,
-      & metricTerms, usingSphericalPolarMTerms, useNHMTerms,
+      & metricTerms, useNHMTerms,
-      & useConstantF, useBetaPlaneF, useSphereF,
+      & useConstantF, useBetaPlaneF, useSphereF, use3dCoriolis,
       & useCDscheme,
       & useEnergyConservingCoriolis, useJamartWetPoints, useJamartMomAdv,
       & SadournyCoriolis, upwindVorticity, highOrderVorticity,
-      & useAbsVorticity,
+      & useAbsVorticity, upwindShear,
       & implicitDiffusion, implicitViscosity,
       & tempImplVertAdv, saltImplVertAdv, momImplVertAdv,
-      & multiDimAdvection, useMultiDimAdvec, forcing_In_AB,
+      & multiDimAdvection, useMultiDimAdvec,
-      & doThetaClimRelax, doSaltClimRelax, doTr1ClimRelax,
+      & momDissip_In_AB, doAB_onGtGs,
-      & periodicExternalForcing,
+      & doThetaClimRelax, doSaltClimRelax, doTr1ClimRelax,
+      & periodicExternalForcing,
       & fluidIsAir, fluidIsWater,
       & usingPCoords, usingZCoords, useDynP_inEos_Zc, setCenterDr,
       & nonHydrostatic, quasiHydrostatic, globalFiles, useSingleCpuIO,
-      & allowFreezing, useOldFreezing, groundAtK1,
+      & allowFreezing, useOldFreezing,
       & usePickupBeforeC35, usePickupBeforeC54, startFromPickupAB2,
       & pickup_read_mdsio, pickup_write_mdsio, pickup_write_immed,
       & timeave_mdsio, snapshot_mdsio, monitor_stdio,
-      & outputTypesInclusive, debugMode,
+      & outputTypesInclusive, dumpInitAndLast, debugMode,
       & inAdMode, inAdTrue, inAdFalse, inAdExact,
-      & calendarDumps
+      & balanceEmPmR, balanceQnet, balancePrintMean
        LOGICAL usingCartesianGrid
        LOGICAL usingSphericalPolarGrid
        LOGICAL usingCylindricalGrid
        LOGICAL usingCurvilinearGrid
-       LOGICAL usingSphericalPolarMTerms
        LOGICAL useNHMTerms
        LOGICAL no_slip_sides
        LOGICAL no_slip_bottom
-       LOGICAL staggerTimeStep
        LOGICAL momViscosity
        LOGICAL momAdvection
        LOGICAL momForcing
-Line 341 
 C                      calendar months a
+Line 366 
 C                      calendar months a
        LOGICAL saltAdvection
        LOGICAL saltForcing
        LOGICAL useRealFreshWaterFlux
-       LOGICAL useFullLeith, useAnisotropicViscAGridMax
+       LOGICAL useFullLeith
+       LOGICAL useStrainTensionVisc
+       LOGICAL useAreaViscLength
        LOGICAL rigidLid
        LOGICAL implicitFreeSurface
        LOGICAL exactConserv
        LOGICAL uniformLin_PhiSurf
+       LOGICAL use3Dsolver
+       LOGICAL implicitIntGravWave
+       LOGICAL staggerTimeStep
        LOGICAL momStepping
        LOGICAL tempStepping
        LOGICAL saltStepping
-Line 353 
 C                      calendar months a
+Line 383 
 C                      calendar months a
        LOGICAL useConstantF
        LOGICAL useBetaPlaneF
        LOGICAL useSphereF
+       LOGICAL use3dCoriolis
        LOGICAL useCDscheme
        LOGICAL useEnergyConservingCoriolis
        LOGICAL useJamartWetPoints
-Line 361 
 C                      calendar months a
+Line 392 
 C                      calendar months a
        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 doThetaClimRelax
        LOGICAL doSaltClimRelax
        LOGICAL doTr1ClimRelax
-Line 385 
 C                      calendar months a
+Line 418 
 C                      calendar months a
        LOGICAL useSingleCpuIO
        LOGICAL allowFreezing
        LOGICAL useOldFreezing
-       LOGICAL groundAtK1
        LOGICAL usePickupBeforeC35
        LOGICAL usePickupBeforeC54
        LOGICAL startFromPickupAB2
+       LOGICAL dumpInitAndLast
        LOGICAL debugMode
        LOGICAL pickup_read_mdsio, pickup_write_mdsio
        LOGICAL pickup_write_immed
        LOGICAL timeave_mdsio, snapshot_mdsio, monitor_stdio
        LOGICAL outputTypesInclusive
        LOGICAL inAdMode, inAdTrue, inAdFalse, inAdExact
-       LOGICAL calendarDumps
+       LOGICAL balanceEmPmR
+       LOGICAL balanceQnet
+       LOGICAL balancePrintMean
  C--   COMMON /PARM_R/ "Real" valued parameters used by the model.
  C     cg2dTargetResidual
-Line 430 
 C     rhoConst  :: Vertically constant r
+Line 466 
 C     rhoConst  :: Vertically constant r
  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     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
-Line 446 
 C                 momentum laterally ( m
+Line 486 
 C                 momentum laterally ( m
  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                 Not used if variable horiz. viscosity is used.
  C     viscAr    :: Eddy viscosity coeff. for mixing of
  C                 momentum vertically ( units of r^2/s )
  C     viscA4    :: Biharmonic viscosity coeff. for mixing of
-Line 453 
 C                 momentum laterally ( m
+Line 494 
 C                 momentum laterally ( m
  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 462 
 C                  (act on Divergence pa
+Line 504 
 C                  (act on Divergence pa
  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     viscC2leithD :: Modified Leith non-dimensional viscosity factor (grad(div))
+ C     viscC2leithD :: Modified Leith non-dimensional visc. factor (grad(div))
- C     viscC2smag  :: Smagorinsky non-dimensional viscosity factor
+ C     viscC2smag  :: Smagorinsky non-dimensional viscosity factor (harmonic)
+ C     viscC4smag  :: Smagorinsky non-dimensional viscosity factor (biharmonic)
  C     viscAhMax :: Maximum eddy viscosity coeff. for mixing of
- C                 momentum laterally ( m^2/s )
+ 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     viscAhGridMax:: maximum and minimum harmonic viscosity coefficients ...
- C     viscAhGridMin::  in terms of non-dimensional grid-size dependent viscosity
+ C     viscAhGridMin::  in terms of non-dimensional grid-size dependent visc.
  C     viscA4Max :: Maximum biharmonic viscosity coeff. for mixing of
  C                 momentum laterally ( m^4/s )
+ C     viscA4ReMax :: Maximum Gridscale Reynolds number for
+ 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     viscA4GridMax:: maximum and minimum biharmonic viscosity coefficients ...
-Line 563 
 C     recip_horiVertRatio  ( 1 if horiz
+Line 610 
 C     recip_horiVertRatio  ( 1 if horiz
  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                          starting value (k=1) for vertical coordinate (rf(1)=Ro_SeaLevel)
- C     bottomDragLinear   :: Drag coefficient built in to core dynamics
+ C     sideDragFactor     :: side-drag scaling factor (used only if no_slip_sides)
- C      --"-"--  Quadratic  ( linear: 1/s, quadratic: 1/m )
+ C                           (default=2: full drag ; =1: gives half-slip BC)
-       COMMON /PARM_R/ cg2dTargetResidual, cg2dTargetResWunit,
+ C     bottomDragLinear    :: Linear    bottom-drag coefficient (units of [r]/s)
+ 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)
+       COMMON /PARM_R/ cg2dTargetResidual, cg2dTargetResWunit,
       & cg2dpcOffDFac, cg3dTargetResidual,
       & delR, delRc, delX, delY,
       & deltaT, deltaTmom, dTtracerLev, deltaTfreesurf, deltaTClock,
-Line 574 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 629 
 C      --"-"--  Quadratic  ( linear: 1/s
       & viscAh, viscAhW, viscAhMax,
       & viscAhGrid, viscAhGridMax, viscAhGridMin,
       & viscC2leith, viscC2leithD,
-      & viscC2smag,
+      & viscC2smag, viscC4smag,
       & viscAhD, viscAhZ, viscA4D, viscA4Z,
       & viscA4, viscA4W,
       & viscA4Max, viscA4Grid, viscA4GridMax, viscA4GridMin,
-      & viscC4leith, viscC4leithD, viscAr, viscAstrain, viscAtension,
+      & viscAhRemax, viscA4Remax,
+      & viscC4leith, viscC4leithD, viscAr,
       & diffKhT, diffK4T, diffKrNrT,
       & diffKhS, diffK4S, diffKrNrS,
       & 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,
+      & rhoConstFresh, convertEmP2rUnit, tRef, sRef, phiRef, dBdrRef,
       & baseTime, startTime, endTime,
-      & chkPtFreq, pchkPtFreq, dumpFreq, adjDumpFreq,
+      & chkPtFreq, pChkPtFreq, dumpFreq, adjDumpFreq,
       & diagFreq, taveFreq, tave_lastIter, monitorFreq, adjMonitorFreq,
       & afFacMom, vfFacMom, pfFacMom, cfFacMom, foFacMom, mtFacMom,
       & cosPower, cAdjFreq, omega, rotationPeriod,
-      & tauThetaClimRelax,
+      & tauThetaClimRelax, tauSaltClimRelax,
-      & tauSaltClimRelax,
       & tauTr1ClimRelax, lambdaTr1ClimRelax, latBandClimRelax,
       & externForcingCycle, externForcingPeriod,
       & convertFW2Salt, temp_EvPrRn, salt_EvPrRn,
       & hFacMinDr, hFacMinDp,
       & horiVertRatio, recip_horiVertRatio,
       & ivdc_kappa, Ro_SeaLevel,
-      & bottomDragLinear,bottomDragQuadratic,
+      & sideDragFactor, bottomDragLinear, bottomDragQuadratic, nh_Am2,
+      & smoothAbsFuncRange,
       & tCylIn, tCylOut
        _RL cg2dTargetResidual
-Line 637 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 693 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL viscAhD
        _RL viscAhZ
        _RL viscAhMax
+       _RL viscAhReMax
        _RL viscAhGrid
        _RL viscAhGridMax
        _RL viscAhGridMin
        _RL viscC2leith
        _RL viscC2leithD
        _RL viscC2smag
-       _RL viscAstrain
+       _RL viscC4smag
-       _RL viscAtension
        _RL viscAr
        _RL viscA4
        _RL viscA4W
        _RL viscA4D
        _RL viscA4Z
        _RL viscA4Max
+       _RL viscA4ReMax
        _RL viscA4Grid, viscA4GridMax, viscA4GridMin
        _RL viscC4leith
        _RL viscC4leithD
        _RL diffKhT
        _RL diffKrNrT(Nr)
        _RL diffK4T
        _RL diffKhS
        _RL diffKrNrS(Nr)
        _RL diffK4S
        _RL diffKrBL79surf
        _RL diffKrBL79deep
        _RL diffKrBL79scl
-Line 678 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 735 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL convertEmP2rUnit
        _RL tRef(Nr)
        _RL sRef(Nr)
+       _RL phiRef(2*Nr+1)
+       _RL dBdrRef(Nr)
        _RL baseTime
        _RL startTime
        _RL endTime
-Line 695 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 754 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL pfFacMom
        _RL cfFacMom
        _RL foFacMom
-       _RL mTFacMom
+       _RL mtFacMom
        _RL cosPower
        _RL cAdjFreq
        _RL omega
-Line 714 
 C      --"-"--  Quadratic  ( linear: 1/s
+Line 773 
 C      --"-"--  Quadratic  ( linear: 1/s
        _RL recip_horiVertRatio
        _RL ivdc_kappa
        _RL Ro_SeaLevel
+       _RL sideDragFactor
        _RL bottomDragLinear
        _RL bottomDragQuadratic
+       _RL smoothAbsFuncRange
+       _RL nh_Am2
        _RL tCylIn
        _RL tCylOut
-Line 736 
 C     integr_GeoPot :: option to select
+Line 798 
 C     integr_GeoPot :: option to select
  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 754 
 C Logical flags for selecting packages
+Line 816 
 C Logical flags for selecting packages
        LOGICAL useOBCS
        LOGICAL useAIM
        LOGICAL useLand
+       LOGICAL useCAL
+       LOGICAL useEXF
+       LOGICAL useEBM
        LOGICAL useGrdchk
        LOGICAL useECCO
        LOGICAL useSHAP_FILT
-Line 761 
 C Logical flags for selecting packages
+Line 826 
 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 useREGRID
+       LOGICAL useRunClock
+       LOGICAL useEMBED_FILES
+       LOGICAL useMYPACKAGE
        COMMON /PARM_PACKAGES/
-      &        useKPP, useGMRedi, useOBCS, useAIM, useLand, useECCO,
+      &        useOPPS, usePP81, useMY82, useGGL90, useKPP,
-      &        useSHAP_FILT, useZONAL_FILT, useGrdchk, useFLT,
+      &        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
+      &        useSBO, useSEAICE, useShelfIce,
+      &        useThSIce, useATM2D, useBulkForce,
+      &        usefizhi, usegridalt, useDiagnostics, useMNC, useREGRID,
+      &        useRunClock, useEMBED_FILES, useMYPACKAGE
  CEH3 ;;; Local Variables: ***
  CEH3 ;;; mode:fortran ***

 Legend:



Removed from v.1.155
 


changed lines


 
Added in v.1.190
 Legend:



Removed from v.1.155
 


changed lines


 
Added in v.1.190
-Removed from v.1.155
+Added in v.1.190

	ViewVC Help
Powered by ViewVC 1.1.22