--- MITgcm/verification/bottom_ctrl_5x5/code_ad/GMREDI_OPTIONS.h	2011/07/13 23:01:22	1.3
+++ MITgcm/verification/bottom_ctrl_5x5/code_ad/GMREDI_OPTIONS.h	2011/12/24 01:17:51	1.4
@@ -1,27 +1,31 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/bottom_ctrl_5x5/code_ad/GMREDI_OPTIONS.h,v 1.3 2011/07/13 23:01:22 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/bottom_ctrl_5x5/code_ad/GMREDI_OPTIONS.h,v 1.4 2011/12/24 01:17:51 jmc Exp $
 C $Name:  $
 
 C CPP options file for GM/Redi package
-C
 C Use this file for selecting options within the GM/Redi package
 
 #ifndef GMREDI_OPTIONS_H
 #define GMREDI_OPTIONS_H
 #include "PACKAGES_CONFIG.h"
-#ifdef ALLOW_GMREDI
-
 #include "CPP_OPTIONS.h"
 
+#ifdef ALLOW_GMREDI
+C     Package-specific Options & Macros go here
+
 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
 #define GM_EXCLUDE_CLIPPING
-#define GM_EXCLUDE_AC02_TAP
 #define GM_EXCLUDE_FM07_TAP
+#define GM_EXCLUDE_AC02_TAP
 #undef GM_EXCLUDE_TAPERING
 #define GM_EXCLUDE_SUBMESO
 
 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).