--- MITgcm/model/src/set_defaults.F	2002/03/07 14:09:02	1.34
+++ MITgcm/model/src/set_defaults.F	2004/06/02 13:23:55	1.61
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/set_defaults.F,v 1.34 2002/03/07 14:09:02 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/set_defaults.F,v 1.61 2004/06/02 13:23:55 adcroft Exp $
 C $Name:  $
 
 #include "CPP_OPTIONS.h"
@@ -31,6 +31,7 @@
 #include "SIZE.h"
 #include "EEPARAMS.h"
 #include "PARAMS.h"
+Cml#include "EOS.h"
 #include "GRID.h"
 
 C     !INPUT/OUTPUT PARAMETERS:
@@ -64,7 +65,7 @@
 
 C     Horizontal gridding
 C     In cartesian coords distances are in metres
-      usingCartesianGrid = .TRUE.
+      usingCartesianGrid = .FALSE.
       DO i=1,Nx
        delX(i) = UNSET_RL
       ENDDO
@@ -82,13 +83,21 @@
 C--   Set default "physical" parameters
       DO K =1,Nr
        tRef(K) = 30.D0 - FLOAT( K )
+Cml       sRef(K) = 35.D0
       ENDDO
       gravity             = 9.81D0
       rhoNil              = 999.8D0
+C-- jmc : the default is to set rhoConstFresh to rhoConst (=rhoNil by default)
+C         (so that the default produces same results as before)
+c     rhoConstFresh       = 999.8D0
       f0                  = 1.D-4
       beta                = 1.D-11
-      omega               = 2.D0 * PI / ( 3600.D0 * 24.D0 )
+C-    Always use 1 day in the past but should be 86164 (=86400*365.25/366.25)
+      rotationPeriod      = 86400. _d 0
       viscAh              = 0.D3
+      viscAhGrid          = 0.D0
+      viscAhMax           = 1.D21
+      viscC2leith         = 0.D0
       viscAstrain         = 0.D3
       viscAtension        = 0.D3
       diffKhT             = 0.D3
@@ -99,12 +108,15 @@
       diffKrTDefault      = 0.D-3
       diffKrSDefault      = 0.D-3
       viscA4              = 0.D11
+      viscA4Grid          = 0.D0
+      viscA4Max           = 1.D21
+      viscC4leith         = 0.D0
       diffK4T             = 0.D11
       diffK4S             = 0.D11
       cosPower            = 0.
       HeatCapacity_Cp     = 3994.D0
-      tAlpha              = 2.D-4
-      sBeta               = 7.4D-4
+Cml      tAlpha              = 2.D-4
+Cml      sBeta               = 7.4D-4
       eosType             = 'LINEAR'
       buoyancyRelation    = 'OCEANIC'
       hFacMin             = 1.D0
@@ -118,14 +130,25 @@
       momStepping         = .TRUE.
       vectorInvariantMomentum = .FALSE.
       tempStepping        = .TRUE.
+      tempAdvection       = .TRUE.
+      tempForcing         = .TRUE.
       saltStepping        = .TRUE.
+      saltAdvection       = .TRUE.
+      saltForcing         = .TRUE.
       tr1Stepping         = .FALSE.
       metricTerms         = .TRUE.
+      useNHMTerms         = .FALSE.
       implicitDiffusion   = .FALSE.
       implicitViscosity   = .FALSE.
+      momImplVertAdv      = .FALSE.
+      tempImplVertAdv     = .FALSE.
+      saltImplVertAdv     = .FALSE.
       nonHydrostatic      = .FALSE.
+      quasiHydrostatic    = .FALSE.
       globalFiles         = .FALSE.
+      useSingleCpuIO      = .FALSE.
       allowFreezing       = .FALSE.
+      useOldFreezing      = .FALSE.
       ivdc_kappa          = 0.D0
       groundAtK1          = .FALSE.
       bottomDragLinear    = 0.
@@ -138,8 +161,14 @@
       saltAdvScheme       = 2
       tracerAdvScheme     = 2
       multiDimAdvection   = .TRUE.
+      useCDscheme         = .FALSE.
       useEnergyConservingCoriolis = .FALSE.
       useJamartWetPoints  = .FALSE.
+      SadournyCoriolis    = .FALSE.
+      upwindVorticity     = .FALSE.
+      highOrderVorticity  = .FALSE.
+      useAbsVorticity     = .FALSE.
+      debugLevel          = debLevA
 
 C--   Set (free)surface-related parameters
       implicitFreeSurface = .TRUE.
@@ -149,18 +178,23 @@
       exactConserv        = .FALSE.
       uniformLin_PhiSurf  = .TRUE.
       nonlinFreeSurf      = 0
-      hFacInf             = 1.D0
-      hFacSup             = 1.D0
+      hFacInf             = 0.2 _d 0
+      hFacSup             = 2.0 _d 0
+      select_rStar        = 0
       useRealFreshWaterFlux = .FALSE.
       temp_EvPrRn = UNSET_RL
       salt_EvPrRn = 0.
       trac_EvPrRn = UNSET_RL
 
 C--   Atmospheric physical parameters (e.g.: EOS)
-      atm_po =  1.D5
-      atm_cp =  1004.D0
-      atm_kappa = 2.D0 / 7.D0
-      Integr_GeoPot = 2
+      celsius2K = 273.16 _d 0
+      atm_Po =  1. _d 5
+      atm_Cp = 1004. _d 0
+      atm_Rd = UNSET_RL
+      atm_kappa = 2. _d 0 / 7. _d 0
+      atm_Rq = 0. _d 0
+      integr_GeoPot = 2
+      selectFindRoSurf = 0
 
 C--   Elliptic solver parameters
       cg2dMaxIters       = 150
@@ -176,16 +210,20 @@
       deltaT            = 0.
       nIter0            = 0
       startTime         = deltaT*float(nIter0)
+      pickupSuff        = ' '
       nTimeSteps        = 0
       nEndIter          = nIter0+nTimeSteps
       endTime           = deltaT*float(nEndIter)
+      forcing_In_AB     = .TRUE.
       abEps             = 0.01
       pchkPtFreq        = deltaT*0
       chkPtFreq         = deltaT*0
       dumpFreq          = deltaT*0
+      adjDumpFreq       = deltaT*0
       diagFreq          = deltaT*0
       monitorFreq       = -1.
       taveFreq          = deltaT*0
+      tave_lastIter     = 0.5 _d 0
       writeStatePrec    = precFloat64
       writeBinaryPrec   = precFloat32
       readBinaryPrec    = precFloat32
@@ -217,8 +255,9 @@
       vVelInitFile    = ' '
       pSurfInitFile   = ' '
       dQdTFile        = ' '
+      ploadFile       = ' '
+      mdsioLocalDir   = ' '
 
 C
       RETURN
       END
-