/[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.239 by jmc,
Sat Sep 11 21:23:08 2010 UTC
+revision 1.266 by jmc,
Fri Nov  9 22:29:32 2012 UTC
 Line 33 
 C     pickupSuff      :: force to start
  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     adTapeDir       :: read-write checkpointing tape files from/to this
+ C                        directory name instead of current dir. Conflicts
+ C                        mdsioLocalDir, so only one of the two can be set.
+ C                        In contrast to mdsioLocalDir, if specified adTapeDir
+ C                        must exist before the model starts.
  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)
-Line 59 
 C     viscA4Zfile     :: File containing
+Line 64 
 C     viscA4Zfile     :: File containing
  C     zonalWindFile   :: File containing zonal wind data
  C     meridWindFile   :: File containing meridional wind data
  C     thetaClimFile   :: File containing surface theta climataology used
- C                       in relaxation term -lambda(theta-theta*)
+ C                        in relaxation term -lambda(theta-theta*)
  C     saltClimFile    :: File containing surface salt climataology used
- C                       in relaxation term -lambda(salt-salt*)
+ C                        in relaxation term -lambda(salt-salt*)
  C     surfQfile       :: File containing surface heat flux, excluding SW
  C                        (old version, kept for backward compatibility)
  C     surfQnetFile    :: File containing surface net heat flux
-Line 73 
 C                 m/s when using externa
+Line 78 
 C                 m/s when using externa
  C                 to kg/m2/s by multiplying by rhoConstFresh.
  C     saltFluxFile    :: File containing surface salt flux
  C     pLoadFile       :: File containing pressure loading
+ C     addMassFile     :: File containing source/sink of fluid in the interior
  C     eddyPsiXFile    :: File containing zonal Eddy streamfunction data
  C     eddyPsiYFile    :: File containing meridional Eddy streamfunction data
  C     the_run_name    :: string identifying the name of the model "run"
        COMMON /PARM_C/
       &                buoyancyRelation, eosType,
-      &                pickupSuff, mdsioLocalDir,
+      &                pickupSuff, mdsioLocalDir, adTapeDir,
       &                tRefFile, sRefFile, rhoRefFile,
       &                delRFile, delRcFile, hybSigmFile,
       &                delXFile, delYFile, horizGridFile,
-Line 92 
 C     the_run_name    :: string identify
+Line 98 
 C     the_run_name    :: string identify
       &                surfQfile, surfQnetFile, surfQswFile,
       &                lambdaThetaFile, lambdaSaltFile,
       &                uVelInitFile, vVelInitFile, pSurfInitFile,
-      &                dQdTfile, ploadFile,
+      &                dQdTfile, pLoadFile, addMassFile,
       &                eddyPsiXFile, eddyPsiYFile,
       &                the_run_name
        CHARACTER*(MAX_LEN_FNAM) buoyancyRelation
        CHARACTER*(6)  eosType
        CHARACTER*(10) pickupSuff
        CHARACTER*(MAX_LEN_FNAM) mdsioLocalDir
+       CHARACTER*(MAX_LEN_FNAM) adTapeDir
        CHARACTER*(MAX_LEN_FNAM) tRefFile
        CHARACTER*(MAX_LEN_FNAM) sRefFile
        CHARACTER*(MAX_LEN_FNAM) rhoRefFile
-Line 128 
 C     the_run_name    :: string identify
+Line 135 
 C     the_run_name    :: string identify
        CHARACTER*(MAX_LEN_FNAM) vVelInitFile
        CHARACTER*(MAX_LEN_FNAM) pSurfInitFile
        CHARACTER*(MAX_LEN_FNAM) dQdTfile
-       CHARACTER*(MAX_LEN_FNAM) ploadFile
+       CHARACTER*(MAX_LEN_FNAM) pLoadFile
+       CHARACTER*(MAX_LEN_FNAM) addMassFile
        CHARACTER*(MAX_LEN_FNAM) eddyPsiXFile
        CHARACTER*(MAX_LEN_FNAM) eddyPsiYFile
        CHARACTER*(MAX_LEN_FNAM) lambdaThetaFile
-Line 137 
 C     the_run_name    :: string identify
+Line 145 
 C     the_run_name    :: string identify
  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                            two-dimensional con. grad solver.
  C     cg2dChkResFreq      :: Frequency with which to check residual
- C                           in con. grad solver.
+ 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                            three-dimensional con. grad solver.
  C     cg3dChkResFreq      :: Frequency with which to check residual
