--- MITgcm/model/inc/CPP_OPTIONS.h	2006/04/05 21:25:53	1.36
+++ MITgcm/model/inc/CPP_OPTIONS.h	2007/07/22 23:51:15	1.41
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.36 2006/04/05 21:25:53 mlosch Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.41 2007/07/22 23:51:15 dimitri Exp $
 C $Name:  $
 
 #ifndef CPP_OPTIONS_H
@@ -10,6 +10,9 @@
 C Note: this should be a run-time option
 #undef SHORTWAVE_HEATING
 
+C o Include/exclude Duffy et al. (GRL 1999) salt plume scheme
+#undef ALLOW_SALT_PLUME
+
 C o Include/exclude phi_hyd calculation code
 #define INCLUDE_PHIHYD_CALCULATION_CODE
 
@@ -19,6 +22,12 @@
 C o Include/exclude call to S/R CALC_DIFFUSIVITY
 #define INCLUDE_CALC_DIFFUSIVITY_CALL
 
+C o Allow latitudinally varying BryanLewis79 vertical diffusivity
+#undef ALLOW_BL79_LAT_VARY
+
+C o Allow full 3D specification of vertical diffusivity
+#undef ALLOW_3D_DIFFKR
+
 C o Include/exclude Implicit vertical advection code
 #define INCLUDE_IMPLVERTADV_CODE
 
@@ -31,6 +40,11 @@
 C o Include pressure loading code
 #define ATMOSPHERIC_LOADING
 
+C o exclude/allow external forcing-fields load 
+C   this allows to read & do simple linear time interpolation of oceanic
+C   forcing fields, if no specific pkg (e.g., EXF) is used to compute them.
+#undef EXCLUDE_FFIELDS_LOAD
+
 C o Use "Exact Convervation" of fluid in Free-Surface formulation
 C   so that d/dt(eta) is exactly equal to - Div.Transport
 #define EXACT_CONSERV
@@ -67,6 +81,11 @@
 C          because the old code did not have no-slip BCs
 #undef  OLD_ADV_BCS
 
+C o Use LONG.bin, LATG.bin, etc., initialization for ini_curviliear_grid.F
+C   Default is to use "new" grid files (OLD_GRID_IO undef) but OLD_GRID_IO
+C   is still useful with, e.g., single-domain curvilinear configurations.
+#undef OLD_GRID_IO
+
 C o Execution environment support options
 #include "CPP_EEOPTIONS.h"