--- MITgcm/model/inc/PARAMS.h	2001/05/30 19:33:18	1.53
+++ MITgcm/model/inc/PARAMS.h	2001/07/13 14:15:29	1.56
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.53 2001/05/30 19:33:18 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.56 2001/07/13 14:15:29 heimbach Exp $
 C $Name:  $
 C
 C     /==========================================================\
@@ -47,6 +47,8 @@
 C     checkPtSuff - List of checkpoint file suffices
 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     hydrogThetaFile - File containing initial hydrographic data for potential
 C                       temperature.
 C     hydrogSaltFile  - File containing initial hydrographic data for salinity.
@@ -63,14 +65,15 @@
 C     buoyancyRelation - Flag used to indicate which relation to use to
 C                        get buoyancy.
       COMMON /PARM_C/ checkPtSuff,
-     &                bathyFile, hydrogThetaFile, hydrogSaltFile,
+     &                bathyFile, topoFile,
+     &                hydrogThetaFile, hydrogSaltFile,
      &                zonalWindFile, meridWindFile, thetaClimFile,
      &                saltClimFile, buoyancyRelation,
      &                EmPmRfile, surfQfile, surfQswfile,
      &                uVelInitFile, vVelInitFile, pSurfInitFile,
      &                dQdTfile
       CHARACTER*(5) checkPtSuff(maxNoChkptLev)
-      CHARACTER*(MAX_LEN_FNAM) bathyFile
+      CHARACTER*(MAX_LEN_FNAM) bathyFile, topoFile
       CHARACTER*(MAX_LEN_FNAM) hydrogThetaFile
       CHARACTER*(MAX_LEN_FNAM) hydrogSaltFile
       CHARACTER*(MAX_LEN_FNAM) zonalWindFile
@@ -103,6 +106,8 @@
 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
 
       COMMON /PARM_I/
      &        cg2dMaxIters,
@@ -113,6 +118,7 @@
      &        numStepsPerPickup,
      &        writeStatePrec, nCheckLev,
      &        writeBinaryPrec, readBinaryPrec,
+     &        nonlinFreeSurf,
      &        zonal_filt_sinpow, zonal_filt_cospow
       INTEGER cg2dMaxIters
       INTEGER cg2dChkResFreq
@@ -126,6 +132,7 @@
       INTEGER writeBinaryPrec
       INTEGER readBinaryPrec
       INTEGER nCheckLev
+      INTEGER nonlinFreeSurf
       INTEGER zonal_filt_sinpow
       INTEGER zonal_filt_cospow
 
@@ -160,11 +167,13 @@
 C                     and off.
 C     rigidLid            - Set to true to use rigid lid
 C     implicitFreeSurface - Set to true to use implcit free surface
-C     exactConserv   -   Set to true to conserve exactly the total Volume
-C     nonlinFreeSurf -   Set to true to use non-linear free surface
+C     exactConserv        - Set to true to conserve exactly the total Volume
+C     uniformLin_PhiSurf  - Set to true to use a uniform Bo_surf in the
+C                           linear relation Phi_surf = Bo_surf*eta
 C     momStepping   - Turns momentum equation time-stepping off
 C     tempStepping  - Turns temperature equation time-stepping off
 C     saltStepping  - Turns salinity equation time-stepping off
+C     tr1Stepping   - Turns passive tracer 1 time-stepping on/off
 C     useConstantF  - Coriolis parameter set to f0
 C     useBetaPlaneF - Coriolis parameter set to f0 + beta.y
 C     useSphereF    - Coriolis parameter set to 2.omega.sin(phi)
@@ -190,16 +199,17 @@
      & momViscosity, momAdvection, momForcing, useCoriolis, 
      & momPressureForcing,tempDiffusion, tempAdvection, tempForcing,
      & saltDiffusion, saltAdvection, saltForcing,
-     & rigidLid, implicitFreeSurface, exactConserv, nonlinFreeSurf,
-     & momStepping, tempStepping, saltStepping,
+     & rigidLid, implicitFreeSurface, exactConserv, uniformLin_PhiSurf,
+     & momStepping, tempStepping, saltStepping, tr1Stepping,
      & metricTerms, usingSphericalPolarMTerms,
      & useConstantF, useBetaPlaneF, useSphereF,
      & implicitDiffusion, implicitViscosity,