- C                           in con. grad solver.
+ C                            in con. grad solver.
+ C     printResidualFreq   :: Frequency for printing residual in CG iterations
  C     nIter0              :: Start time-step number of for this run
  C     nTimeSteps          :: Number of timesteps to execute
  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     selectCoriMap       :: select setting of Coriolis parameter map:
+ C                           =0 f-Plane (Constant Coriolis, = f0)
+ C                           =1 Beta-Plane Coriolis (= f0 + beta.y)
+ C                           =2 Spherical Coriolis (= 2.omega.sin(phi))
+ C                           =3 Read Coriolis 2-d fields from files.
+ C     selectSigmaCoord    :: option related to sigma vertical coordinate
  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     selectNHfreeSurf    :: option for Non-Hydrostatic (free-)Surface formulation:
  C                           =0 (default) hydrostatic surf. ; > 0 add NH effects.
- C     selectSigmaCoord    :: option related to sigma vertical coordinate
  C     selectAddFluid      :: option to add mass source/sink of fluid in the interior
  C                            (3-D generalisation of oceanic real-fresh water flux)
  C                           =0 off ; =1 add fluid ; =-1 virtual flux (no mass added)
  C     momForcingOutAB     :: =1: take momentum forcing contribution
- C                           out of (=0: in) Adams-Bashforth time stepping.
+ 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                            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
-Line 173 
 C     selectKEscheme      :: Kinetic Ene
+Line 187 
 C     selectKEscheme      :: Kinetic Ene
  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
+ C-    debugLevel          :: controls printing of algorithm intermediate results
+ C                            and statistics ; higher -> more writing
        COMMON /PARM_I/
-      &        cg2dMaxIters,
+      &        cg2dMaxIters, cg2dChkResFreq, cg2dPreCondFreq,
-      &        cg2dChkResFreq, cg2dPreCondFreq,
+      &        cg3dMaxIters, cg3dChkResFreq,
-      &        cg3dMaxIters,
+      &        printResidualFreq,
-      &        cg3dChkResFreq,
       &        nIter0, nTimeSteps, nEndIter,
       &        writeStatePrec,
       &        writeBinaryPrec, readBinaryPrec,
+      &        selectCoriMap,
+      &        selectSigmaCoord,
       &        nonlinFreeSurf, select_rStar,
       &        selectNHfreeSurf,
-      &        selectSigmaCoord,
       &        selectAddFluid,
       &        momForcingOutAB, tracForcingOutAB,
       &        tempAdvScheme, tempVertAdvScheme,
-Line 197 
 C     debugLevel          :: debug level
+Line 212 
 C     debugLevel          :: debug level
        INTEGER cg2dPreCondFreq
        INTEGER cg3dMaxIters
        INTEGER cg3dChkResFreq
+       INTEGER printResidualFreq
        INTEGER nIter0
        INTEGER nTimeSteps
        INTEGER nEndIter
        INTEGER writeStatePrec
        INTEGER writeBinaryPrec
        INTEGER readBinaryPrec
+       INTEGER selectCoriMap
+       INTEGER selectSigmaCoord
        INTEGER nonlinFreeSurf
        INTEGER select_rStar
        INTEGER selectNHfreeSurf
-       INTEGER selectSigmaCoord
        INTEGER selectAddFluid
        INTEGER momForcingOutAB, tracForcingOutAB
        INTEGER tempAdvScheme, tempVertAdvScheme
-Line 219 
 C     debugLevel          :: debug level
+Line 236 
 C     debugLevel          :: debug level
  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                         is air
  C     fluidIsWater     :: Set to indicate that the fluid major constituent
- C                        is water
+ C                         is water
  C     usingPCoords     :: Set to indicate that we are working in a pressure
- C                        type coordinate (p or p*).
+ 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                         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                           coordinate frame.
  C     usingSphericalPolarGrid :: If TRUE grid generation will be in a
- C                               spherical polar frame.
+ 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     usingCurvilinearGrid :: If TRUE, use a curvilinear grid (to be provided)
+ C     hasWetCSCorners :: domain contains CS-type corners where dynamics is solved
  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)
-Line 257 
 C     metricTerms   :: Flag which turns
+Line 275 
 C     metricTerms   :: Flag which turns
  C     useNHMTerms   :: If TRUE use non-hydrostatic metric terms.
  C     useCoriolis   :: Flag which turns the coriolis terms on and off.
  C     use3dCoriolis :: Turns the 3-D coriolis terms (in Omega.cos Phi) 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     vectorInvariantMomentum :: use Vector-Invariant form (mom_vecinv package)
  C                                (default = F = use mom_fluxform package)
