--- MITgcm/model/src/ini_dynvars.F	2001/11/08 20:57:51	1.6
+++ MITgcm/model/src/ini_dynvars.F	2003/10/30 12:00:41	1.12
@@ -1,6 +1,7 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/ini_dynvars.F,v 1.6 2001/11/08 20:57:51 heimbach Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/ini_dynvars.F,v 1.12 2003/10/30 12:00:41 edhill Exp $
 C $Name:  $
 
+#include "PACKAGES_CONFIG.h"
 #include "CPP_OPTIONS.h"
 
 CBOP
@@ -28,6 +29,9 @@
 #ifdef ALLOW_NONHYDROSTATIC
 #include "GW.h"
 #endif
+#ifdef ALLOW_CD_CODE
+#include "CD_CODE_VARS.h"
+#endif
 
 C     !INPUT/OUTPUT PARAMETERS:
 C     == Routine arguments ==
@@ -66,9 +70,7 @@
            gTnm1(I,J,K,bi,bj)=0. _d 0
            gSnm1(I,J,K,bi,bj)=0. _d 0
 
-#ifdef INCLUDE_CD_CODE
-           guCD(I,J,K,bi,bj)=0. _d 0
-           gvCD(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
@@ -76,10 +78,12 @@
 #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
 #endif
 
+           totPhiHyd(I,J,K,bi,bj)=0. _d 0
           ENDDO
          ENDDO
         ENDDO
@@ -89,9 +93,10 @@
          DO I=1-Olx,sNx+Olx
           etaN(I,J,bi,bj)=0. _d 0
           etaH(I,J,bi,bj)=0. _d 0
-#ifdef INCLUDE_CD_CODE
+#ifdef ALLOW_CD_CODE
           etaNm1(I,J,bi,bj)=0. _d 0
 #endif
+          phiHydLow(I,J,bi,bj)=0. _d 0
          ENDDO
         ENDDO