Index: LMDZ6/trunk/libf/phylmd/physiq_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/physiq_mod.F90	(revision 5264)
+++ LMDZ6/trunk/libf/phylmd/physiq_mod.F90	(revision 5265)
@@ -113,5 +113,5 @@
     USE time_phylmdz_mod,    ONLY: annee_ref, day_ini, day_ref, start_time
     USE vertical_layers_mod, ONLY: aps, bps, ap, bp
-    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_STRATAER, CPPKEY_DUST
+    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_STRATAER, CPPKEY_DUST, CPPKEY_COSP, CPPKEY_COSP2, CPPKEY_COSPV2
 
 #ifdef CPP_RRTM
@@ -1185,10 +1185,5 @@
     !============================================================
     ! AI 10-22
-#ifdef CPP_COSP
     include "ini_COSP.h"
-#endif
-#ifdef CPP_COSPV2
-    include "ini_COSP.h"
-#endif
     real :: mr_ozone(klon,klev), phicosp(klon,klev)
 
@@ -1783,5 +1778,5 @@
       if (ok_cosp) then
 
-#ifdef CPP_COSP
+IF (CPPKEY_COSP) THEN
         CALL ini_COSP(ref_liq_cosp0,ref_ice_cosp0,pctsrf_cosp0,zu10m_cosp0,zv10m_cosp0, &
                zxtsol_cosp0,zx_rh_cosp0,cldfra_cosp0,rnebcon_cosp0,flwc_cosp0, &
@@ -1801,7 +1796,7 @@
                pmflxr_cosp0(:,1:klev),pmflxs_cosp0(:,1:klev), &
                mr_ozone_cosp0,cldtau_cosp0, cldemi_cosp0)
-#endif
-
-#ifdef CPP_COSPV2
+END IF
+
+IF (CPPKEY_COSPV2) THEN
           CALL ini_COSP(ref_liq_cosp0,ref_ice_cosp0,pctsrf_cosp0,zu10m_cosp0,zv10m_cosp0, &
                zxtsol_cosp0,zx_rh_cosp0,cldfra_cosp0,rnebcon_cosp0,flwc_cosp0, &
@@ -1821,5 +1816,5 @@
                pmflxr_cosp0(:,1:klev),pmflxs_cosp0(:,1:klev), &
                mr_ozone_cosp0,cldtau_cosp0, cldemi_cosp0)
-#endif
+END IF
       ENDIF 
 
@@ -5174,5 +5169,5 @@
     IF (ok_cosp) THEN
        ! adeclarer 
-#ifdef CPP_COSP
+IF (CPPKEY_COSP) THEN
        IF (itap.eq.1.or.MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
 
@@ -5203,7 +5198,7 @@
 
        ENDIF
-#endif
-
-#ifdef CPP_COSP2
+END IF
+
+IF (CPPKEY_COSP2) THEN
        IF (itap.eq.1.or.MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
 
@@ -5227,7 +5222,7 @@
                mr_ozone,cldtau, cldemi)
        ENDIF
-#endif
-
-#ifdef CPP_COSPV2
+END IF
+
+IF (CPPKEY_COSPV2) THEN
        IF (itap.eq.1.or.MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
 !        IF (MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
@@ -5257,5 +5252,5 @@
                mr_ozone,cldtau, cldemi)
        ENDIF
-#endif
+END IF
 
     ENDIF  !ok_cosp
Index: LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90	(revision 5264)
+++ LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90	(revision 5265)
@@ -430,5 +430,5 @@
        reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra
        USE output_physiqex_mod, ONLY: output_physiqex
-       USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_STRATAER, CPPKEY_DUST
+       USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_STRATAER, CPPKEY_DUST, CPPKEY_COSP, CPPKEY_COSP2, CPPKEY_COSPV2
 
 
@@ -1295,10 +1295,5 @@
     !============================================================
     ! AI 10-22
-#ifdef CPP_COSP
     include "ini_COSP.h"
-#endif
-#ifdef CPP_COSPV2
-    include "ini_COSP.h"
-#endif
     real :: mr_ozone(klon,klev), phicosp(klon,klev)
 
@@ -1953,5 +1948,5 @@
       if (ok_cosp) then
 
-#ifdef CPP_COSP
+IF (CPPKEY_COSP) THEN
         CALL ini_COSP(ref_liq_cosp0,ref_ice_cosp0,pctsrf_cosp0,zu10m_cosp0,zv10m_cosp0, &
                zxtsol_cosp0,zx_rh_cosp0,cldfra_cosp0,rnebcon_cosp0,flwc_cosp0, &
@@ -1971,7 +1966,7 @@
                pmflxr_cosp0(:,1:klev),pmflxs_cosp0(:,1:klev), &
                mr_ozone_cosp0,cldtau_cosp0, cldemi_cosp0)
-#endif
-
-#ifdef CPP_COSPV2
+END IF
+
+IF (CPPKEY_COSPV2) THEN
           CALL ini_COSP(ref_liq_cosp0,ref_ice_cosp0,pctsrf_cosp0,zu10m_cosp0,zv10m_cosp0, &
                zxtsol_cosp0,zx_rh_cosp0,cldfra_cosp0,rnebcon_cosp0,flwc_cosp0, &
@@ -1991,5 +1986,5 @@
                pmflxr_cosp0(:,1:klev),pmflxs_cosp0(:,1:klev), &
                mr_ozone_cosp0,cldtau_cosp0, cldemi_cosp0)
-#endif
+END IF
 
       endif !ok_cosp
@@ -6725,5 +6720,5 @@
     IF (ok_cosp) THEN
        ! adeclarer 
-#ifdef CPP_COSP
+IF (CPPKEY_COSP) THEN
        IF (itap.eq.1.or.MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
 
@@ -6754,7 +6749,7 @@
 
        ENDIF
-#endif
-
-#ifdef CPP_COSP2
+END IF
+
+IF (CPPKEY_COSP2) THEN
        IF (itap.eq.1.or.MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
 
@@ -6778,7 +6773,7 @@
                mr_ozone,cldtau, cldemi)
        ENDIF
-#endif
-
-#ifdef CPP_COSPV2
+END IF
+
+IF (CPPKEY_COSPV2) THEN
        IF (itap.eq.1.or.MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
 !        IF (MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
@@ -6808,5 +6803,5 @@
                mr_ozone,cldtau, cldemi)
        ENDIF
-#endif
+END IF
 
     ENDIF  !ok_cosp