-Line 270 
 C     highOrderVorticity :: use 3rd/4th
+Line 285 
 C     highOrderVorticity :: use 3rd/4th
  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     calc_wVelocity :: Turns of vertical velocity calculation off
  C- Temp. & Salt params:
- C     tempStepping   :: Turns temperature equation time-stepping off
+ C     tempStepping   :: Turns temperature equation time-stepping on/off
- C     saltStepping   :: Turns salinity equation time-stepping off
+ C     saltStepping   :: Turns salinity equation time-stepping on/off
+ C     addFrictionHeating :: account for frictional heating
  C     tempAdvection  :: Flag which turns advection of temperature on and off.
+ C     tempVertDiff4  :: use vertical bi-harmonic diffusion for temperature
  C     tempIsActiveTr :: Pot.Temp. is a dynamically active tracer
- C     tempForcing    :: Flag which turns external forcing of temperature on
+ C     tempForcing    :: Flag which turns external forcing of temperature on/off
- C                       and off.
  C     saltAdvection  :: Flag which turns advection of salinity on and off.
+ C     saltVertDiff4  :: use vertical bi-harmonic diffusion for salinity
  C     saltIsActiveTr :: Salinity  is a dynamically active tracer
- C     saltForcing    :: Flag which turns external forcing of salinity on
+ C     saltForcing    :: Flag which turns external forcing of salinity on/off
- C                       and off.
  C     maskIniTemp    :: apply mask to initial Pot.Temp.
  C     maskIniSalt    :: apply mask to initial salinity
  C     checkIniTemp   :: check for points with identically zero initial Pot.Temp.
  C     checkIniSalt   :: check for points with identically zero initial salinity
- 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- Pressure solver related parameters (PARM02)
  C     useSRCGSolver  :: Set to true to use conjugate gradient
  C                       solver with single reduction (only one call of
  C                       s/r mpi_allreduce), default is false
- C- Time-stepping params:
+ C- Time-stepping & free-surface params:
  C     rigidLid            :: Set to true to use rigid lid
  C     implicitFreeSurface :: Set to true to use implicit 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     uniformFreeSurfLev  :: TRUE if free-surface level-index is uniform (=1)
  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     useRealFreshWaterFlux :: if True (=Natural BCS), treats P+R-E flux
- C                            linear relation Phi_surf = Bo_surf*eta
+ C                         as a real Fresh Water (=> changes the Sea Level)
+ C                         if F, converts P+R-E to salt flux (no SL effect)
  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     doResetHFactors   :: Do reset thickness factors @ beginning of each time-step
  C     implicitDiffusion :: Turns implicit vertical diffusion on
  C     implicitViscosity :: Turns implicit vertical viscosity on
  C     tempImplVertAdv :: Turns on implicit vertical advection for Temperature
-Line 324 
 C     doThetaClimRelax :: Set true if re
+Line 343 
 C     doThetaClimRelax :: Set true if re
  C                        climatology is required.
  C     doSaltClimRelax  :: Set true if relaxation to salinity
  C                        climatology is required.
+ C     balanceThetaClimRelax :: substract global mean effect at every time step
+ C     balanceSaltClimRelax :: substract global mean effect at every time step
  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
-Line 345 
 C     snapshot_mdsio     :: use mdsio fo
+Line 366 
 C     snapshot_mdsio     :: use mdsio fo
  C     monitor_stdio      :: use stdio for monitor output
  C     dumpInitAndLast :: dumps model state to files at Initial (nIter0)
  C                        & Last iteration, in addition multiple of dumpFreq iter.
+ C     printDomain     :: controls printing of domain fields (bathy, hFac ...).
        COMMON /PARM_L/
       & fluidIsAir, fluidIsWater,
       & usingPCoords, usingZCoords, useDynP_inEos_Zc,
       & usingCartesianGrid, usingSphericalPolarGrid, rotateGrid,
-      & usingCurvilinearGrid, usingCylindricalGrid,
+      & usingCylindricalGrid, usingCurvilinearGrid, hasWetCSCorners,
       & deepAtmosphere, setInterFDr, setCenterDr,
       & no_slip_sides, no_slip_bottom,
       & useFullLeith, useStrainTensionVisc, useAreaViscLength,
       & momViscosity, momAdvection, momForcing,
       & momPressureForcing, metricTerms, useNHMTerms,
       & useCoriolis, use3dCoriolis,
