--- MITgcm/verification/lab_sea/code/CPP_OPTIONS.h	2003/10/09 04:19:31	1.5
+++ MITgcm/verification/lab_sea/code/CPP_OPTIONS.h	2003/10/09 22:30:43	1.6
@@ -1,109 +1,21 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/lab_sea/code/CPP_OPTIONS.h,v 1.5 2003/10/09 04:19:31 edhill dead $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/lab_sea/code/CPP_OPTIONS.h,v 1.6 2003/10/09 22:30:43 edhill Exp $
 C $Name:  $
-C
 
-CBOP
-C !ROUTINE: CPP_OPTIONS.h
-C !INTERFACE: 
-C include "CPP_OPTIONS.h"
-C !DESCRIPTION:
-C CPP flags controlling which code in included in the files that
-C will be compiled.
-CEOP
-
-C o Include/exclude code for AIM package
-#undef  ALLOW_AIM
-
-C o Include/exclude IERS Special Bureau for the Oceans diagnostics
-#define   ALLOW_SBO
+#include "PACKAGES_CONFIG.h"
 
-C o Include/exclude code for sea-ice model
-#define  ALLOW_SEAICE
-
-C o Include/exclude code for GM/Redi parameterization
-#define  ALLOW_GMREDI
-
-C o Include/exclude code for KPP mixing scheme
-#define  ALLOW_KPP
-
-C o Shortwave heating as extra term in external_forcing.F
-#ifdef ALLOW_KPP
-#define  SHORTWAVE_HEATING
-#endif
-
-C o Include/exclude code for Shapiro filters
-#undef  ALLOW_SHAP_FILT
+C CPP flags controlling particular source code features
 
 C o Include/exclude code for C-D grid method of integrating the 
 C   coriolis terms
-#define  INCLUDE_CD_CODE
-
-C o Include/exclude code for open-boundary conditions
-#undef  ALLOW_OBCS
-
-C o Include/exclude diagnostics package interface code
-#define  ALLOW_TIMEAVE
-
-C o Include/exclude zonal FFT filter code
-#undef  ALLOW_ZONAL_FILT
-
-C o Include/exclude temperature advection code
-#define  INCLUDE_T_ADVECTION_CODE
-#ifdef   INCLUDE_T_ADVECTION_CODE
-#define  _ADT(a)a
-#endif
-#ifndef  INCLUDE_T_ADVECTION_CODE
-#define  _ADT(a)
-#endif
-
-C o Include/exclude temperature diffusion code
-#define  INCLUDE_T_DIFFUSION_CODE
-#ifdef   INCLUDE_T_DIFFUSION_CODE
-#define  _LPT(a)a
-#define  _BHT(a)a
-#endif
-#ifndef  INCLUDE_T_DIFFUSION_CODE
-#define  _LPT(a)
-#define  _BHT(a)
-#endif
+#define INCLUDE_CD_CODE
 
 C o Include/exclude temperature forcing code
-#define  INCLUDE_T_FORCING_CODE
-
-C o Include/exclude momentum advection code
-#define  INCLUDE_MOMENTUM_ADVECTION_CODE
-#ifdef   INCLUDE_MOMENTUM_ADVECTION_CODE
-#define  _ADM(a)a
-#endif
-#ifndef  INCLUDE_MOMENTUM_ADVECTION_CODE
-#define  _ADM(a)
-#endif
-
-C o Include/exclude laplacian viscosity code
-#define  INCLUDE_LP_MOMENTUM_DIFFUSION_CODE
-#ifdef   INCLUDE_LP_MOMENTUM_DIFFUSION_CODE
-#define  _LPM(a)a
-#endif
-#ifndef  INCLUDE_LP_MOMENTUM_DIFFUSION_CODE
-#define  _LPM(a)
-#endif
+C#define  INCLUDE_T_FORCING_CODE
 
-C o Include/exclude biharmonic viscosity code
-#define  INCLUDE_BH_MOMENTUM_DIFFUSION_CODE
-#ifdef   INCLUDE_BH_MOMENTUM_DIFFUSION_CODE
-#define  _BHM(a)a
-#endif
-#ifndef  INCLUDE_BH_MOMENTUM_DIFFUSION_CODE
-#define  _BHM(a)
-#endif
-
-C o Include/exclude gradient of phy_hyd code
-#define INCLUDE_GRADPH_CODE
-#ifdef  INCLUDE_GRADPH_CODE
-#define _PHM(a)a
-#endif
-#ifndef INCLUDE_GRADPH_CODE
-#define _PHM(a)
+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
@@ -116,21 +28,20 @@
 #define INCLUDE_PHIHYD_CALCULATION_CODE
 
 C o Include/exclude call to S/R CONVECT
-#undef  INCLUDE_CONVECT_CALL
+#define INCLUDE_CONVECT_CALL
 
 C o Include/exclude call to S/R CALC_DIFFUSIVITY
 #define INCLUDE_CALC_DIFFUSIVITY_CALL
 
-C o Allow nonHydrostatic code
-#undef  ALLOW_NONHYDROSTATIC
+C o Include/exclude nonHydrostatic code
+#undef ALLOW_NONHYDROSTATIC
 
-C o Use "natural" boundary conditions for salinity
-C   instead of the "virtual salt flux"
-#undef  USE_NATURAL_BCS
+C o Include pressure loading code
+#define ATMOSPHERIC_LOADING
 
 C o Use "Exact Convervation" of fluid in Free-Surface formulation
 C   so that d/dt(eta) is exactly equal to - Div.Transport
-#undef  EXACT_CONSERV
+#define EXACT_CONSERV
 
 C o Allow the use of Non-Linear Free-Surface formulation
 C   this implies that surface thickness (hFactors) vary with time
@@ -149,10 +60,8 @@
 C o Execution environment support options
 #include "CPP_EEOPTIONS.h"
 
-C o Include/exclude the external forcing package. To use this package,
-C   you have to include the calendar tool as well. KPP can be switched
-C   on or off. The implementation automatically takes care of this.
-#define INCLUDE_EXTERNAL_FORCING_PACKAGE
-#ifdef INCLUDE_EXTERNAL_FORCING_PACKAGE
-# include "ECCO_CPPOPTIONS.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