-     & doThetaClimRelax, doSaltClimRelax,
+     & doThetaClimRelax, doSaltClimRelax, doTr1ClimRelax, 
      & periodicExternalForcing, usingPCoords, usingZCoords,
      & nonHydrostatic, globalFiles,
      & allowFreezing, groundAtK1,
-     & usePickupBeforeC35
+     & usePickupBeforeC35, debugMode,
+     & readPickupWithTracer, writePickupWithTracer
       LOGICAL usingCartesianGrid
       LOGICAL usingSphericalPolarGrid
       LOGICAL usingCurvilinearGrid
@@ -221,10 +231,11 @@
       LOGICAL rigidLid
       LOGICAL implicitFreeSurface
       LOGICAL exactConserv
-      LOGICAL nonlinFreeSurf
+      LOGICAL uniformLin_PhiSurf
       LOGICAL momStepping
       LOGICAL tempStepping
       LOGICAL saltStepping
+      LOGICAL tr1Stepping
       LOGICAL metricTerms
       LOGICAL useConstantF
       LOGICAL useBetaPlaneF
@@ -233,6 +244,7 @@
       LOGICAL implicitViscosity
       LOGICAL doThetaClimRelax
       LOGICAL doSaltClimRelax
+      LOGICAL doTr1ClimRelax
       LOGICAL periodicExternalForcing
       LOGICAL usingPCoords
       LOGICAL usingZCoords
@@ -241,6 +253,9 @@
       LOGICAL allowFreezing
       LOGICAL groundAtK1
       LOGICAL usePickupBeforeC35
+      LOGICAL debugMode
+      LOGICAL readPickupWithTracer
+      LOGICAL writePickupWithTracer
 
 C--   COMMON /PARM_R/ "Real" valued parameters used by the model.
 C     gg2dTargetResidual
@@ -387,9 +402,10 @@
      & recip_rhoConst, rhoConst, tRef, sRef,
      & endTime, chkPtFreq, pchkPtFreq, dumpFreq, taveFreq, monitorFreq,
      & afFacMom, vfFacMom, pfFacMom, cfFacMom, foFacMom, mtFacMom,
-     & cosPower,
-     & cAdjFreq, omega, tauThetaClimRelax, lambdaThetaClimRelax,
+     & cosPower, cAdjFreq, omega, 
+     & tauThetaClimRelax, lambdaThetaClimRelax,
      & tauSaltClimRelax, lambdaSaltClimRelax,
+     & tauTr1ClimRelax, lambdaTr1ClimRelax,
      & externForcingCycle, externForcingPeriod,
      & viscAp, diffKpT, diffKpS, hFacMinDr, hFacMinDp,
      & theta_S, specVol_S, horiVertRatio, recip_horiVertRatio,
@@ -476,6 +492,8 @@
       _RL lambdaThetaClimRelax
       _RL tauSaltClimRelax
       _RL lambdaSaltClimRelax
+      _RL tauTr1ClimRelax
+      _RL lambdaTr1ClimRelax
       _RL externForcingCycle
       _RL externForcingPeriod
       _RL horiVertRatio
@@ -504,13 +522,26 @@
       _RL sBeta
       character*(6) eosType
 
+C Atmospheric physical parameters (Ideal Gas EOS, ...)
+C     atm_po    - standard reference pressure
+C     atm_cp    - specific heat (Cp) of the (dry) air at constant pressure
+C     atm_kappa - kappa = R/Cp (R: constant of Ideal Gas EOS)
+C     Integr_GeoPot - option to select the way we integrate the geopotential
+C                     (still a subject of discussions ...) 
+      COMMON /PARM_ATM/ atm_cp, atm_kappa, atm_po,
+     &                  Integr_GeoPot
+      _RL atm_cp, atm_kappa, atm_po
+      INTEGER Integr_GeoPot
+
 C Logical flags for selecting packages
       LOGICAL useKPP
       LOGICAL useGMRedi
       LOGICAL useOBCS
       LOGICAL useAIM
+      LOGICAL useGrdchk
       LOGICAL useECCO
       LOGICAL useSHAP_FILT
       COMMON /PARM_PACKAGES/
-     &        useKPP, useGMRedi, useOBCS, useAIM, useECCO, useSHAP_FILT
+     &        useKPP, useGMRedi, useOBCS, useAIM, useECCO, 
+     &        useSHAP_FILT, useGrdchk