--- MITgcm/verification/global_ocean.cs32x15/code_ad/ECCO_CPPOPTIONS.h	2010/05/19 08:14:16	1.3
+++ MITgcm/verification/global_ocean.cs32x15/code_ad/ECCO_CPPOPTIONS.h	2012/08/09 18:15:57	1.8
@@ -1,9 +1,16 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/global_ocean.cs32x15/code_ad/ECCO_CPPOPTIONS.h,v 1.3 2010/05/19 08:14:16 mlosch Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/global_ocean.cs32x15/code_ad/ECCO_CPPOPTIONS.h,v 1.8 2012/08/09 18:15:57 jmc Exp $
 C $Name:  $
 
-C
-C CPP flags controlling which code is included in the files that
-C will be compiled.
+#ifndef ECCO_CPPOPTIONS_H
+#define ECCO_CPPOPTIONS_H
+
+C-- Collect here, in a single option-file, options to control which optional
+C   features to compile in packages AUTODIFF, COST, CTRL, ECCO, CAL and EXF.
+C   If used, this option-file needs to be directly included in CPP_OPTIONS.h
+C   Although this method, inherited from ECCO setup, has been traditionally
+C   used for all adjoint built, work is in progess to allow to use the
+C   standard metod (each of the above pkg get its own options from its
+C   specific option-file) also for adjoint built.
 
 C ********************************************************************
 C ***                  Adjoint Support Package                     ***
@@ -12,25 +19,30 @@
 C o Include/exclude code in order to be able to automatically
 C   differentiate the MITgcmUV by using the Tangent Linear and
 C   Adjoint Model Compiler (TAMC).
-C
+
 #define ALLOW_AUTODIFF_TAMC
 C       >>> Checkpointing as handled by TAMC
 #define ALLOW_TAMC_CHECKPOINTING
-C
+
 C       >>> Extract adjoint state
 #define ALLOW_AUTODIFF_MONITOR
-C
+
 C       >>> DO 2-level checkpointing instead of 3-level
 #undef AUTODIFF_2_LEVEL_CHECKPOINT
-C
+
 C o use divided adjoint to split adjoint computations
 #undef ALLOW_DIVIDED_ADJOINT
 #undef ALLOW_DIVIDED_ADJOINT_MPI
 
+#define ALLOW_AUTODIFF_WHTAPEIO
+#define ALLOW_PACKUNPACK_METHOD2
+#define AUTODIFF_USE_OLDSTORE_3D
+#define AUTODIFF_USE_OLDSTORE_2D
+
 C ********************************************************************
-C ***                     Calender Package                         ***
+C ***                     Calendar Package                         ***
 C ********************************************************************
-C
+
 C CPP flags controlling which code is included in the files that
 C will be compiled.
 
@@ -39,9 +51,8 @@
 C ********************************************************************
 C ***                Cost function Package                         ***
 C ********************************************************************
-C
+
 C       >>> Cost function contributions
-#define ALLOW_COST
 #define ALLOW_COST_TEST
 #undef ALLOW_COST_TRACER
 #undef ALLOW_COST_ATLANTIC_HEAT
@@ -50,10 +61,10 @@
 C ********************************************************************
 C ***               Control vector Package                         ***
 C ********************************************************************
-C
+
 #define EXCLUDE_CTRL_PACK
 #undef  ALLOW_NONDIMENSIONAL_CONTROL_IO
-C
+
 C       >>> Initial values.
 #define ALLOW_THETA0_CONTROL
 #define ALLOW_SALT0_CONTROL
@@ -67,23 +78,25 @@
 #define ALLOW_DIFFKR_CONTROL
 #undef ALLOW_KAPGM_CONTROL
 
-
 C ********************************************************************
 C ***             External forcing Package                         ***
 C ********************************************************************
 
-C   Do more printout for the protocol file than usual.
-#define EXF_VERBOSE
-
 C   Bulk formulae related flags.
 #define  ALLOW_ATM_TEMP
-#define   ALLOW_ATM_WIND
+#undef   ALLOW_ATM_WIND
 #define  ALLOW_DOWNWARD_RADIATION
 #define  ALLOW_RUNOFF
 #if (defined (ALLOW_ATM_TEMP) || \
      defined (ALLOW_ATM_WIND))
 # define ALLOW_BULKFORMULAE
-# define ALLOW_BULK_LARGEYEAGER04
+# undef  ALLOW_BULK_LARGEYEAGER04
+#endif
+
+C   Use ocean_emissivity*lwdwon in lwFlux. This flag should be define
+C   unless to reproduce old results (obtained with inconsistent old code)
+#ifdef ALLOW_DOWNWARD_RADIATION
+# define EXF_LWDOWN_WITH_EMISSIVITY
 #endif
 
 C   Relaxation to monthly climatologies.
@@ -99,12 +112,11 @@
 # define EXF_IREAD_USE_GLOBAL_POINTER
 #endif
 
-
-
-
 C >>> No Open boundaries
 #undef  ALLOW_OBCSN_CONTROL
 #undef  ALLOW_OBCSS_CONTROL
 #undef  ALLOW_OBCSW_CONTROL
 #undef  ALLOW_OBCSE_CONTROL
 
+C ********************************************************************
+#endif /* ECCO_CPPOPTIONS_H */