Index: LMDZ6/trunk/libf/phylmd/cv3_routines.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/cv3_routines.f90	(revision 5501)
+++ LMDZ6/trunk/libf/phylmd/cv3_routines.f90	(revision 5502)
@@ -11,5 +11,5 @@
   use mod_phys_lmdz_para
   USE conema3_mod_h
-  USE lmdz_cv_ini, ONLY : alpha,alpha1,beta,betad,coef_peel,cv_flag_feed,delta,dpbase,dtcrit,dtovsh,dttrig,ejectice,ejectliq,elcrit,flag_epkeorig,flag_wb,minorig,nl,nlm,nlp,noconv_stop,noff,omtrain,pbcrit,ptcrit,sigdz,spfac,t_top_max,tau,tau_stop,tlcrit,wbmax
+  USE lmdz_cv_ini, ONLY : alpha,alpha1,beta,betad,coef_peel,cv_flag_feed,delta,dpbase,dtcrit,dtovsh,dttrig,ejectice,ejectliq,elcrit,flag_epkeorig,flag_wb,minorig,nl,nlm,nlp,noconv_stop,noff,omtrain,pbcrit,ptcrit,sigdz,spfac,t_top_max,tau,tau_stop,tlcrit,wbmax,keep_bug_indices_cv3_tracer
 
 
@@ -139,4 +139,7 @@
      keepbug_ice_frac = .TRUE.
      CALL getin_p('keepbug_ice_frac', keepbug_ice_frac)
+     keep_bug_indices_cv3_tracer = .FALSE.
+     CALL getin_p('keep_bug_indices_cv3_tracer', keep_bug_indices_cv3_tracer)
+
 
     WRITE (*, *) 't_top_max=', t_top_max
@@ -164,4 +167,5 @@
     WRITE (*, *) 'adiab_ascent_mass_flux_depends_on_ejectliq =', adiab_ascent_mass_flux_depends_on_ejectliq
     WRITE (*, *) 'keepbug_ice_frac =', keepbug_ice_frac 
+    WRITE (*, *) 'keep_bug_indices_cv3_tracer =', keep_bug_indices_cv3_tracer 
 
     first = .FALSE.
@@ -4936,5 +4940,5 @@
                       ep, Vprecip, elij, clw, epmlmMm, eplaMm, &
                       icb, inb)
-   USE lmdz_cv_ini, ONLY : nl
+  USE lmdz_cv_ini, ONLY : nl,keep_bug_indices_cv3_tracer
   USE cvflag_mod_h
   USE ioipsl_getin_p_mod, ONLY : getin_p
@@ -4961,8 +4965,4 @@
   REAL epm(nloc, na, na)
 !
-  LOGICAL,SAVE   ::  first=.TRUE.
-  LOGICAL,SAVE   ::  keep_bug_indices_cv3_tracer
-!$OMP THREADPRIVATE(first, keep_bug_indices_cv3_tracer)
-
 ! variables d'Emanuel : du second indice au troisieme
 ! --->    tab(i,k,j) -> de l origine k a l arrivee j
@@ -4972,10 +4972,4 @@
 ! phi, phi2, epm, epmlmMm
 
-  IF (first) THEN
-    keep_bug_indices_cv3_tracer = .FALSE.
-    CALL getin_p('keep_bug_indices_cv3_tracer', keep_bug_indices_cv3_tracer)
-    first = .FALSE.
-  ENDIF ! (first)
-! initialisations
 
   da(:, :) = 0.
Index: LMDZ6/trunk/libf/phylmd/lmdz_cv_ini.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/lmdz_cv_ini.f90	(revision 5501)
+++ LMDZ6/trunk/libf/phylmd/lmdz_cv_ini.f90	(revision 5502)
@@ -14,5 +14,5 @@
           nl, nlp, nlm
   PUBLIC cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
-          , clmci, eps, epsi, epsim1, ginv, hrd, grav
+          , clmci, eps, epsi, epsim1, ginv, hrd, grav, keep_bug_indices_cv3_tracer
 
 
@@ -69,3 +69,6 @@
   !$OMP          , dtmax, cu, damp)
 
+LOGICAL keep_bug_indices_cv3_tracer
+ !$OMP THREADPRIVATE( keep_bug_indices_cv3_tracer)
+
 END MODULE lmdz_cv_ini