--- MITgcm/model/inc/CPP_OPTIONS.h	2006/04/05 21:25:53	1.36
+++ MITgcm/model/inc/CPP_OPTIONS.h	2007/04/14 18:32:32	1.39
@@ -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.39 2007/04/14 18:32:32 dimitri Exp $
 C $Name:  $
 
 #ifndef CPP_OPTIONS_H
@@ -19,6 +19,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
 
@@ -67,6 +73,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"