-      & useConstantF, useBetaPlaneF, useSphereF,
       & useCDscheme, vectorInvariantMomentum,
       & useEnergyConservingCoriolis, useJamartWetPoints, useJamartMomAdv,
       & upwindVorticity, highOrderVorticity,
       & useAbsVorticity, upwindShear,
-      & momStepping, tempStepping, saltStepping,
+      & momStepping, calc_wVelocity, tempStepping, saltStepping,
-      & tempAdvection, tempIsActiveTr, tempForcing,
+      & addFrictionHeating,
-      & saltAdvection, saltIsActiveTr, saltForcing,
+      & tempAdvection, tempVertDiff4, tempIsActiveTr, tempForcing,
+      & saltAdvection, saltVertDiff4, saltIsActiveTr, saltForcing,
       & maskIniTemp, maskIniSalt, checkIniTemp, checkIniSalt,
-      & useRealFreshWaterFlux,
+      & useSRCGSolver,
-      & rigidLid, implicitFreeSurface, exactConserv, linFSConserveTr,
+      & rigidLid, implicitFreeSurface,
-      & uniformLin_PhiSurf,
+      & uniformLin_PhiSurf, uniformFreeSurfLev,
-      & quasiHydrostatic, nonHydrostatic,
+      & exactConserv, linFSConserveTr, useRealFreshWaterFlux,
-      & use3Dsolver, implicitIntGravWave, staggerTimeStep,
+      & quasiHydrostatic, nonHydrostatic, use3Dsolver,
+      & implicitIntGravWave, staggerTimeStep, doResetHFactors,
       & implicitDiffusion, implicitViscosity,
       & tempImplVertAdv, saltImplVertAdv, momImplVertAdv,
       & multiDimAdvection, useMultiDimAdvec,
       & momDissip_In_AB, doAB_onGtGs,
       & balanceEmPmR, balanceQnet, balancePrintMean,
+      & balanceThetaClimRelax, balanceSaltClimRelax,
       & doThetaClimRelax, doSaltClimRelax,
       & allowFreezing, useOldFreezing,
       & periodicExternalForcing,
-Line 384 
 C                        & Last iteratio
+Line 408 
 C                        & Last iteratio
       & pickup_read_mdsio, pickup_write_mdsio, pickup_write_immed,
       & writePickupAtEnd,
       & timeave_mdsio, snapshot_mdsio, monitor_stdio,
-      & outputTypesInclusive, dumpInitAndLast, debugMode,
+      & outputTypesInclusive, dumpInitAndLast,
-      & inAdMode, inAdTrue, inAdFalse, inAdExact,
+      & printDomain
-      & useSRCGSolver
        LOGICAL fluidIsAir
        LOGICAL fluidIsWater
-Line 396 
 C                        & Last iteratio
+Line 419 
 C                        & Last iteratio
        LOGICAL usingCartesianGrid
        LOGICAL usingSphericalPolarGrid, rotateGrid
        LOGICAL usingCylindricalGrid
-       LOGICAL usingCurvilinearGrid
+       LOGICAL usingCurvilinearGrid, hasWetCSCorners
        LOGICAL deepAtmosphere
        LOGICAL setInterFDr
        LOGICAL setCenterDr
-       LOGICAL useNHMTerms
        LOGICAL no_slip_sides
        LOGICAL no_slip_bottom
+       LOGICAL useFullLeith
+       LOGICAL useStrainTensionVisc
+       LOGICAL useAreaViscLength
        LOGICAL momViscosity
        LOGICAL momAdvection
        LOGICAL momForcing
        LOGICAL momPressureForcing
+       LOGICAL metricTerms
+       LOGICAL useNHMTerms
        LOGICAL useCoriolis
+       LOGICAL use3dCoriolis
+       LOGICAL useCDscheme
        LOGICAL vectorInvariantMomentum
+       LOGICAL useEnergyConservingCoriolis
+       LOGICAL useJamartWetPoints
+       LOGICAL useJamartMomAdv
+       LOGICAL upwindVorticity
+       LOGICAL highOrderVorticity
+       LOGICAL useAbsVorticity
+       LOGICAL upwindShear
+       LOGICAL momStepping
+       LOGICAL calc_wVelocity
+       LOGICAL tempStepping
+       LOGICAL saltStepping
+       LOGICAL addFrictionHeating
        LOGICAL tempAdvection
