--- MITgcm_contrib/submesoscale/code/GMREDI_OPTIONS.h	2008/05/30 22:13:42	1.2
+++ MITgcm_contrib/submesoscale/code/GMREDI_OPTIONS.h	2010/03/19 19:37:48	1.3
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/submesoscale/code/GMREDI_OPTIONS.h,v 1.2 2008/05/30 22:13:42 dimitri Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/submesoscale/code/GMREDI_OPTIONS.h,v 1.3 2010/03/19 19:37:48 dimitri Exp $
 C $Name:  $
 
 C CPP options file for GM/Redi package
@@ -13,13 +13,18 @@
 #include "CPP_OPTIONS.h"
 
 C Designed to simplify the Ajoint code:
-C  exclude the clipping/tapering part of the code that is not used
+C #define GMREDI_WITH_STABLE_ADJOINT
+C -- exclude the clipping/tapering part of the code that is not used
 C #define GM_EXCLUDE_CLIPPING
+C #define GM_EXCLUDE_FM07_TAP
 C #define GM_EXCLUDE_AC02_TAP
 C #define GM_EXCLUDE_TAPERING
- 
+
 C This allows to use Visbeck et al formulation to compute K_GM+Redi
 #undef GM_VISBECK_VARIABLE_K
+C Use old calculation (before 2007/05/24) of Visbeck etal K_GM+Redi
+C (which depends on tapering scheme)
+#undef OLD_VISBECK_CALC
 
 C This allows the leading diagonal (top two rows) to be non-unity
 C (a feature required when tapering adiabatically).