--- MITgcm_contrib/dgoldberg/shelfice/shelfice_thermodynamics.F	2014/08/27 19:26:17	1.1
+++ MITgcm_contrib/dgoldberg/shelfice/shelfice_thermodynamics.F	2014/12/14 18:48:40	1.2
@@ -1,11 +1,18 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/shelfice/shelfice_thermodynamics.F,v 1.1 2014/08/27 19:26:17 dgoldberg Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/shelfice/shelfice_thermodynamics.F,v 1.2 2014/12/14 18:48:40 dgoldberg Exp $
 C $Name:  $
 
 #include "SHELFICE_OPTIONS.h"
+#ifdef ALLOW_AUTODIFF
+# include "AUTODIFF_OPTIONS.h"
+#endif
+#ifdef ALLOW_CTRL
+# include "CTRL_OPTIONS.h"
+#endif
 #ifdef ALLOW_STREAMICE
 # include "STREAMICE_OPTIONS.h"
 #endif
 
+
 CBOP
 C     !ROUTINE: SHELFICE_THERMODYNAMICS
 C     !INTERFACE:
@@ -33,6 +40,7 @@
 #include "DYNVARS.h"
 #include "FFIELDS.h"
 #include "SHELFICE.h"
+#include "SHELFICE_COST.h"
 #ifdef ALLOW_AUTODIFF
 # include "CTRL_SIZE.h"
 # include "ctrl.h"
@@ -115,7 +123,7 @@
 C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
 
 #ifdef SHI_ALLOW_GAMMAFRICT
-#ifdef ALLOW_AUTODIFF_TAMC
+#ifdef ALLOW_AUTODIFF
 C     re-initialize here again, curtesy to TAF
       DO bj = myByLo(myThid), myByHi(myThid)
        DO bi = myBxLo(myThid), myBxHi(myThid)
@@ -127,7 +135,7 @@
         ENDDO
        ENDDO
       ENDDO
-#endif /* ALLOW_AUTODIFF_TAMC */
+#endif /* ALLOW_AUTODIFF */
       IF ( SHELFICEuseGammaFrict ) THEN
 C     Implement friction velocity-dependent transfer coefficient
 C     of Holland and Jenkins, JPO, 1999
@@ -143,7 +151,7 @@
        etastar = 1. _d 0
        gammaTurbConst  = 1. _d 0 / (2. _d 0 * shiZetaN*etastar)
      &      - recip_shiKarman
-#ifdef ALLOW_AUTODIFF_TAMC
+#ifdef ALLOW_AUTODIFF
        DO bj = myByLo(myThid), myByHi(myThid)
         DO bi = myBxLo(myThid), myBxHi(myThid)
          DO J = 1-OLy,sNy+OLy
@@ -154,7 +162,7 @@
          ENDDO
         ENDDO
        ENDDO
-#endif /* ALLOW_AUTODIFF_TAMC */
+#endif /* ALLOW_AUTODIFF */
       ENDIF
 #endif /* SHI_ALLOW_GAMMAFRICT */
 
@@ -214,12 +222,15 @@
         ENDDO
        ENDDO
       ENDDO
-      CALL CTRL_GET_GEN (
+#ifdef ALLOW_CTRL
+      if (useCTRL) CALL CTRL_GET_GEN (
      &     xx_shifwflx_file, xx_shifwflxstartdate, xx_shifwflxperiod,
      &     maskSHI, xx_shifwflx_loc, xx_shifwflx0, xx_shifwflx1,
      &     xx_shifwflx_dummy,
      &     xx_shifwflx_remo_intercept, xx_shifwflx_remo_slope,
+     &     wshifwflx,
      &     myTime, myIter, myThid )
+#endif
 #endif /* ALLOW_SHIFWFLX_CONTROL */
       DO bj = myByLo(myThid), myByHi(myThid)
        DO bi = myBxLo(myThid), myBxHi(myThid)
@@ -527,8 +538,8 @@
            if (streamice_hmask(i,j,bi,bj).eq.1 .or.
      &         streamice_hmask(i,j,bi,bj).eq.2) then
 
-            shelficeMass(i,j,bi,bj) = 
-     &       H_streamice(I,J,bi,bj) * streamice_density 
+            shelficeMass(i,j,bi,bj) =
+     &       H_streamice(I,J,bi,bj) * streamice_density
 
            endif
 
@@ -556,10 +567,9 @@
        ENDDO
 c     ENDIF
 #endif /* ndef ALLOW_AUTODIFF */
-      print *, "GOT HERE 0"
+
 #ifdef ALLOW_DIAGNOSTICS
       IF ( useDiagnostics ) THEN
-        print *, "GOT HERE 1"
        CALL DIAGNOSTICS_FILL_RS(shelfIceFreshWaterFlux,'SHIfwFlx',
      &      0,1,0,1,1,myThid)
        CALL DIAGNOSTICS_FILL_RS(shelfIceHeatFlux,      'SHIhtFlx',
@@ -577,7 +587,6 @@
      &      0,1,0,1,1,myThid)
        CALL DIAGNOSTICS_FILL(shiTransCoeffS,'SHIgammS',
      &      0,1,0,1,1,myThid)
-       print *, "GOT HERE 2"
       ENDIF
 #endif /* ALLOW_DIAGNOSTICS */