+       LOGICAL tempVertDiff4
        LOGICAL tempIsActiveTr
        LOGICAL tempForcing
        LOGICAL saltAdvection
+       LOGICAL saltVertDiff4
        LOGICAL saltIsActiveTr
        LOGICAL saltForcing
        LOGICAL maskIniTemp
        LOGICAL maskIniSalt
        LOGICAL checkIniTemp
        LOGICAL checkIniSalt
-       LOGICAL useRealFreshWaterFlux
+       LOGICAL useSRCGSolver
-       LOGICAL useFullLeith
-       LOGICAL useStrainTensionVisc
-       LOGICAL useAreaViscLength
        LOGICAL rigidLid
        LOGICAL implicitFreeSurface
+       LOGICAL uniformLin_PhiSurf
+       LOGICAL uniformFreeSurfLev
        LOGICAL exactConserv
        LOGICAL linFSConserveTr
-       LOGICAL uniformLin_PhiSurf
+       LOGICAL useRealFreshWaterFlux
        LOGICAL quasiHydrostatic
        LOGICAL nonHydrostatic
        LOGICAL use3Dsolver
        LOGICAL implicitIntGravWave
        LOGICAL staggerTimeStep
-       LOGICAL momStepping
+       LOGICAL doResetHFactors
-       LOGICAL tempStepping
-       LOGICAL saltStepping
-       LOGICAL metricTerms
-       LOGICAL useConstantF
-       LOGICAL useBetaPlaneF
-       LOGICAL useSphereF
-       LOGICAL use3dCoriolis
-       LOGICAL useCDscheme
-       LOGICAL useEnergyConservingCoriolis
-       LOGICAL useJamartWetPoints
-       LOGICAL useJamartMomAdv
-       LOGICAL upwindVorticity
-       LOGICAL highOrderVorticity
-       LOGICAL useAbsVorticity
-       LOGICAL upwindShear
        LOGICAL implicitDiffusion
        LOGICAL implicitViscosity
        LOGICAL tempImplVertAdv
-Line 463 
 C                        & Last iteratio
+Line 492 
 C                        & Last iteratio
        LOGICAL balancePrintMean
        LOGICAL doThetaClimRelax
        LOGICAL doSaltClimRelax
+       LOGICAL balanceThetaClimRelax
+       LOGICAL balanceSaltClimRelax
        LOGICAL allowFreezing
        LOGICAL useOldFreezing
        LOGICAL periodicExternalForcing
-Line 475 
 C                        & Last iteratio
+Line 506 
 C                        & Last iteratio
        LOGICAL timeave_mdsio, snapshot_mdsio, monitor_stdio
        LOGICAL outputTypesInclusive
        LOGICAL dumpInitAndLast
-       LOGICAL debugMode
+       LOGICAL printDomain
-       LOGICAL inAdMode, inAdTrue, inAdFalse, inAdExact
-       LOGICAL useSRCGSolver
  C--   COMMON /PARM_R/ "Real" valued parameters used by the model.
  C     cg2dTargetResidual
-Line 503 
 C           defaults to 0.51 but can be
+Line 532 
 C           defaults to 0.51 but can be
  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
- C     delY        on input flags.
+ C     delY         on input flags. Note: moved to header file SET_GRID.h
+ C     xgOrigin   :: Origin of the X-axis (Cartesian Grid) / Longitude of Western
+ C                :: most cell face (Lat-Lon grid) (Note: this is an "inert"
+ C                :: parameter but it makes geographical references simple.)
+ C     ygOrigin   :: Origin of the Y-axis (Cartesian Grid) / Latitude of Southern
+ C                :: most face (Lat-Lon grid).
  C     gravity   :: Accel. due to gravity ( m/s^2 )
  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     rhoConst  :: Vertically constant reference density (Boussinesq)
  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)
-Line 516 
 C     rho1Ref   :: reference vertical pr
