--- MITgcm/model/inc/PARAMS.h	2004/04/06 01:44:25	1.108
+++ MITgcm/model/inc/PARAMS.h	2004/06/14 17:48:13	1.113
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.108 2004/04/06 01:44:25 edhill Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.113 2004/06/14 17:48:13 adcroft Exp $
 C $Name:  $
 C
 CBOP
@@ -213,6 +213,11 @@
 C     useSphereF    :: Coriolis parameter set to 2.omega.sin(phi)
 C     useCDscheme   :: use CD-scheme to calculate Coriolis terms.
 C     useJamartWetPoints :: Use wet-point method for Coriolis (Jamart and Ozer, 1986)
+C     useJamartMomAdv :: Use wet-point method for V.I. non-linear term
+C     SadournyCoriolis :: use the enstrophy conserving scheme by Sadourny
+C     upwindVorticity :: bias interpolation of vorticity in the Coriolis term
+C     highOrderVorticity :: use 3rd/4th order interp. of vorticity in Coriolis
+C     useAbsVorticity :: work with f+zeta in Coriolis terms
 C     implicitDiffusion :: Turns implicit vertical diffusion on
 C     implicitViscosity :: Turns implicit vertical viscosity on
 C     tempImplVertAdv :: Turns on implicit vertical advection for Temperature
@@ -257,7 +262,9 @@
      & metricTerms, usingSphericalPolarMTerms, useNHMTerms,
      & useConstantF, useBetaPlaneF, useSphereF,
      & useCDscheme,
-     & useEnergyConservingCoriolis, useJamartWetPoints,
+     & useEnergyConservingCoriolis, useJamartWetPoints, useJamartMomAdv,
+     & SadournyCoriolis, upwindVorticity, highOrderVorticity,
+     & useAbsVorticity,
      & implicitDiffusion, implicitViscosity,
      & tempImplVertAdv, saltImplVertAdv, momImplVertAdv,
      & multiDimAdvection, forcing_In_AB,
@@ -304,6 +311,11 @@
       LOGICAL useCDscheme
       LOGICAL useEnergyConservingCoriolis
       LOGICAL useJamartWetPoints
+      LOGICAL useJamartMomAdv
+      LOGICAL SadournyCoriolis
+      LOGICAL upwindVorticity
+      LOGICAL highOrderVorticity
+      LOGICAL useAbsVorticity
       LOGICAL implicitDiffusion
       LOGICAL implicitViscosity
       LOGICAL tempImplVertAdv 
@@ -380,12 +392,14 @@
 C                 momentum vertically ( units of r^2/s )
 C     viscA4    :: Biharmonic viscosity coeff. for mixing of
 C                 momentum laterally ( m^4/s )
+C     viscC2leith :: Leith non-dimensional viscosity factor
 C     viscAhMax :: Maximum eddy viscosity coeff. for mixing of
 C                 momentum laterally ( m^2/s )
 C     viscA4Max :: Maximum biharmonic viscosity coeff. for mixing of
 C                 momentum laterally ( m^4/s )
 C     viscAhGrid:: non-dimensional grid-size dependent viscosity
 C     viscA4Grid:: non-dimensional grid-size dependent bi-harmonic viscosity
+C     viscC4leith :: Leith non-dimensional viscosity factor
 C     diffKhT   :: Laplacian diffusion coeff. for mixing of
 C                 heat laterally ( m^2/s )
 C     diffKrT   :: Laplacian diffusion coeff. for mixing of
@@ -398,6 +412,10 @@
 C                 salt vertically ( units of r^2/s )
 C     diffK4S   :: Biharmonic diffusion coeff. for mixing of
 C                 salt laterally ( m^4/s )
+C     diffKrBL79surf :: T/S surface diffusivity (m^2/s) Bryan and Lewis, 1979
+C     diffKrBL79deep :: T/S deep diffusivity (m^2/s) Bryan and Lewis, 1979
+C     diffKrBL79scl  :: depth scale for arctan fn (m) Bryan and Lewis, 1979
+C     diffKrBL79Ho   :: depth offset for arctan fn (m) Bryan and Lewis, 1979
 C     deltaT    :: Default timestep ( s )
 C     deltaTClock  :: Timestep used as model "clock". This determines the
 C                    IO frequencies and is used in tagging output. It can
@@ -477,11 +495,12 @@
      & abeps, startTime, 
      & phiMin, thetaMin, rSphere, recip_RSphere, f0, beta,
      & fCori, fCoriG, fCoriCos,
-     & viscAh,  viscAhMax, viscAhGrid,
-     & viscA4,  viscA4Max, viscA4Grid,
+     & viscAh,  viscAhMax, viscAhGrid, viscC2leith,
+     & viscA4,  viscA4Max, viscA4Grid, viscC4leith,
      & viscAr, viscAstrain, viscAtension,
      & diffKhT, diffK4T, diffKrT,
      & diffKhS, diffK4S, diffKrS,
+     & diffKrBL79surf, diffKrBL79deep, diffKrBL79scl, diffKrBL79Ho,
      & delT, tauCD, rCD, freeSurfFac, implicSurfPress, implicDiv2Dflow,
      & hFacMin, hFacMinDz, hFacInf, hFacSup,
      & gravity, recip_Gravity, gBaro, rhonil, recip_rhonil, 
@@ -533,18 +552,24 @@
       _RL viscAh
       _RL viscAhMax
       _RL viscAhGrid
+      _RL viscC2leith
       _RL viscAstrain
       _RL viscAtension
       _RL viscAr
       _RL viscA4 
       _RL viscA4Max
       _RL viscA4Grid
+      _RL viscC4leith
       _RL diffKhT 
       _RL diffKrT
       _RL diffK4T 
       _RL diffKhS 
       _RL diffKrS
       _RL diffK4S 
+      _RL diffKrBL79surf
+      _RL diffKrBL79deep
+      _RL diffKrBL79scl
+      _RL diffKrBL79Ho
       _RL delt
       _RL tauCD
       _RL rCD
@@ -646,11 +671,12 @@
       LOGICAL usefizhi
       LOGICAL usegridalt
       LOGICAL usediagnostics
+      LOGICAL useEBM
       COMMON /PARM_PACKAGES/
      &        useKPP, useGMRedi, useOBCS, useAIM, useLand, useECCO, 
      &        useSHAP_FILT, useZONAL_FILT, useGrdchk, useFLT,
      &        usePTRACERS,  useSBO, useSEAICE, useThSIce, useBulkForce, 
-     &        usefizhi,  usegridalt, usediagnostics
+     &        usefizhi,  usegridalt, usediagnostics, useEBM
 
 C     Run-time flags for early-initialization of MNC
       LOGICAL