/[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.191 by jmc,
Tue Nov 28 22:44:44 2006 UTC
+revision 1.213 by mlosch,
Mon Feb 25 20:57:24 2008 UTC
 Line 43 
 C     UNSET_xxx :: Used to indicate vari
        INTEGER UNSET_I
        PARAMETER ( UNSET_I      = 123456789  )
- C     Checkpoint data
-       INTEGER maxNoChkptLev
-       PARAMETER ( maxNoChkptLev = 2 )
  C--   COMMON /PARM_C/ Character valued parameters used by the model.
- C     checkPtSuff :: List of checkpoint file suffices
+ C     buoyancyRelation :: Flag used to indicate which relation to use to
+ C                         get buoyancy.
+ C     eosType         :: choose the equation of state:
+ C                        LINEAR, POLY3, UNESCO, JMD95Z, JMD95P, MDJWF, IDEALGAS
+ C     pickupSuff      :: force to start from pickup files (even if nIter0=0)
+ C                        and read pickup files with this suffix (max 10 Char.)
+ C     mdsioLocalDir   :: read-write tiled file from/to this directory name
+ C                        (+ 4 digits Processor-Rank) instead of current dir.
  C     tRefFile      :: File containing reference Potential Temperat.  tRef (1.D)
  C     sRefFile      :: File containing reference salinity/spec.humid. sRef (1.D)
  C     rhoRefFile    :: File containing reference density profile rhoRef (1.D)
-Line 58 
 C     delXFile      :: File containing X
+Line 61 
 C     delXFile      :: File containing X
  C     delYFile      :: File containing Y-spacing grid definition (1.D array)
  C     horizGridFile :: File containing horizontal-grid definition
  C                        (only when using curvilinear_grid)
- C     bathyFile   :: File containing bathymetry. If not defined bathymetry
+ C     bathyFile       :: File containing bathymetry. If not defined bathymetry
- C                   is taken from inline function.
+ C                        is taken from inline function.
- C     topoFile    :: File containing the topography of the surface (unit=m)
+ C     topoFile        :: File containing the topography of the surface (unit=m)
- C                   (mainly used for the atmosphere = ground height).
+ C                        (mainly used for the atmosphere = ground height).
- C     shelfIceFile:: File containing the topography of the shelfice draught
+ C     shelfIceFile    :: File containing the topography of the shelfice draught
- C                    (unit=m)
+ C                        (unit=m)
- C     hydrogThetaFile :: File containing initial hydrographic data for potential
+ C     hydrogThetaFile :: File containing initial hydrographic data (3-D)
- C                       temperature.
+ C                        for potential temperature.
- C     hydrogSaltFile  :: File containing initial hydrographic data for salinity.
+ C     hydrogSaltFile  :: File containing initial hydrographic data (3-D)
+ C                        for salinity.
+ C     diffKrFile      :: File containing 3D specification of vertical diffusivity
  C     zonalWindFile   :: File containing zonal wind data
  C     meridWindFile   :: File containing meridional wind data
- C     thetaClimFile   :: File containing theta climataology used
+ C     thetaClimFile   :: File containing surface theta climataology used
  C                       in relaxation term -lambda(theta-theta*)
- C     saltClimFile    :: File containing salt climataology used
+ C     saltClimFile    :: File containing surface salt climataology used
  C                       in relaxation term -lambda(salt-salt*)
  C     surfQfile       :: File containing surface heat flux, excluding SW
  C                        (old version, kept for backward compatibility)
-Line 79 
 C     surfQnetFile    :: File containing
+Line 84 
 C     surfQnetFile    :: File containing
  C     surfQswFile     :: File containing surface shortwave radiation
  C     dQdTfile        :: File containing thermal relaxation coefficient
  C     EmPmRfile       :: File containing surface fresh water flux
+ C           NOTE: for backward compatibility EmPmRfile is specified in
+ C                 m/s when using external_fields_load.F.  It is converted
+ C                 to kg/m2/s by multiplying by rhoConstFresh.
  C     saltFluxFile    :: File containing surface salt flux
  C     pLoadFile       :: File containing pressure loading
  C     eddyTauxFile    :: File containing zonal Eddy stress data
  C     eddyTauyFile    :: File containing meridional Eddy stress data
- C     buoyancyRelation :: Flag used to indicate which relation to use to
- C                        get buoyancy.
- C     eosType         :: choose the equation of state:
- C                        LINEAR, POLY3, UNESCO, JMD95Z, JMD95P, MDJWF, IDEALGAS
  C     the_run_name    :: string identifying the name of the model "run"
-       COMMON /PARM_C/ checkPtSuff,
+       COMMON /PARM_C/
+      &                buoyancyRelation, eosType,
+      &                pickupSuff, mdsioLocalDir,
       &                tRefFile, sRefFile, rhoRefFile,
       &                delRFile, delRcFile,
       &                delXFile, delYFile, horizGridFile,
       &                bathyFile, topoFile, shelfIceFile,
-      &                hydrogThetaFile, hydrogSaltFile,
+      &                hydrogThetaFile, hydrogSaltFile, diffKrFile,
       &                zonalWindFile, meridWindFile, thetaClimFile,
-      &                saltClimFile, buoyancyRelation,
+      &                saltClimFile,
       &                EmPmRfile, saltFluxFile,
       &                surfQfile, surfQnetFile, surfQswFile,
       &                lambdaThetaFile, lambdaSaltFile,
       &                uVelInitFile, vVelInitFile, pSurfInitFile,
       &                dQdTfile, ploadFile,
       &                eddyTauxFile, eddyTauyFile,
-      &                eosType, pickupSuff,
-      &                mdsioLocalDir,
       &                the_run_name
-       CHARACTER*(5) checkPtSuff(maxNoChkptLev)
+       CHARACTER*(MAX_LEN_FNAM) buoyancyRelation
+       CHARACTER*(6)  eosType
+       CHARACTER*(10) pickupSuff
+       CHARACTER*(MAX_LEN_FNAM) mdsioLocalDir
        CHARACTER*(MAX_LEN_FNAM) tRefFile
        CHARACTER*(MAX_LEN_FNAM) sRefFile
        CHARACTER*(MAX_LEN_FNAM) rhoRefFile
-Line 115 
 C     the_run_name    :: string identify
+Line 122 
 C     the_run_name    :: string identify
        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) hydrogThetaFile, hydrogSaltFile
