--- MITgcm/verification/aim.5l_cs/code/CPP_OPTIONS.h	2004/01/26 17:01:22	1.4
+++ MITgcm/verification/aim.5l_cs/code/CPP_OPTIONS.h	2004/04/06 01:20:54	1.5
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/aim.5l_cs/code/CPP_OPTIONS.h,v 1.4 2004/01/26 17:01:22 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/aim.5l_cs/code/CPP_OPTIONS.h,v 1.5 2004/04/06 01:20:54 jmc Exp $
 C $Name:  $
 
 #ifndef CPP_OPTIONS_H
@@ -7,10 +7,8 @@
 C CPP flags controlling particular source code features
 
 C o Shortwave heating as extra term in external_forcing.F
-C Note: this should be a run-time option and not necessarily dependent on KPP
-#ifdef ALLOW_KPP
-#define  SHORTWAVE_HEATING
-#endif
+C Note: this should be a run-time option
+#undef SHORTWAVE_HEATING
 
 C o Include/exclude phi_hyd calculation code
 #define INCLUDE_PHIHYD_CALCULATION_CODE