--- MITgcm/model/inc/CPP_OPTIONS.h 2007/07/22 23:51:15 1.41 +++ MITgcm/model/inc/CPP_OPTIONS.h 2007/11/28 00:18:16 1.42 @@ -1,4 +1,4 @@ -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 $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.42 2007/11/28 00:18:16 dimitri Exp $ C $Name: $ #ifndef CPP_OPTIONS_H @@ -10,9 +10,6 @@ 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