Index: LMDZ6/branches/LMDZ-tracers/libf/dyn3d_common/infotrac.F90
===================================================================
--- LMDZ6/branches/LMDZ-tracers/libf/dyn3d_common/infotrac.F90	(revision 3985)
+++ LMDZ6/branches/LMDZ-tracers/libf/dyn3d_common/infotrac.F90	(revision 3986)
@@ -34,9 +34,4 @@
   !=== FOR BOTH TRACERS AND ISOTOPES
   PUBLIC :: getKey                                         !--- Get a key from "tracers" or "isotope"
-
-  !=== FOR STRATOSPHERIC AEROSOLS
-#ifdef CPP_StratAer
-  PUBLIC :: nbtr_bin, nbtr_sulgas, id_OCS_strat, id_H2SO4_strat, id_SO2_strat, id_BIN01_strat, id_TEST_strat
-#endif
 
   INTERFACE isoSelect; MODULE PROCEDURE isoSelectByIndex, isoSelectByName; END INTERFACE isoSelect
@@ -139,9 +134,4 @@
   CHARACTER(LEN=8),   SAVE, ALLOCATABLE ::   solsym(:)     !--- Names from INCA                                    (nbtr)
 
-#ifdef CPP_StratAer
-  !=== SPECIFIC TO STRATOSPHERIC AEROSOLS (CK/OB)
-  INTEGER, SAVE :: nbtr_bin, nbtr_sulgas, id_OCS_strat, id_H2SO4_strat, id_SO2_strat, id_BIN01_strat, id_TEST_strat
-#endif
-
 CONTAINS
 
@@ -179,6 +169,5 @@
   CHARACTER(LEN=2)   ::   suff(9)                                    !--- Suffixes for schemes of order 3 or 4 (Prather)
   CHARACTER(LEN=3)   :: descrq(30)                                   !--- Advection scheme description tags
-  CHARACTER(LEN=256) :: oldH2O(3)                                    !--- Old water name for the three phases
-  CHARACTER(LEN=256) :: newH2O                                       !--- New water name
+  CHARACTER(LEN=256) :: oldH2O, newH2O                               !--- Old and new water names
   CHARACTER(LEN=256) :: msg1, msg2                                   !--- Strings for messages
   CHARACTER(LEN=256), ALLOCATABLE :: str(:)                          !--- Temporary storage
@@ -200,9 +189,4 @@
   descrq(10:20) = ['VL1','VLP','FH1','FH2','VLH','   ','PPM','PPS','PPP','   ','SLP']
   descrq(30)    =  'PRA'
-  oldH2O        = ['H2Ov','H2Ol','H2Oi']
-
-!  lerr = reduceExpr('1.0+-470.0/1000.',msg1)
-!print*,msg1
-!stop
 
   !--- MESSAGE ABOUT THE CHOSEN CONFIGURATION
@@ -333,12 +317,13 @@
       !------------------------------------------------------------------------------------------------------------------------
         nqo = 0
-        DO ip = 1, SIZE(oldH2O)
-          ix = strIdx(tracers(:)%name,oldH2O(ip))                    !--- Old name of water in a specific phase (ix/=0)
+        DO ip = 1, LEN_TRIM(old_phases)
+          oldH2O = 'H2O'//old_phases(ip:ip)                          !--- Old name of water
           newH2O = 'H2O'//phases_sep//known_phases(ip:ip)            !--- Corresponding new name
+          ix = strIdx(tracers(:)%name,oldH2O)                        !--- Index of water in phase ip
           IF(ix == 0) ix = strIdx(tracers(:)%name,newH2O)            !--- New name in an old format file (to be avoided...)
           IF(ix == 0) CYCLE
           nqo = nqo+1; tracers(ix)%name = newH2O                     !--- One more water phase ; replace old name with one
-          tracers(strFind(tracers(:)%nam1,oldH2O(ip)))%nam1 = newH2O
-          tracers(strFind(tracers(:)%prnt,oldH2O(ip)))%prnt = newH2O
+          tracers(strFind(tracers(:)%nam1,oldH2O))%nam1 = newH2O
+          tracers(strFind(tracers(:)%prnt,oldH2O))%prnt = newH2O
         END DO
         nqtrue = SIZE(tracers,DIM=1)