-       CHARACTER*(MAX_LEN_FNAM) hydrogSaltFile
+       CHARACTER*(MAX_LEN_FNAM) diffKrFile
        CHARACTER*(MAX_LEN_FNAM) zonalWindFile
        CHARACTER*(MAX_LEN_FNAM) meridWindFile
        CHARACTER*(MAX_LEN_FNAM) thetaClimFile
-Line 126 
 C     the_run_name    :: string identify
+Line 133 
 C     the_run_name    :: string identify
        CHARACTER*(MAX_LEN_FNAM) surfQswFile
        CHARACTER*(MAX_LEN_FNAM) EmPmRfile
        CHARACTER*(MAX_LEN_FNAM) saltFluxFile
-       CHARACTER*(MAX_LEN_FNAM) buoyancyRelation
        CHARACTER*(MAX_LEN_FNAM) uVelInitFile
        CHARACTER*(MAX_LEN_FNAM) vVelInitFile
        CHARACTER*(MAX_LEN_FNAM) pSurfInitFile
-Line 136 
 C     the_run_name    :: string identify
+Line 142 
 C     the_run_name    :: string identify
        CHARACTER*(MAX_LEN_FNAM) eddyTauyFile
        CHARACTER*(MAX_LEN_FNAM) lambdaThetaFile
        CHARACTER*(MAX_LEN_FNAM) lambdaSaltFile
-       CHARACTER*(MAX_LEN_FNAM) mdsioLocalDir
+       CHARACTER*(MAX_LEN_PREC/2) the_run_name
-       CHARACTER*(MAX_LEN_FNAM) the_run_name
-       CHARACTER*(6) eosType
-       CHARACTER*(10) pickupSuff
  C--   COMMON /PARM_I/ Integer valued parameters used by the model.
  C     cg2dMaxIters        :: Maximum number of iterations in the
-Line 154 
 C     cg3dChkResFreq      :: Frequency w
+Line 157 
 C     cg3dChkResFreq      :: Frequency w
  C                           in con. grad solver.
  C     nIter0              :: Start time-step number of for this run
  C     nTimeSteps          :: Number of timesteps to execute
