--- MITgcm/verification/lab_sea/input_ad/data	2006/12/18 23:49:52	1.2
+++ MITgcm/verification/lab_sea/input_ad/data	2012/04/28 22:28:00	1.15
@@ -12,13 +12,7 @@
 #   diffKzT         - Vertical temperature diffusivity                  (m^2/s)
 #   diffKhS         - Horizontal salt diffusivity                       (m^2/s)
 #   diffKzS         - Vertical salt diffusivity                         (m^2/s)
-#   f0              - Reference coriolis parameter,
-#                     south edge of f on beta plane                       (1/s)
-#   beta            - df/dy                                         (s^-1.m^-1)
-#   tAlpha          - Linear EOS thermal expansion coefficient           (1/oC)
-#   sBeta           - Linear EOS haline contraction coefficient         (1/ppt)
 #   gravity         - Acceleration due to gravity                       (m/s^2)
-#   gBaro           - Accel. due to gravity used in barotropic equation (m/s^2)
 #   rigidLid        - Set to true to use rigid lid
 #   implicitFreeSurface - Set to true to use implicit free surface
 #   eosType         - Flag for linear or polynomial equation of state
@@ -44,28 +38,34 @@
  diffKzT=1.46e-5,
  diffKhS=0.0,
  diffKzS=1.46e-5,
- beta=1.E-11,
- tAlpha=2.E-4,
- sBeta =7.4E-4,
  rigidLid=.FALSE.,
  implicitFreeSurface=.TRUE.,
  eosType='JMD95Z',
- readBinaryPrec=32,
- writeBinaryPrec=32,
  saltStepping=.TRUE.,
  tempStepping=.TRUE.,
  momStepping=.TRUE.,
  implicitDiffusion=.TRUE.,
  implicitViscosity=.TRUE.,
-#globalFiles=.TRUE.,
-#- not safe to use globalFiles in multi-processors runs; set instead useSingleCpuIO
- useSingleCpuIO=.FALSE.,
  allowFreezing=.FALSE.,
- HeatCapacity_Cp = 3986.D0
+#- set wrong celsius2K to reproduce old results:
+ celsius2K=273.16,
+ HeatCapacity_Cp = 3986.D0,
  gravity         = 9.8156,
- rhoNil          = 1027.D0
+ rhoConst        = 1027.D0,
+ rhoConstFresh   = 999.8,
  useCDscheme=.TRUE.,
  inAdExact=.TRUE.,
+#ph(
+ staggerTimeStep=.TRUE.,
+ multiDimAdvection=.TRUE.,
+ tempAdvScheme=30,
+ saltAdvScheme=30,
+#ph)
+#globalFiles=.TRUE.,
+#- not safe to use globalFiles in multi-processors runs; set instead useSingleCpuIO
+ useSingleCpuIO=.FALSE.,
+ readBinaryPrec=32,
+ writeBinaryPrec=32,
  &
 
 # Elliptic solver parameters
@@ -74,8 +74,8 @@
 #   cg2dTargetResidual - Solver target residual
 #
  &PARM02
- cg2dMaxIters=500,
- cg2dTargetResidual=1.D-8
+ cg2dMaxIters=1000,
+ cg2dTargetResidual=1.E-13,
  &
 
 # Time stepping parameters
@@ -96,44 +96,39 @@
  &PARM03
  tauCD=172800.,
  startTime=0.0,
- nTimeSteps=10,
+ nTimeSteps=4,
  deltaTmom=3600.0,
  deltaTtracer=3600.0,
  deltaTClock =3600.0,
  cAdjFreq=0.,
  abEps=0.1,
+ forcing_In_AB = .FALSE.,
  pChkptFreq=36000.,
  chkptFreq= 0.,
  dumpFreq = 0.,
- tavefreq = 36000.,
- tauSaltClimRelax = 4142330.,
- tauThetaClimRelax = 0.,
  monitorFreq=1.,
  adjMonitorFreq=1.,
-#forcing_In_AB = .FALSE.
- tracForcingOutAB=1,
+ adjDumpFreq=1.,
  &
 
 # Gridding parameters
 #
 #   usingSphericalPolarGrid - On/Off flag for spherical polar coordinates
-#   usingCartesianGrid      - On/Off flag for selecting cartesian coordinates
 #   delX                    - Zonal grid spacing         (degrees)
 #   delY                    - Meridional grid spacing    (degrees)
 #   delZ                    - Vertical grid spacing      (m)
-#   phiMin                  - Southern boundary latitude (degrees)
+#   ygOrigin                - Southern boundary latitude (degrees)
 #
  &PARM04
- usingCartesianGrid=.FALSE.,
  usingSphericalPolarGrid=.TRUE.,
  delX=20*2.E0,
  delY=16*2.E0,
  delZ= 10., 10., 15., 20., 20., 25., 35., 50., 75.,
        100., 150., 200., 275., 350., 415., 450.,
-       500., 500., 500., 500., 500., 500., 500.
- phimin=46.,
- thetamin=280.,
- rSphere         = 6371.D3
+       500., 500., 500., 500., 500., 500., 500.,
+ ygOrigin=46.,
+ xgOrigin=280.,
+ rSphere = 6371.D3,
  &
 
 # Input datasets