--- MITgcm/pkg/autodiff/adcommon.h	2001/11/20 23:27:29	1.2
+++ MITgcm/pkg/autodiff/adcommon.h	2005/02/28 17:39:44	1.7
@@ -1,39 +1,20 @@
+C--   These common blocks are extracted from the
+C--   automatically created tangent linear code.
+C--   You need to make sure that they are up-to-date
+C--   (i.e. in right order), and customize them
+C--   accordingly.
+C--
+C--   heimbach@mit.edu 11-Jan-2001
 
-CBOP
-C     !ROUTINE: adcommon.h 
-C     !INTERFACE:
-C     include "adcommon.h "
-C     !DESCRIPTION: \bv
-C     *==========================================================*
-C     | CPP_EEMACROS.h                                            
-C     *==========================================================*
-C--   | common blocks of adjoint variables extracted from
-C     | TAMC-/TAF- generated code for use in adjoint support;
-C     | Make sure that adjoint common blocks below are up-to-date
-C     | w.r.t. current adjoint code.
-C     *==========================================================*
-C     | CPP_EEMACROS.h                                            
-C     *==========================================================*
-C     \ev
-CEOP
-
-WARNING:
-THESE LINES ARE MEANT TO PROVOKE A COMPILER CRASH.
-THIS IS ONLY A TEMPLATE FILE.
-YOU NEED TO CUSTOMIZE THIS TO YOUR RESPECTIVE SETUP,
-E.G. BY PLACING A COPY IN YOUR VERIFICATION DIRECTORY.
-IT IS IMPORTANT THAT YOU MAKE SURE THAT THE COMMON BLOCKS
-BELOW CORRESPOND TO THE COMMON BLOCKS IN THE AUTOMATICALLY
-CREATED ADJOINT CODE.
+#ifdef ALLOW_AUTODIFF_MONITOR
 
       common /addynvars_r/ 
-     &                     adetan, adetanm1, 
+     &                     adetan,
      &                     aduvel, advvel, adwvel, 
      &                     adtheta, adsalt, 
      &                     adgu, adgv, adgt, adgs, 
      &                     adgunm1, adgvnm1, adgtnm1, adgsnm1
       _RL adetan(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
-      _RL adetanm1(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
       _RL adgs(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
       _RL adgsnm1(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
       _RL adgt(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
@@ -48,45 +29,65 @@
       _RL advvel(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
       _RL adwvel(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
 
+#ifdef ALLOW_CD_CODE
       common /addynvars_cd/ 
      &                      aduveld, advveld,
+     &                       adetanm1, 
      &                      adunm1, advnm1, 
      &                      adgucd, adgvcd
       _RL aduveld(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
       _RL advveld(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
+      _RL adetanm1(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
       _RL adunm1(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
       _RL advnm1(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
       _RL adgucd(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
       _RL adgvcd(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
+#endif
 
       common /adffields/
-     &                   adfu, adfv, adqnet, adempmr, adsst, adsss
+     &                   adfu, adfv
+     &                 , adqnet, adempmr
+cph     &                 , adsst, adsss
       _RL adfu(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
       _RL adfv(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
       _RL adqnet(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
       _RL adempmr(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
-      _RL adsst(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
-      _RL adsss(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
-
-#ifdef ALLOW_TR10_CONTROL
-      common /adtr1_r/ 
-     &                 adtr1, adgtr1, adgtr1nm1
-      _RL adgtr1(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
-      _RL adgtr1nm1(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
-      _RL adtr1(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
-#endif
+cph      _RL adsst(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
+cph      _RL adsss(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
 
 #ifdef ALLOW_DIFFKR_CONTROL
-      common /addynvars_diffkr/ 
-     &                          addiffkr
-      _RL addiffkr(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
-#endif
+      COMMON /ADDYNVARS_DIFFKR/
+     &                       addiffKr
+      _RL  addiffKr (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+#endif 
+#if (defined (ALLOW_EDTAUX_CONTROL) || defined (ALLOW_EDTAUY_CONTROL))
+      double precision adeddytaux(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,
+     $nsy)
+      double precision adeddytauy(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,
+     $nsy)
+      common /adedtauffields/ adeddytaux, adeddytauy
 
-#ifdef ALLOW_KAPGM_CONTROL
-      common /addynvars_kapgm/ 
-     &                          adkapgm
-      _RL adkapgm(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
 #endif
 
+#ifdef ALLOW_EXF
+      _RL adhflux(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
+      _RL adsflux(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
+      common /adexf_hsflux_r/ adhflux, adsflux
+      _RL adustress(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
+      _RL advstress(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
+      common /adexf_stress_r/ adustress, advstress
+# ifdef ALLOW_ATEMP
+      _RL adatemp     (1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
+      _RL adaqh       (1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
+      _RL adlwflux    (1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
+      _RL adprecip    (1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
+      common /adexf_atm_temp_r/ adatemp, adaqh, adlwflux, adprecip
+# endif
+# ifdef ALLOW_ATM_WIND
+      _RL aduwind     (1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
+      _RL advwind     (1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
+      common /adexf_atm_wind_r/ aduwind, advwind
+# endif
+#endif
 
-
+#endif /* ALLOW_AUTODIFF_MONITOR */