--- MITgcm/verification/advect_xz/code/GAD_OPTIONS.h 2007/01/16 04:42:39 1.1 +++ MITgcm/verification/advect_xz/code/GAD_OPTIONS.h 2011/12/24 01:17:50 1.3 @@ -1,11 +1,11 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/advect_xz/code/GAD_OPTIONS.h,v 1.1 2007/01/16 04:42:39 jmc Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/advect_xz/code/GAD_OPTIONS.h,v 1.3 2011/12/24 01:17:50 jmc Exp $ C $Name: $ CBOP C !ROUTINE: GAD_OPTIONS.h C !INTERFACE: -C #include "GAD_OPTIONS.h" +C #include "GAD_OPTIONS.h" C !DESCRIPTION: C Contains CPP macros/flags for controlling optional features of package. @@ -18,10 +18,11 @@ #ifndef GAD_OPTIONS_H #define GAD_OPTIONS_H #include "PACKAGES_CONFIG.h" -#ifdef ALLOW_GENERIC_ADVDIFF - #include "CPP_OPTIONS.h" +#ifdef ALLOW_GENERIC_ADVDIFF +C Package-specific Options & Macros go here + C This flag selects the form of COSINE(lat) scaling of bi-harmonic term. C *only for use on a lat-lon grid* C Setting this flag here only affects the bi-harmonic tracer terms; to @@ -31,7 +32,7 @@ C This selects isotropic scaling of harmonic and bi-harmonic term when C using the COSINE(lat) scaling. C Setting this flag here only affects the tracer diffusion terms; to -C use ISOTROPIC_COS_SCALING of the horizontal viscosity terms in the +C use ISOTROPIC_COS_SCALING of the horizontal viscosity terms in the C momentum equations set it CPP_OPTIONS.h; the following line C even overrides setting the flag in CPP_OPTIONS.h #undef ISOTROPIC_COS_SCALING @@ -41,10 +42,10 @@ C We can disable it here using CPP because run-time flags are insufficient. #undef DISABLE_MULTIDIM_ADVECTION -C This enable the use of 2nd-Order Moment advection scheme (Prather, 1986) -C due to large memory space (10 times more / tracer) requirement, -C by default, this part of the code is not compiled. -#define GAD_ALLOW_SOM_ADVECT +C This enable the use of 2nd-Order Moment advection scheme (Prather, 1986) for +C Temperature and Salinity ; due to large memory space (10 times more / tracer) +C requirement, by default, this part of the code is not compiled. +#define GAD_ALLOW_TS_SOM_ADV #else