--- MITgcm/model/src/set_defaults.F	2000/06/21 19:18:59	1.10
+++ MITgcm/model/src/set_defaults.F	2001/06/06 14:55:45	1.21
@@ -1,4 +1,5 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/set_defaults.F,v 1.10 2000/06/21 19:18:59 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/set_defaults.F,v 1.21 2001/06/06 14:55:45 adcroft Exp $
+C $Name:  $
 
 #include "CPP_OPTIONS.h"
 
@@ -24,7 +25,6 @@
 #include "EEPARAMS.h"
 #include "PARAMS.h"
 #include "GRID.h"
-#include "CG2D.h"
 
 C     === Routine arguments ===
 C     myThid - Number of this instance of INI_PARMS
@@ -44,6 +44,7 @@
 C     Vertical gridding
       rkFacDefault         = 1.D0
       horiVertRatio        = 1.D0
+      Ro_SeaLevel = 0.
       DO k=1,Nr
        delRdefault(k) = 0.
       ENDDO
@@ -62,6 +63,8 @@
       phiMin               = 0.0
       thetaMin             = 0.
       rSphere              = 6370. * 1.D3
+C     General curvilinear coordinate system
+      usingCurvilinearGrid = .FALSE.
 
 C--   Set default "physical" parameters
       DO K =1,Nr
@@ -71,6 +74,7 @@
       rhoNil              = 999.8D0
       f0                  = 1.D-4
       beta                = 1.D-11
+      omega               = 2.D0 * PI / ( 3600.D0 * 24.D0 )
       viscAh              = 0.D3
       diffKhT             = 0.D3
       diffKhS             = 0.D3
@@ -90,8 +94,15 @@
       buoyancyRelation    = 'OCEANIC'
       implicitFreeSurface = .TRUE.
       rigidLid            = .FALSE.
+      implicSurfPress     = 1.D0
+      implicDiv2DFlow     = 1.D0
       hFacMin             = 1.D0
       hFacMinDrDefault    = 0.D0
+      exactConserv        = .FALSE.
+      nonlinFreeSurf      = .FALSE.
+      hFacInf             = 1.D0
+      hFacSup             = 1.D0
+      staggerTimeStep     = .FALSE.
       momViscosity        = .TRUE.
       momAdvection        = .TRUE.
       momForcing          = .TRUE.
@@ -100,18 +111,26 @@
       momStepping         = .TRUE.
       tempStepping        = .TRUE.
       saltStepping        = .TRUE.
-      metricTerms         = .FALSE.
+      metricTerms         = .TRUE.
       implicitDiffusion   = .FALSE.
       implicitViscosity   = .FALSE.
-      openBoundaries      = .FALSE.
       nonHydrostatic      = .FALSE.
       globalFiles         = .FALSE.
       allowFreezing       = .FALSE.
       ivdc_kappa          = 0.D0
+      groundAtK1          = .FALSE.
+      zonal_filt_lat      = 90.
+      zonal_filt_sinpow   = 2
+      zonal_filt_cospow   = 2
+      bottomDragLinear    = 0.
+      bottomDragQuadratic = 0.
+      usePickupBeforeC35  = .FALSE.
+      debugMode           = .FALSE.
 
 C--   Elliptic solver parameters
       cg2dMaxIters       = 150
       cg2dTargetResidual = 1.D-7
+      cg2dTargetResWunit = -1.
       cg2dChkResFreq     = 1
       cg2dpcOffDFac      = 0.51D0
       cg3dMaxIters       = 150
@@ -129,6 +148,7 @@
       pchkPtFreq        = deltaT*0
       chkPtFreq         = deltaT*0
       dumpFreq          = deltaT*0
+      monitorFreq       = -1.
       taveFreq          = deltaT*0
       writeStatePrec    = precFloat64
       writeBinaryPrec   = precFloat32
@@ -154,19 +174,11 @@
       saltClimFile    = ' '
       EmPmRfile       = ' '
       surfQfile       = ' '
+      surfQswfile     = ' '
       uVelInitFile    = ' '
       vVelInitFile    = ' '
       pSurfInitFile   = ' '
-
-C--   OBCS
-      DO I=1,Nx
-       OB_Jnorth(I)=0
-       OB_Jsouth(I)=0
-      ENDDO
-      DO J=1,Ny
-       OB_Ieast(J)=0
-       OB_Iwest(J)=0
-      ENDDO
+      dQdTFile        = ' '
 
 C
       RETURN