--- MITgcm/model/inc/CPP_OPTIONS.h 2007/04/05 22:51:48 1.38 +++ 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.38 2007/04/05 22:51:48 dimitri 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,9 @@ 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 @@ -34,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