--- MITgcm/model/src/ini_dynvars.F	2001/05/29 14:01:37	1.2
+++ MITgcm/model/src/ini_dynvars.F	2007/05/31 16:29:15	1.17
@@ -1,38 +1,43 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/ini_dynvars.F,v 1.2 2001/05/29 14:01:37 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/ini_dynvars.F,v 1.17 2007/05/31 16:29:15 jmc Exp $
 C $Name:  $
 
 #include "CPP_OPTIONS.h"
 
+CBOP
+C     !ROUTINE: INI_DYNVARS
+C     !INTERFACE:
       SUBROUTINE INI_DYNVARS( myThid )
-C     /==========================================================\
-C     | SUBROUTINE INI_DYNVARS                                   |
-C     | o Initialise to zero all DYNVARS.h arrays                | 
-C     \==========================================================/
-      IMPLICIT NONE
-
-C     Sets all the State variables to zero.
-C     Sets all the Gs (arrays used for multi-level time-stepping)
-C     to zero.
+C     !DESCRIPTION: \bv
+C     *==========================================================*
+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)
+C     | to zero.
+C     *==========================================================*
+C     \ev
 
+C     !USES:
+      IMPLICIT NONE
 C     === Global variables ===
 #include "SIZE.h"
 #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 
       INTEGER myThid
-CEndOfInterface
 
+C     !LOCAL VARIABLES:
 C     == Local variables ==
 C     bi,bj  - Loop counters
 C     I,J,K
       INTEGER bi, bj
       INTEGER  I,  J, K
+CEOP
 
 C--   Over all tiles
       DO bj = myByLo(myThid), myByHi(myThid)
@@ -43,35 +48,34 @@
          DO J=1-Oly,sNy+Oly
           DO I=1-Olx,sNx+Olx
 
-           uVel(I,J,K,bi,bj)=0.
-           vVel(I,J,K,bi,bj)=0.
-           wVel(I,J,K,bi,bj)=0.
-           theta(I,J,K,bi,bj)=0.
-           salt(I,J,K,bi,bj)=0.
-
-           gU(I,J,K,bi,bj)=0.
-           gV(I,J,K,bi,bj)=0.
-           gT(I,J,K,bi,bj)=0.
-           gS(I,J,K,bi,bj)=0.
-           gUnm1(I,J,K,bi,bj)=0.
-           gVnm1(I,J,K,bi,bj)=0.
-           gTnm1(I,J,K,bi,bj)=0.
-           gSnm1(I,J,K,bi,bj)=0.
-
-#ifdef INCLUDE_CD_CODE
-           guCD(I,J,K,bi,bj)=0.
-           gvCD(I,J,K,bi,bj)=0.
-           uNM1(I,J,K,bi,bj)=0.
-           vNM1(I,J,K,bi,bj)=0.
-           uVeld(I,J,K,bi,bj)=0.
-           vVeld(I,J,K,bi,bj)=0.
-#endif
-
-#ifdef ALLOW_NONHYDROSTATIC
-           gW(I,J,K,bi,bj)=0.
-           gWnm1(I,J,K,bi,bj)=0.
+           uVel(I,J,K,bi,bj)=0. _d 0
+           vVel(I,J,K,bi,bj)=0. _d 0
+           wVel(I,J,K,bi,bj)=0. _d 0
+           theta(I,J,K,bi,bj)=0. _d 0
+           salt(I,J,K,bi,bj)=0. _d 0
+
+           gU(I,J,K,bi,bj)=0. _d 0
+           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
+#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
+           IVDConvCount(i,j,k,bi,bj) = 0. _d 0
           ENDDO
          ENDDO
         ENDDO
@@ -79,8 +83,10 @@
 C-      2D arrays
         DO J=1-Oly,sNy+Oly
          DO I=1-Olx,sNx+Olx
-          etaN(I,J,bi,bj)=0.
-          etaNm1(I,J,bi,bj)=0.
+          etaN(I,J,bi,bj)=0. _d 0
+          etaH(I,J,bi,bj)=0. _d 0
+          phiHydLow(I,J,bi,bj)=0. _d 0
+          hMixLayer(I,J,bi,bj)=0. _d 0
          ENDDO
         ENDDO