--- MITgcm/verification/global_ocean.90x40x15/code_ad/GMREDI_OPTIONS.h	2003/01/13 19:41:30	1.5
+++ MITgcm/verification/global_ocean.90x40x15/code_ad/GMREDI_OPTIONS.h	2007/06/26 15:38:40	1.10
@@ -1,24 +1,27 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/global_ocean.90x40x15/code_ad/GMREDI_OPTIONS.h,v 1.5 2003/01/13 19:41:30 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/global_ocean.90x40x15/code_ad/GMREDI_OPTIONS.h,v 1.10 2007/06/26 15:38:40 heimbach Exp $
 C $Name:  $
 
 C CPP options file for GM/Redi package
 C
 C Use this file for selecting options within the GM/Redi package
 C
-C GM/Redi is enabled with ALLOW_GMREDI in CPP_OPTIONS.h
-
-#include "CPP_OPTIONS.h"
+#ifndef GMREDI_OPTIONS_H
+#define GMREDI_OPTIONS_H
+#include "PACKAGES_CONFIG.h"
 
 #ifdef ALLOW_GMREDI
 
+#include "CPP_OPTIONS.h"
+
 C Designed to simplify the Ajoint code:
 C  exclude the clipping/tapering part of the code that is not used
 #define GM_EXCLUDE_CLIPPING
 #define GM_EXCLUDE_AC02_TAP
-#undef  GM_EXCLUDE_TAPERING 
+#define GM_EXCLUDE_FM07_TAP
+#undef GM_EXCLUDE_TAPERING 
  
 C This allows to use Visbeck et al formulation to compute K_GM+Redi
-#define GM_VISBECK_VARIABLE_K
+#undef GM_VISBECK_VARIABLE_K
 
 C This allows the leading diagonal (top two rows) to be non-unity
 C (a feature required when tapering adiabatically).
@@ -34,3 +37,5 @@
 
 
 #endif /* ALLOW_GMREDI */
+#endif /* GMREDI_OPTIONS_H */
+