--- MITgcm/model/src/ini_dynvars.F	2003/10/28 22:57:59	1.11
+++ MITgcm/model/src/ini_dynvars.F	2010/02/17 23:39:32	1.23
@@ -1,7 +1,6 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/ini_dynvars.F,v 1.11 2003/10/28 22:57:59 edhill Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/ini_dynvars.F,v 1.23 2010/02/17 23:39:32 gforget Exp $
 C $Name:  $
 
-#include "PACKAGES_CONFIG.h"
 #include "CPP_OPTIONS.h"
 
 CBOP
@@ -10,8 +9,8 @@
       SUBROUTINE INI_DYNVARS( myThid )
 C     !DESCRIPTION: \bv
 C     *==========================================================*
-C     | SUBROUTINE INI_DYNVARS                                    
-C     | o Initialise to zero all DYNVARS.h arrays                  
+C     | SUBROUTINE INI_DYNVARS
+C     | o Initialise to zero all DYNVARS.h arrays
 C     *==========================================================*
 C     | Sets all the State variables to zero.
 C     | Sets all the Gs (arrays used for multi-level time-stepping)
@@ -26,21 +25,18 @@
 #include "EEPARAMS.h"
 #include "PARAMS.h"
 #include "DYNVARS.h"
-#ifdef ALLOW_NONHYDROSTATIC
-#include "GW.h"
-#endif
 
 C     !INPUT/OUTPUT PARAMETERS:
 C     == Routine arguments ==
-C     myThid -  Number of this instance of INI_UVEL 
+C     myThid  :: my Thread Id. number
       INTEGER myThid
 
 C     !LOCAL VARIABLES:
 C     == Local variables ==
-C     bi,bj  - Loop counters
-C     I,J,K
+C     bi,bj   :: tile indices
+C     I,J,K   :: loop index
       INTEGER bi, bj
-      INTEGER  I,  J, K
+      INTEGER I, J, K
 CEOP
 
 C--   Over all tiles
@@ -62,25 +58,27 @@
            gV(I,J,K,bi,bj)=0. _d 0
            gT(I,J,K,bi,bj)=0. _d 0
            gS(I,J,K,bi,bj)=0. _d 0
-           gUnm1(I,J,K,bi,bj)=0. _d 0
-           gVnm1(I,J,K,bi,bj)=0. _d 0
-           gTnm1(I,J,K,bi,bj)=0. _d 0
-           gSnm1(I,J,K,bi,bj)=0. _d 0
-
-#ifdef ALLOW_CD_CODE
-           uNM1(I,J,K,bi,bj)=0. _d 0
-           vNM1(I,J,K,bi,bj)=0. _d 0
-           uVeld(I,J,K,bi,bj)=0. _d 0
-           vVeld(I,J,K,bi,bj)=0. _d 0
-#endif
-
-#ifdef ALLOW_NONHYDROSTATIC
-ceh3 needs an IF ( useNONHYDROSTATIC ) THEN
-           gW(I,J,K,bi,bj)=0. _d 0
-           gWnm1(I,J,K,bi,bj)=0. _d 0
+#ifdef ALLOW_ADAMSBASHFORTH_3
+           guNm(I,J,K,bi,bj,1)=0. _d 0
+           gvNm(I,J,K,bi,bj,1)=0. _d 0
+           gtNm(I,J,K,bi,bj,1)=0. _d 0
+           gsNm(I,J,K,bi,bj,1)=0. _d 0
+           guNm(I,J,K,bi,bj,2)=0. _d 0
+           gvNm(I,J,K,bi,bj,2)=0. _d 0
+           gtNm(I,J,K,bi,bj,2)=0. _d 0
+           gsNm(I,J,K,bi,bj,2)=0. _d 0
+#else
+           guNm1(I,J,K,bi,bj) =0. _d 0
+           gvNm1(I,J,K,bi,bj) =0. _d 0
+           gtNm1(I,J,K,bi,bj) =0. _d 0
+           gsNm1(I,J,K,bi,bj) =0. _d 0
 #endif
-
            totPhiHyd(I,J,K,bi,bj)=0. _d 0
+           rhoInSitu(I,J,K,bi,bj)=0. _d 0
+           IVDConvCount(i,j,k,bi,bj) = 0. _d 0
+#ifdef ALLOW_ADDFLUID
+           addMass(I,J,K,bi,bj) = 0. _d 0
+#endif
           ENDDO
          ENDDO
         ENDDO
@@ -90,10 +88,8 @@
          DO I=1-Olx,sNx+Olx
           etaN(I,J,bi,bj)=0. _d 0
           etaH(I,J,bi,bj)=0. _d 0
-#ifdef ALLOW_CD_CODE
-          etaNm1(I,J,bi,bj)=0. _d 0
-#endif
           phiHydLow(I,J,bi,bj)=0. _d 0
+          hMixLayer(I,J,bi,bj)=0. _d 0
          ENDDO
         ENDDO