--- MITgcm/model/inc/DYNVARS.h	1998/04/24 02:11:36	1.2
+++ MITgcm/model/inc/DYNVARS.h	2001/05/29 14:01:36	1.13
@@ -1,4 +1,5 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/DYNVARS.h,v 1.2 1998/04/24 02:11:36 cnh Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/DYNVARS.h,v 1.13 2001/05/29 14:01:36 adcroft Exp $
+C $Name:  $
 C
 C     /==========================================================\
 C     | DYNVARS.h                                                |
@@ -8,29 +9,43 @@
 C     | each prognostic variable.                                |
 C     \==========================================================/
 C
+C     etaN  - free-surface r-anomaly (r unit) at current time level
 C     uVel  - zonal velocity (m/s, i=1 held at western face)
 C     vVel  - meridional velocity (m/s, j=1 held at southern face)
 C     theta - potential temperature (oC, held at pressure/tracer point)
 C     salt  - salinity (ppt, held at pressure/tracer point)
-C     rho   - density ( kg/m^3 )
-      COMMON /DYNVARS_R/ uVel,vVel,theta,salt,rho,
+C     gX, gXNM1 - Time tendencies at current and prvious time levels.
+C     uVelD  - D grid zonal velocity
+C     vVelD  - D grid meridional velocity
+
+      COMMON /DYNVARS_R/
+     &                   etaN,etaNm1,
+     &                   uVel,vVel,wVel,theta,salt,
      &                   gu,gv,gt,gs,guNm1,gvNm1,gtNm1,gsNm1
-CcnhDebugStarts
-Cdbg &                   ,phSave
-CcnhDebugEnds
-      _RL  uVel (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  vVel (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  theta(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  salt (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  rho  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  gu(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  gv(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  gt(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  gs(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  guNm1(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  gvNm1(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  gtNm1(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-      _RL  gsNm1(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-CcnhDebugStarts
-Cdbg  _RL  phSave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz,nSx,nSy)
-CcnhDebugEnds
+      _RL  etaN  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+      _RL  etaNm1(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+      _RL  uVel (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  vVel (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  wVel (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  theta(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  salt (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  gu(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  gv(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  gt(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  gs(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  guNm1(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  gvNm1(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  gtNm1(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  gsNm1(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+#ifdef INCLUDE_CD_CODE
+      COMMON /DYNVARS_CD/ 
+     &                   uVelD, vVelD,
+     &                   uNM1,  vNM1,
+     &                   guCD, gvCD
+      _RL  uVeld (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  vVeld (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  uNm1  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  vNm1  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  guCD  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RL  gvCD  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+#endif