- C     numStepsPerPickup   :: For offline setup. Frequency of pickup
- C                           of flow fields.
  C     writeStatePrec      :: Precision used for writing model state.
  C     writeBinaryPrec     :: Precision used for writing binary files
  C     readBinaryPrec      :: Precision used for reading binary files
- C     nCheckLev           :: Holds current checkpoint level
  C     nonlinFreeSurf      :: option related to non-linear free surface
  C                           =0 Linear free surface ; >0 Non-linear
  C     select_rStar        :: option related to r* vertical coordinate
 Line 173 
 C     tempVertAdvScheme   :: Temp. Vert.
  C     saltAdvScheme       :: Salt. Horiz.advection scheme selector
  C     saltVertAdvScheme   :: Salt. Vert. Advection scheme selector
  C     selectKEscheme      :: Kinetic Energy scheme selector (Vector Inv.)
+ C     monitorSelect       :: select group of variables to monitor
+ C                            =1 : dynvars ; =2 : + vort ; =3 : + surface
  C     debugLevel          :: debug level selector: higher -> more writing
        COMMON /PARM_I/
-Line 181 
 C     debugLevel          :: debug level
+Line 183 
 C     debugLevel          :: debug level
       &        cg3dMaxIters,
       &        cg3dChkResFreq,
       &        nIter0, nTimeSteps, nEndIter,
-      &        numStepsPerPickup,
+      &        writeStatePrec,
-      &        writeStatePrec, nCheckLev,
       &        writeBinaryPrec, readBinaryPrec,
       &        nonlinFreeSurf, select_rStar,
       &        momForcingOutAB, tracForcingOutAB,
       &        tempAdvScheme, tempVertAdvScheme,
       &        saltAdvScheme, saltVertAdvScheme,
       &        selectKEscheme,
-      &        debugLevel
+      &        monitorSelect, debugLevel
        INTEGER cg2dMaxIters
        INTEGER cg2dChkResFreq
        INTEGER cg2dPreCondFreq
-Line 198 
 C     debugLevel          :: debug level
+Line 199 
 C     debugLevel          :: debug level
        INTEGER nIter0
        INTEGER nTimeSteps
        INTEGER nEndIter
-       INTEGER numStepsPerPickup
        INTEGER writeStatePrec
        INTEGER writeBinaryPrec
        INTEGER readBinaryPrec
-       INTEGER nCheckLev
        INTEGER nonlinFreeSurf
        INTEGER select_rStar
        INTEGER momForcingOutAB, tracForcingOutAB
        INTEGER tempAdvScheme, tempVertAdvScheme
        INTEGER saltAdvScheme, saltVertAdvScheme
        INTEGER selectKEscheme
+       INTEGER monitorSelect
        INTEGER debugLevel
  C
 Line 222 
 C
  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     usingCurvilinearGrid :: If TRUE, use a curvilinear grid (to be provided)
+ C     deepAtmosphere :: deep model (drop the shallow-atmosphere approximation)
  C     no_slip_sides :: Impose "no-slip" at lateral boundaries.
  C     no_slip_bottom :: Impose "no-slip" at bottom boundary.
  C     momViscosity  :: Flag which turns momentum friction terms on and off.
-Line 240 
 C     tempAdvection :: Flag which turns