+Line 550 
 C     rho1Ref   :: reference vertical pr
  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     dBdrRef   :: vertical gradient of reference buoyancy  [(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),
-Line 533 
 C     rUnit2mass :: units conversion fac
+Line 567 
 C     rUnit2mass :: units conversion fac
  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     xgOrigin   :: Origin of the X-axis (Cartesian Grid) / Longitude of Western
- C                :: most cell face (Lat-Lon grid) (Note: this is an "inert"
- C                :: parameter but it makes geographical references simple.)
- C     ygOrigin   :: Origin of the Y-axis (Cartesian Grid) / Latitude of Southern
- C                :: most face (Lat-Lon grid).
  C     rSphere    :: Radius of sphere for a spherical polar grid ( m ).
  C     recip_rSphere  :: Reciprocal radius of sphere ( m ).
+ C     radius_fromHorizGrid :: sphere Radius of input horiz. grid (Curvilinear Grid)
  C     f0         :: Reference coriolis parameter ( 1/s )
  C                   ( Southern edge f for beta plane )
  C     beta       :: df/dy ( s^-1.m^-1 )
+ C     fPrime     :: Second Coriolis parameter ( 1/s ), related to Y-component
+ C                   of rotation (reference value = 2.Omega.Cos(Phi))
  C     omega      :: Angular velocity ( rad/s )
  C     rotationPeriod :: Rotation period (s) (= 2.pi/omega)
  C     viscArNr   :: vertical profile of Eddy viscosity coeff.
-Line 589 
 C     viscA4GridMax:: maximum and minimu
+Line 621 
 C     viscA4GridMax:: maximum and minimu
  C     viscA4GridMin::  in terms of non-dimensional grid-size dependent viscosity
  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     diffKrNrT :: vertical profile of Laplacian diffusion coeff.
+ C                 for mixing of heat vertically ( units of r^2/s )
+ C     diffKr4T  :: vertical profile of Biharmonic diffusion coeff.
+ C                 for mixing of heat vertically ( units of r^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     diffKrNrS :: vertical profile of Laplacian diffusion coeff.
+ C                 for mixing of salt vertically ( units of r^2/s ),
+ C     diffKr4S  :: vertical profile of Biharmonic diffusion coeff.
+ C                 for mixing of salt vertically ( units of r^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
-Line 618 
 C                    Frequency of checkp
+Line 654 
 C                    Frequency of checkp
  C                    are referenced to this clock. ( s )
  C     deltaTMom    :: Timestep for momemtum equations ( s )
  C     dTtracerLev  :: Timestep for tracer equations ( s ), function of level k
- C     deltaTfreesurf :: Timestep for free-surface equation ( s )
+ C     deltaTFreeSurf :: Timestep for free-surface equation ( s )
- C     freesurfFac  :: Parameter to turn implicit free surface term on or off
+ C     freeSurfFac  :: Parameter to turn implicit free surface term on or off
- C                    freesurfac = 1. uses implicit free surface
+ C                     freeSurFac = 1. uses implicit free surface
- C                    freesurfac = 0. uses rigid lid
+ C                     freeSurFac = 0. uses rigid lid
  C     abEps        :: Adams-Bashforth-2 stabilizing weight
  C     alph_AB      :: Adams-Bashforth-3 primary factor
  C     beta_AB      :: Adams-Bashforth-3 secondary factor
-Line 646 
 C     endTime       :: Ending time for t
+Line 682 
 C     endTime       :: Ending time for t
  C     chkPtFreq     :: Frequency of rolling check pointing ( s ).
  C     pChkPtFreq    :: Frequency of permanent check pointing ( s ).
  C     dumpFreq      :: Frequency with which model state is written to
- C                     post-processing files ( s ).
+ C                      post-processing files ( s ).
  C     diagFreq      :: Frequency with which model writes diagnostic output
- C                     of intermediate quantities.
+ C                      of intermediate quantities.
  C     afFacMom      :: Advection of momentum term tracer parameter
  C     vfFacMom      :: Momentum viscosity tracer parameter
  C     pfFacMom      :: Momentum pressure forcing tracer parameter
-Line 697 
 C                           is to be rep
+Line 733 
 C                           is to be rep
  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     tCylIn        :: Temperature of the cylinder inner boundary
+ C     tCylOut       :: Temperature of the cylinder outer boundary
  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,
+      & delR, delRc, xgOrigin, ygOrigin,
-      & deltaT, deltaTmom, dTtracerLev, deltaTfreesurf, deltaTClock,
+      & deltaT, deltaTMom, dTtracerLev, deltaTFreeSurf, deltaTClock,
       & abEps, alph_AB, beta_AB,
-      & xgOrigin, ygOrigin, rSphere, recip_RSphere, f0, beta,
+      & rSphere, recip_rSphere, radius_fromHorizGrid,
-      & viscAh, viscAhW, viscAhMax,
+      & f0, beta, fPrime, omega, rotationPeriod,
+      & viscFacAdj, viscAh, viscAhW, viscAhMax,
       & viscAhGrid, viscAhGridMax, viscAhGridMin,
       & viscC2leith, viscC2leithD,
       & viscC2smag, viscC4smag,
-Line 715 
 C     psiEuler      :: Euler angle, rota
+Line 754 
 C     psiEuler      :: Euler angle, rota
       & viscA4Grid, viscA4GridMax, viscA4GridMin,
       & viscAhReMax, viscA4ReMax,
       & viscC4leith, viscC4leithD, viscArNr,
-      & diffKhT, diffK4T, diffKrNrT,
+      & diffKhT, diffK4T, diffKrNrT, diffKr4T,
-      & diffKhS, diffK4S, diffKrNrS,
+      & diffKhS, diffK4S, diffKrNrS, diffKr4S,
       & diffKrBL79surf, diffKrBL79deep, diffKrBL79scl, diffKrBL79Ho,
       & BL79LatVary,
       & diffKrBLEQsurf, diffKrBLEQdeep, diffKrBLEQscl, diffKrBLEQHo,
-Line 724 
 C     psiEuler      :: Euler angle, rota
+Line 763 
 C     psiEuler      :: Euler angle, rota
       & freeSurfFac, implicSurfPress, implicDiv2Dflow, implicitNHPress,
       & hFacMin, hFacMinDz, hFacInf, hFacSup,
       & gravity, recip_gravity, gBaro,
-      & rhonil, recip_rhonil, rhoConst, recip_rhoConst,
+      & rhoNil, rhoConst, recip_rhoConst,
       & rhoFacC, recip_rhoFacC, rhoFacF, recip_rhoFacF,
       & rhoConstFresh, rho1Ref, tRef, sRef, phiRef, dBdrRef,
       & rVel2wUnit, wUnit2rVel, mass2rUnit, rUnit2mass,
-Line 732 
 C     psiEuler      :: Euler angle, rota
+Line 771 
 C     psiEuler      :: Euler angle, rota
       & chkPtFreq, pChkPtFreq, dumpFreq, adjDumpFreq,
       & diagFreq, taveFreq, tave_lastIter, monitorFreq, adjMonitorFreq,
       & afFacMom, vfFacMom, pfFacMom, cfFacMom, foFacMom, mtFacMom,
-      & cosPower, cAdjFreq, omega, rotationPeriod,
+      & cosPower, cAdjFreq,
       & tauThetaClimRelax, tauSaltClimRelax, latBandClimRelax,
       & externForcingCycle, externForcingPeriod,
       & convertFW2Salt, temp_EvPrRn, salt_EvPrRn,
-Line 750 
 C     psiEuler      :: Euler angle, rota
+Line 789 
 C     psiEuler      :: Euler angle, rota
        _RL cg2dpcOffDFac
        _RL delR(Nr)
        _RL delRc(Nr+1)
-       _RL delX(Nx)
+       _RL xgOrigin
-       _RL delY(Ny)
+       _RL ygOrigin
        _RL deltaT
        _RL deltaTClock
-       _RL deltaTmom
+       _RL deltaTMom
        _RL dTtracerLev(Nr)
-       _RL deltaTfreesurf
+       _RL deltaTFreeSurf
        _RL abEps, alph_AB, beta_AB
-       _RL xgOrigin
-       _RL ygOrigin
        _RL rSphere
        _RL recip_rSphere
+       _RL radius_fromHorizGrid
        _RL f0
+       _RL beta
+       _RL fPrime
+       _RL omega
+       _RL rotationPeriod
        _RL freeSurfFac
        _RL implicSurfPress
        _RL implicDiv2Dflow
-Line 773 
 C     psiEuler      :: Euler angle, rota
+Line 815 
 C     psiEuler      :: Euler angle, rota
        _RL hFacMinDr
        _RL hFacInf
        _RL hFacSup
-       _RL beta
        _RL viscArNr(Nr)
+       _RL viscFacAdj
        _RL viscAh
        _RL viscAhW
        _RL viscAhD
-Line 796 
 C     psiEuler      :: Euler angle, rota
+Line 838 
 C     psiEuler      :: Euler angle, rota
        _RL viscC4leithD
        _RL viscC4smag
        _RL diffKhT
-       _RL diffKrNrT(Nr)
        _RL diffK4T
+       _RL diffKrNrT(Nr)
+       _RL diffKr4T(Nr)
        _RL diffKhS
-       _RL diffKrNrS(Nr)
        _RL diffK4S
+       _RL diffKrNrS(Nr)
+       _RL diffKr4S(Nr)
        _RL diffKrBL79surf
        _RL diffKrBL79deep
        _RL diffKrBL79scl
-Line 814 
 C     psiEuler      :: Euler angle, rota
+Line 858 
 C     psiEuler      :: Euler angle, rota
        _RL gravity
        _RL recip_gravity
        _RL gBaro
-       _RL rhonil,        recip_rhonil
+       _RL rhoNil
        _RL rhoConst,      recip_rhoConst
        _RL rhoFacC(Nr),   recip_rhoFacC(Nr)
        _RL rhoFacF(Nr+1), recip_rhoFacF(Nr+1)
-Line 846 
 C     psiEuler      :: Euler angle, rota
+Line 890 
 C     psiEuler      :: Euler angle, rota
        _RL mtFacMom
        _RL cosPower
        _RL cAdjFreq
-       _RL omega
-       _RL rotationPeriod
        _RL tauThetaClimRelax
        _RL tauSaltClimRelax
        _RL latBandClimRelax
-Line 869 
 C     psiEuler      :: Euler angle, rota
+Line 911 
 C     psiEuler      :: Euler angle, rota
        _RL bottomDragQuadratic
        _RL smoothAbsFuncRange
        _RL nh_Am2
-       _RL tCylIn
+       _RL tCylIn, tCylOut
-       _RL tCylOut
        _RL phiEuler, thetaEuler, psiEuler
  C--   COMMON /PARM_A/ Thermodynamics constants ?
-Line 910 
 C Logical flags for selecting packages
+Line 951 
 C Logical flags for selecting packages
        LOGICAL useKPP
        LOGICAL useGMRedi
        LOGICAL useDOWN_SLOPE
+       LOGICAL useBBL
        LOGICAL useCAL
        LOGICAL useEXF
        LOGICAL useBulkForce
-Line 917 
 C Logical flags for selecting packages
+Line 959 
 C Logical flags for selecting packages
        LOGICAL useCheapAML
        LOGICAL useGrdchk
        LOGICAL useSMOOTH
+       LOGICAL usePROFILES
        LOGICAL useECCO
        LOGICAL useSBO
        LOGICAL useFLT
-Line 925 
 C Logical flags for selecting packages
+Line 968 
 C Logical flags for selecting packages
        LOGICAL useRBCS
        LOGICAL useOffLine
        LOGICAL useMATRIX
+       LOGICAL useFRAZIL
        LOGICAL useSEAICE
        LOGICAL useSALT_PLUME
        LOGICAL useShelfIce
+       LOGICAL useStreamIce
        LOGICAL useICEFRONT
        LOGICAL useThSIce
        LOGICAL useATM2d
-Line 945 
 C Logical flags for selecting packages
+Line 990 
 C Logical flags for selecting packages
        COMMON /PARM_PACKAGES/
       &        useGAD, useOBCS, useSHAP_FILT, useZONAL_FILT,
       &        useOPPS, usePP81, useMY82, useGGL90, useKPP,
-      &        useGMRedi, useDOWN_SLOPE,
+      &        useGMRedi, useBBL, useDOWN_SLOPE,
       &        useCAL, useEXF, useBulkForce, useEBM, useCheapAML,
-      &        useGrdchk, useSMOOTH, useECCO, useSBO, useFLT,
+      &        useGrdchk,useSMOOTH,usePROFILES,useECCO,useSBO, useFLT,
       &        usePTRACERS, useGCHEM, useRBCS, useOffLine, useMATRIX,
-      &        useSEAICE, useSALT_PLUME, useShelfIce,
+      &        useFRAZIL, useSEAICE, useSALT_PLUME, useShelfIce,
-      &        useICEFRONT, useThSIce,
+      &        useStreamIce, useICEFRONT, useThSIce,
       &        useATM2D, useAIM, useLand, useFizhi, useGridAlt,
       &        useDiagnostics, useREGRID, useLayers, useMNC,
       &        useRunClock, useEMBED_FILES,
       &        useMYPACKAGE
  CEH3 ;;; Local Variables: ***
  CEH3 ;;; mode:fortran ***
  CEH3 ;;; End: ***

 Legend:



Removed from v.1.239
 


changed lines


 
Added in v.1.266
 Legend:



Removed from v.1.239
 


changed lines


 
Added in v.1.266
-Removed from v.1.239
+Added in v.1.266

	ViewVC Help
Powered by ViewVC 1.1.22