--- MITgcm/verification/global_ocean.90x40x15/code_ad/CTRL_OPTIONS.h	2014/09/11 19:28:39	1.1
+++ MITgcm/verification/global_ocean.90x40x15/code_ad/CTRL_OPTIONS.h	2015/10/15 23:14:52	1.4
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/global_ocean.90x40x15/code_ad/CTRL_OPTIONS.h,v 1.1 2014/09/11 19:28:39 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/global_ocean.90x40x15/code_ad/CTRL_OPTIONS.h,v 1.4 2015/10/15 23:14:52 gforget Exp $
 C $Name:  $
 
 CBOP
@@ -32,42 +32,18 @@
 #undef EXCLUDE_CTRL_PACK
 #undef ALLOW_NONDIMENSIONAL_CONTROL_IO
 
-C       >>> Initial values.
-#define ALLOW_THETA0_CONTROL
-#define ALLOW_SALT0_CONTROL
-#undef ALLOW_TR10_CONTROL
-#define ALLOW_TAUU0_CONTROL
-#define ALLOW_TAUV0_CONTROL
-#define ALLOW_SFLUX0_CONTROL
-#define ALLOW_HFLUX0_CONTROL
-#undef ALLOW_SSS0_CONTROL
-#undef ALLOW_SST0_CONTROL
-
-C       >>> Surface fluxes.
-#undef ALLOW_HFLUX_CONTROL
-#undef ALLOW_SFLUX_CONTROL
-#undef ALLOW_USTRESS_CONTROL
-#undef ALLOW_VSTRESS_CONTROL
-#undef ALLOW_SWFLUX_CONTROL
-#undef ALLOW_LWFLUX_CONTROL
-
-C       >>> Atmospheric state.
-#undef ALLOW_ATEMP_CONTROL
-#undef ALLOW_AQH_CONTROL
-#undef ALLOW_UWIND_CONTROL
-#undef ALLOW_VWIND_CONTROL
-#undef ALLOW_PRECIP_CONTROL
-
 C       >>> Other Control.
 #define ALLOW_DIFFKR_CONTROL
 #define ALLOW_KAPGM_CONTROL
+#define ALLOW_KAPGM_CONTROL_OLD
 #define ALLOW_KAPREDI_CONTROL
+#define ALLOW_KAPREDI_CONTROL_OLD
 #define ALLOW_BOTTOMDRAG_CONTROL
 
 C       >>> Generic Control.
 #define ALLOW_GENARR2D_CONTROL
-#undef ALLOW_GENARR3D_CONTROL
-#undef ALLOW_GENTIM2D_CONTROL
+#define ALLOW_GENARR3D_CONTROL
+#define ALLOW_GENTIM2D_CONTROL
 
 C  o Rotation of wind/stress controls adjustments
 C    from Eastward/Northward to model grid directions