+Line 242 
 C     tempAdvection :: Flag which turns
  C                     and off.
  C     tempForcing   :: Flag which turns external forcing of temperature on
  C                     and off.
  C     saltAdvection :: Flag which turns advection of salinity on
  C                     and off.
  C     saltForcing   :: Flag which turns external forcing of salinity on
  C                     and off.
  C     useRealFreshWaterFlux :: if True (=Natural BCS), treats P+R-E flux
  C                         as a real Fresh Water (=> changes the Sea Level)
  C                         if F, converts P+R-E to salt flux (no SL effect)
  C     useFullLeith   :: Set to true to use full Leith viscosity(may be unstable
-Line 255 
 C     useStrainTensionVisc:: Set to true
+Line 257 
 C     useStrainTensionVisc:: Set to true
  C     rigidLid            :: Set to true to use rigid lid
  C     implicitFreeSurface :: Set to true to use implicit free surface
  C     exactConserv        :: Set to true to conserve exactly the total Volume
+ C     linFSConserveTr     :: Set to true to correct source/sink of tracer
+ C                            at the surface due to Linear Free Surface
  C     uniformLin_PhiSurf  :: Set to true to use a uniform Bo_surf in the
  C                           linear relation Phi_surf = Bo_surf*eta
  C     use3Dsolver   :: set to true to use 3-D pressure solver
-Line 285 
 C     useMultiDimAdvec  :: True if multi
+Line 289 
 C     useMultiDimAdvec  :: True if multi
  C     momDissip_In_AB   :: if False, put Dissipation tendency contribution
  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     pickupStrictlyMatch :: check and stop if pickup-file do not stricly match
+ C     startFromPickupAB2 :: with AB-3 code, start from an AB-2 pickup
+ C     usePickupBeforeC54 :: start from old-pickup files, generated with code from
+ C                           before checkpoint-54a, Jul 06, 2004.
  C     doThetaClimRelax :: Set true if relaxation to temperature
  C                        climatology is required.
  C     doSaltClimRelax  :: Set true if relaxation to salinity
-Line 316 
 C     useOldFreezing :: use the old vers
+Line 323 
 C     useOldFreezing :: use the old vers
  C     pickup_write_mdsio :: use mdsio to write pickups
  C     pickup_read_mdsio  :: use mdsio to read  pickups
  C     pickup_write_immed :: echo the pickup immediately (for conversion)
+ C     writePickupAtEnd   :: write pickup at the last timestep
  C     timeave_mdsio      :: use mdsio for timeave output
  C     snapshot_mdsio     :: use mdsio for "snapshot" (dumpfreq/diagfreq) output
  C     monitor_stdio      :: use stdio for monitor output
  C     dumpInitAndLast :: dumps model state to files at Initial (nIter0)
  C                        & Last iteration, in addition multiple of dumpFreq iter.
  C     balanceEmPmR    :: substract global mean of EmPmR at every time step
  C     balanceQnet     :: substract global mean of Qnet at every time step
  C     balancePrintMean:: print substracted global means to STDOUT
+ C     rotateGrid      :: rotate grid coordinates to geographical coordinates
+ C                        according to Euler angles phiEuler, thetaEuler, psiEuler
        COMMON /PARM_L/ usingCartesianGrid, usingSphericalPolarGrid,
       & usingCurvilinearGrid, usingCylindricalGrid,
-      & setInterFDr, setCenterDr,
+      & deepAtmosphere, setInterFDr, setCenterDr,
       & no_slip_sides,no_slip_bottom,
       & momViscosity, momAdvection, momForcing, useCoriolis,
       & momPressureForcing, vectorInvariantMomentum,
-Line 336 
 C     balancePrintMean:: print substract
+Line 346 
 C     balancePrintMean:: print substract
       & useRealFreshWaterFlux,
       & useFullLeith, useStrainTensionVisc,
       & useAreaViscLength,
-      & rigidLid, implicitFreeSurface, exactConserv, uniformLin_PhiSurf,
+      & rigidLid, implicitFreeSurface, exactConserv, linFSConserveTr,
+      & uniformLin_PhiSurf,
       & use3Dsolver, implicitIntGravWave, staggerTimeStep,
       & momStepping, tempStepping, saltStepping,
       & metricTerms, useNHMTerms,
-Line 355 
 C     balancePrintMean:: print substract
+Line 366 
 C     balancePrintMean:: print substract
       & usingPCoords, usingZCoords, useDynP_inEos_Zc,
       & nonHydrostatic, quasiHydrostatic, globalFiles, useSingleCpuIO,
       & allowFreezing, useOldFreezing,
-      & usePickupBeforeC35, usePickupBeforeC54, startFromPickupAB2,
+      & pickupStrictlyMatch, usePickupBeforeC54, startFromPickupAB2,
       & pickup_read_mdsio, pickup_write_mdsio, pickup_write_immed,
+      & writePickupAtEnd,
       & timeave_mdsio, snapshot_mdsio, monitor_stdio,
       & outputTypesInclusive, dumpInitAndLast, debugMode,
       & inAdMode, inAdTrue, inAdFalse, inAdExact,
-      & balanceEmPmR, balanceQnet, balancePrintMean
+      & balanceEmPmR, balanceQnet, balancePrintMean,
+      & rotateGrid
        LOGICAL usingCartesianGrid
        LOGICAL usingSphericalPolarGrid
        LOGICAL usingCylindricalGrid
        LOGICAL usingCurvilinearGrid
+       LOGICAL deepAtmosphere
        LOGICAL setInterFDr
        LOGICAL setCenterDr
        LOGICAL useNHMTerms
-Line 388 
 C     balancePrintMean:: print substract
+Line 402 
 C     balancePrintMean:: print substract
        LOGICAL rigidLid
        LOGICAL implicitFreeSurface
        LOGICAL exactConserv
+       LOGICAL linFSConserveTr
        LOGICAL uniformLin_PhiSurf
        LOGICAL use3Dsolver
        LOGICAL implicitIntGravWave
-Line 433 
 C     balancePrintMean:: print substract
+Line 448 
 C     balancePrintMean:: print substract
        LOGICAL useSingleCpuIO
        LOGICAL allowFreezing
        LOGICAL useOldFreezing
-       LOGICAL usePickupBeforeC35
+       LOGICAL pickupStrictlyMatch
        LOGICAL usePickupBeforeC54
        LOGICAL startFromPickupAB2
        LOGICAL dumpInitAndLast
        LOGICAL debugMode
        LOGICAL pickup_read_mdsio, pickup_write_mdsio
-       LOGICAL pickup_write_immed
+       LOGICAL pickup_write_immed, writePickupAtEnd
        LOGICAL timeave_mdsio, snapshot_mdsio, monitor_stdio
        LOGICAL outputTypesInclusive
        LOGICAL inAdMode, inAdTrue, inAdFalse, inAdExact
-Line 448 
 C     balancePrintMean:: print substract
+Line 463 
 C     balancePrintMean:: print substract
        LOGICAL balanceQnet
        LOGICAL balancePrintMean
+       LOGICAL rotateGrid
  C--   COMMON /PARM_R/ "Real" valued parameters used by the model.
  C     cg2dTargetResidual
  C          :: Target residual for cg2d solver; no unit (RHS normalisation)
-Line 487 
 C     phiRef    :: reference potential (
+Line 504 
 C     phiRef    :: reference potential (
  C     dBdrRef   :: vertical gradient of reference boyancy  [(m/s/r)^2)]:
  C               :: z-coord: = N^2_ref = Brunt-Vaissala frequency [s^-2]
  C               :: p-coord: = -(d.alpha/dp)_ref          [(m^2.s/kg)^2]
+ C     rVel2wUnit :: units conversion factor (Non-Hydrostatic code),
+ C                :: from r-coordinate vertical velocity to vertical velocity [m/s].
+ C                :: z-coord: = 1 ; p-coord: wSpeed [m/s] = rVel [Pa/s] * rVel2wUnit
+ C     wUnit2rVel :: units conversion factor (Non-Hydrostatic code),
+ C                :: from vertical velocity [m/s] to r-coordinate vertical velocity.
+ C                :: z-coord: = 1 ; p-coord: rVel [Pa/s] = wSpeed [m/s] * wUnit2rVel
+ C     mass2rUnit :: units conversion factor (surface forcing),
+ C                :: from mass per unit area [kg/m2] to vertical r-coordinate unit.
+ C                :: z-coord: = 1/rhoConst ( [kg/m2] / rho = [m] ) ;
+ C                :: p-coord: = gravity    ( [kg/m2] *  g = [Pa] ) ;
+ C     rUnit2mass :: units conversion factor (surface forcing),
+ C                :: from vertical r-coordinate unit to mass per unit area [kg/m2].
+ C                :: z-coord: = rhoConst  ( [m] * rho = [kg/m2] ) ;
+ C                :: p-coord: = 1/gravity ( [Pa] /  g = [kg/m2] ) ;
  C     phiMin    :: Latitude of southern most cell face.
  C     thetaMin  :: Longitude of western most cell face (this
  C                 is an "inert" parameter but it is included
-Line 556 
 C     diffKrBL79surf :: T/S surface diff
+Line 587 
 C     diffKrBL79surf :: T/S surface diff
  C     diffKrBL79deep :: T/S deep diffusivity (m^2/s) Bryan and Lewis, 1979
  C     diffKrBL79scl  :: depth scale for arctan fn (m) Bryan and Lewis, 1979
  C     diffKrBL79Ho   :: depth offset for arctan fn (m) Bryan and Lewis, 1979
+ C     BL79LatVary    :: polarwise of this latitude diffKrBL79 is applied with
+ C                       gradual transition to diffKrBLEQ towards Equator
+ C     diffKrBLEQsurf :: same as diffKrBL79surf but at Equator
+ C     diffKrBLEQdeep :: same as diffKrBL79deep but at Equator
+ C     diffKrBLEQscl  :: same as diffKrBL79scl but at Equator
+ C     diffKrBLEQHo   :: same as diffKrBL79Ho but at Equator
  C     deltaT    :: Default timestep ( s )
  C     deltaTClock  :: Timestep used as model "clock". This determines the
  C                    IO frequencies and is used in tagging output. It can
-Line 622 
 C     salt_EvPrRn :: salinity of Rain &
+Line 659 
 C     salt_EvPrRn :: salinity of Rain &
  C        (notes: a) tracer content of Rain/Evap only used if both
  C                     NonLin_FrSurf & useRealFreshWater are set.
  C                b) use model surface (local) value if set to UNSET_RL)
- C     horiVertRatio      :: Ratio on units in vertical to units in horizontal.
+ C     hMixCrit    :: criteria for mixed-layer diagnostic
- C     recip_horiVertRatio  ( 1 if horiz in m and vertical in m ).
+ C     ivdc_kappa  :: implicit vertical diffusivity for convection [m^2/s]
- C                          ( g*rho if horiz in m and vertical in Pa ).
+ C     Ro_SeaLevel :: standard position of Sea-Level in "R" coordinate, used as
- C     Ro_SeaLevel        :: standard position of Sea-Level in "R" coordinate, used as
+ C                    starting value (k=1) for vertical coordinate (rf(1)=Ro_SeaLevel)
- C                          starting value (k=1) for vertical coordinate (rf(1)=Ro_SeaLevel)
  C     sideDragFactor     :: side-drag scaling factor (used only if no_slip_sides)
  C                           (default=2: full drag ; =1: gives half-slip BC)
  C     bottomDragLinear    :: Linear    bottom-drag coefficient (units of [r]/s)
-Line 637 
 C                           is to be rep
+Line 673 
 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     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,
-Line 655 
 C                      (i.e. allows conv
+Line 694 
 C                      (i.e. allows conv
       & diffKhT, diffK4T, diffKrNrT,
       & diffKhS, diffK4S, diffKrNrS,
       & diffKrBL79surf, diffKrBL79deep, diffKrBL79scl, diffKrBL79Ho,
+      & BL79LatVary,
+      & diffKrBLEQsurf, diffKrBLEQdeep, diffKrBLEQscl, diffKrBLEQHo,
       & delT, tauCD, rCD, freeSurfFac, implicSurfPress, implicDiv2Dflow,
       & hFacMin, hFacMinDz, hFacInf, hFacSup,
-      & gravity, recip_Gravity, gBaro,
+      & gravity, recip_gravity, gBaro,
       & rhonil, recip_rhonil, rhoConst, recip_rhoConst,
       & rhoFacC, recip_rhoFacC, rhoFacF, recip_rhoFacF,
-      & rhoConstFresh, convertEmP2rUnit, tRef, sRef, phiRef, dBdrRef,
+      & rhoConstFresh, tRef, sRef, phiRef, dBdrRef,
+      & rVel2wUnit, wUnit2rVel, mass2rUnit, rUnit2mass,
       & baseTime, startTime, endTime,
       & chkPtFreq, pChkPtFreq, dumpFreq, adjDumpFreq,
       & diagFreq, taveFreq, tave_lastIter, monitorFreq, adjMonitorFreq,
-Line 671 
 C                      (i.e. allows conv
+Line 713 
 C                      (i.e. allows conv
       & externForcingCycle, externForcingPeriod,
       & convertFW2Salt, temp_EvPrRn, salt_EvPrRn,
       & hFacMinDr, hFacMinDp,
-      & horiVertRatio, recip_horiVertRatio,
+      & ivdc_kappa, hMixCriteria, Ro_SeaLevel,
-      & ivdc_kappa, Ro_SeaLevel,
       & sideDragFactor, bottomDragLinear, bottomDragQuadratic, nh_Am2,
       & smoothAbsFuncRange,
-      & tCylIn, tCylOut
+      & tCylIn, tCylOut,
+      & phiEuler, thetaEuler, psiEuler
        _RL cg2dTargetResidual
        _RL cg2dTargetResWunit
-Line 739 
 C                      (i.e. allows conv
+Line 781 
 C                      (i.e. allows conv
        _RL diffKrBL79deep
        _RL diffKrBL79scl
        _RL diffKrBL79Ho
+       _RL BL79LatVary
+       _RL diffKrBLEQsurf
+       _RL diffKrBLEQdeep
+       _RL diffKrBLEQscl
+       _RL diffKrBLEQHo
        _RL delt
        _RL tauCD
        _RL rCD
-Line 750 
 C                      (i.e. allows conv
+Line 797 
 C                      (i.e. allows conv
        _RL rhoFacC(Nr),   recip_rhoFacC(Nr)
        _RL rhoFacF(Nr+1), recip_rhoFacF(Nr+1)
        _RL rhoConstFresh
-       _RL convertEmP2rUnit
        _RL tRef(Nr)
        _RL sRef(Nr)
        _RL phiRef(2*Nr+1)
        _RL dBdrRef(Nr)
+       _RL rVel2wUnit(Nr+1), wUnit2rVel(Nr+1)
+       _RL mass2rUnit, rUnit2mass
        _RL baseTime
        _RL startTime
        _RL endTime
-Line 787 
 C                      (i.e. allows conv
+Line 835 
 C                      (i.e. allows conv
        _RL convertFW2Salt
        _RL temp_EvPrRn
        _RL salt_EvPrRn
-       _RL horiVertRatio
-       _RL recip_horiVertRatio
        _RL ivdc_kappa
+       _RL hMixCriteria
        _RL Ro_SeaLevel
        _RL sideDragFactor
        _RL bottomDragLinear
-Line 798 
 C                      (i.e. allows conv
+Line 845 
 C                      (i.e. allows conv
        _RL nh_Am2
        _RL tCylIn
        _RL tCylOut
+       _RL phiEuler, thetaEuler, psiEuler
  C--   COMMON /PARM_A/ Thermodynamics constants ?
        COMMON /PARM_A/ HeatCapacity_Cp,recip_Cp
-Line 830 
 C Logical flags for selecting packages
+Line 878 
 C Logical flags for selecting packages
        LOGICAL useMY82
        LOGICAL useGGL90
        LOGICAL useKPP
+       LOGICAL useGAD
        LOGICAL useGMRedi
        LOGICAL useOBCS
        LOGICAL useAIM
-Line 861 
 C Logical flags for selecting packages
+Line 910 
 C Logical flags for selecting packages
        LOGICAL useRunClock
        LOGICAL useEMBED_FILES
        LOGICAL useMYPACKAGE
+       LOGICAL useSALT_PLUME
        COMMON /PARM_PACKAGES/
       &        useOPPS, usePP81, useMY82, useGGL90, useKPP,
-      &        useGMRedi, useOBCS, useAIM, useLand,
+      &        useGAD, useGMRedi, useOBCS, useAIM, useLand,
       &        useCAL, useEXF, useEBM, useGrdchk, useECCO,
       &        useSHAP_FILT, useZONAL_FILT, useFLT,
       &        usePTRACERS, useGCHEM, useRBCS, useOffLine, useMATRIX,
       &        useSBO, useSEAICE, useShelfIce,
       &        useThSIce, useATM2D, useBulkForce,
       &        usefizhi, usegridalt, useDiagnostics, useMNC, useREGRID,
-      &        useRunClock, useEMBED_FILES, useMYPACKAGE
+      &        useRunClock, useEMBED_FILES, useMYPACKAGE, useSALT_PLUME
  CEH3 ;;; Local Variables: ***
  CEH3 ;;; mode:fortran ***

 Legend:



Removed from v.1.191
 


changed lines


 
Added in v.1.213
 Legend:



Removed from v.1.191
 


changed lines


 
Added in v.1.213
-Removed from v.1.191
+Added in v.1.213

	ViewVC Help
Powered by ViewVC 1.1.22