--- MITgcm/pkg/generic_advdiff/GAD_OPTIONS.h	2001/09/19 20:45:09	1.2
+++ MITgcm/pkg/generic_advdiff/GAD_OPTIONS.h	2001/09/28 02:26:57	1.3
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/generic_advdiff/GAD_OPTIONS.h,v 1.2 2001/09/19 20:45:09 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/generic_advdiff/GAD_OPTIONS.h,v 1.3 2001/09/28 02:26:57 adcroft Exp $
 C $Name:  $
 
 CBOP
@@ -19,10 +19,8 @@
 
 #include "CPP_OPTIONS.h"
 
-ccc#ifdef ALLOW_GAD
-
-C This turns on the flux limiter terms
-#define GAD_USE_FLUX_LIMITER
+#ifndef __GAD_OPTIONS
+#ifndef DISABLE_GENERIC_ADVDIFF
 
 C The selects the form of COSINE(lat) scaling of bi-harmonic term.
 C *only for use on a lat-lon grid*
@@ -32,5 +30,18 @@
 C using the COSINE(lat) scaling.
 #undef  ISOTROPIC_COS_SCALING
 
-
-ccc#endif /* ALLOW_GAD */
+C As of checkpoint41, the inclusion of multi-dimensional advection
+C introduces excessive recomputation/storage for the adjoint.
+C We disable it here using CPP because run-time flags are insufficient.
+#ifdef ALLOW_AUTODIFF_TAMC
+#define DISABLE_MULTIDIM_ADVECTION
+#endif
+
+#else
+
+C If GAD is disabled then so is multi-dimensional advection
+#define DISABLE_MULTIDIM_ADVECTION
+
+#endif /* DISABLE_GENERIC_ADVDIFF */
+#define __GAD_OPTIONS
+#endif /* __GAD_OPTIONS */