--- MITgcm/model/inc/CPP_OPTIONS.h	2003/10/28 22:57:59	1.27
+++ MITgcm/model/inc/CPP_OPTIONS.h	2004/04/05 23:42:52	1.31
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.27 2003/10/28 22:57:59 edhill Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.31 2004/04/05 23:42:52 jmc Exp $
 C $Name:  $
 
 #ifndef CPP_OPTIONS_H
@@ -6,20 +6,9 @@
 
 C CPP flags controlling particular source code features
 
-C o Include/exclude temperature forcing code
-C#define  INCLUDE_T_FORCING_CODE
-
 C o Shortwave heating as extra term in external_forcing.F
-C Note: this should be a run-time option and not necessarily dependent on KPP
-#ifdef ALLOW_KPP
-#define  SHORTWAVE_HEATING
-#endif
-
-C o Include/exclude momentum forcing code
-#define INCLUDE_MOMENTUM_FORCING_CODE
-
-C o Include/exclude momentum eqn metric terms code
-#define INCLUDE_MOMENTUM_METRIC_TERM_CODE
+C Note: this should be a run-time option
+#undef SHORTWAVE_HEATING
 
 C o Include/exclude phi_hyd calculation code
 #define INCLUDE_PHIHYD_CALCULATION_CODE
@@ -30,6 +19,9 @@
 C o Include/exclude call to S/R CALC_DIFFUSIVITY
 #define INCLUDE_CALC_DIFFUSIVITY_CALL
 
+C o Include/exclude Implicit vertical advection code
+#define INCLUDE_IMPLVERTADV_CODE
+
 C o Include/exclude nonHydrostatic code
 #undef ALLOW_NONHYDROSTATIC
 
@@ -49,19 +41,18 @@
 C          because the old code did not have no-slip BCs
 #undef  OLD_ADV_BCS
 
-C o Use "OLD" UV geometry on sphere (definately *NOT* recommended)
-C   Note - only works with  #undef NO_SLIP_LATERAL  in calc_mom_rhs.F
-C          because the old code did not have no-slip BCs
-#undef  OLD_UV_GEOMETRY
-
 C o Execution environment support options
 #include "CPP_EEOPTIONS.h"
 
 C o Include/exclude code specific to the ECCO/SEALION version.
-#undef INCLUDE_ECCO_PACKAGE
-#ifdef INCLUDE_ECCO_PACKAGE
-#include "ECCO_CPPOPTIONS.h"
-#endif
+C   AUTODIFF or EXF package.
+C   Currently controled by a single header file
+C   For this to work, PACKAGES_CONFIG.h needs to be included!
+cph#if (defined (ALLOW_AUTODIFF) || \
+cph     defined (ALLOW_ECCO) || \
+cph     defined (ALLOW_EXF))
+cph# include "ECCO_CPPOPTIONS.h"
+cph#endif
 
 #endif /* CPP_OPTIONS_H */