Index: LMDZ5/branches/testing/DefLists/context_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/context_lmdz.xml	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/context_lmdz.xml	(revision 2435)
@@ -11,13 +11,13 @@
   <file_definition src="./file_def_histhf_lmdz.xml"/>
   <file_definition src="./file_def_histins_lmdz.xml"/>
-  <file_definition src="./file_def_histLES_lmdz.xml"/>
+<!--  <file_definition src="./file_def_histLES_lmdz.xml"/> -->
   <file_definition src="./file_def_histmth_lmdz.xml"/> 
-  <file_definition src="./file_def_histstn_lmdz.xml"/>
+<!--  <file_definition src="./file_def_histstn_lmdz.xml"/> -->
   <file_definition src="./file_def_histmthNMC_lmdz.xml"/>
   <file_definition src="./file_def_histdayNMC_lmdz.xml"/>
   <file_definition src="./file_def_histhfNMC_lmdz.xml"/>
-  <file_definition src="./file_def_histmthCOSP_lmdz.xml"/>
-  <file_definition src="./file_def_histdayCOSP_lmdz.xml"/>
-  <file_definition src="./file_def_histhfCOSP_lmdz.xml"/>
+<!--  <file_definition src="./file_def_histmthCOSP_lmdz.xml"/> -->
+<!--  <file_definition src="./file_def_histdayCOSP_lmdz.xml"/> -->
+<!--  <file_definition src="./file_def_histhfCOSP_lmdz.xml"/> -->
   
   <!-- Define domains and groups of domains -->
Index: LMDZ5/branches/testing/DefLists/cosp_input_nl.txt
===================================================================
--- LMDZ5/branches/testing/DefLists/cosp_input_nl.txt	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/cosp_input_nl.txt	(revision 2435)
@@ -28,7 +28,7 @@
   NPOINTS_IT=10000,! Max number of gridpoints to be processed in one iteration
   NCOLUMNS=20,  ! Number of subcolumns
-  USE_VGRID=.false., ! Use fixed vertical grid for outputs? (if .true. then you need to define number of levels with Nlr)
+  USE_VGRID=.true., ! Use fixed vertical grid for outputs? (if .true. then you need to define number of levels with Nlr)
   NLR=40,       ! Number of levels in statistical outputs (only used if USE_VGRID=.true.)
-  CSAT_VGRID=.false., ! CloudSat vertical grid? (if .true. then the CloudSat standard grid is used for the outputs.
+  CSAT_VGRID=.true., ! CloudSat vertical grid? (if .true. then the CloudSat standard grid is used for the outputs.
                      !  USE_VGRID needs also be .true.)
   !----------------------------------------------------------------------------------
Index: LMDZ5/branches/testing/DefLists/cosp_output_nl.txt
===================================================================
--- LMDZ5/branches/testing/DefLists/cosp_output_nl.txt	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/cosp_output_nl.txt	(revision 2435)
@@ -32,32 +32,79 @@
   Lisccp_sim=.true.,
   Lmisr_sim=.false.,
+  Lmodis_sim=.false.,
+  Lrttov_sim=.false.,
   ! Output variables
-  Lalbisccp=.true.,
-  Latb532=.true.,
-  Lboxptopisccp=.true.,
-  Lboxtauisccp=.true.,
-  Lcfad_dbze94=.false.,
-  Lcfad_lidarsr532=.true.,
+  !- Variables unique in 1D (curtain) mode
+  Ltoffset=.false.,
+  !- CloudSat
+  Lcfaddbze94=.false.,
+  Ldbze94=.true.,
+  !- CALIPSO
+  Latb532=.false.,
+  LcfadLidarsr532=.false.,
   Lclcalipso=.true.,
   Lclhcalipso=.true.,
-  Lclisccp2=.true.,
   Lcllcalipso=.true.,
   Lclmcalipso=.true.,
   Lcltcalipso=.true.,
-  Lctpisccp=.true.,
-  Ldbze94=.false.,
+  LparasolRefl=.true.,
+  ! CALIPSO phase diagnostics
+  Lclcalipsoliq=.true.,
+  Lclcalipsoice=.true.,
+  Lclcalipsoun=.true.,
+  Lclcalipsotmp=.true.,
+  Lclcalipsotmpliq=.true.,
+  Lclcalipsotmpice=.true.,
+  Lclcalipsotmpun=.true.,
+  Lclhcalipsoliq=.true.,
+  Lcllcalipsoliq=.true.,
+  Lclmcalipsoliq=.true.,
+  Lcltcalipsoliq=.true.,
+  Lclhcalipsoice=.true.,
+  Lcllcalipsoice=.true.,
+  Lclmcalipsoice=.true.,
+  Lcltcalipsoice=.true.,
+  Lclhcalipsoun=.true.,
+  Lcllcalipsoun=.true.,
+  Lclmcalipsoun=.true.,
+  Lcltcalipsoun=.true.,
+  !- ISCCP
+  Lalbisccp=.true.,
+  Lboxptopisccp=.false.,
+  Lboxtauisccp=.false.,
+  Lpctisccp=.true.,
+  Lclisccp=.true.,
   Ltauisccp=.true.,
-  Ltclisccp=.true.,
-  Llongitude=.false.,
-  Llatitude=.false.,
-  Lparasol_refl=.true.,
-  LclMISR=.false.,
+  Lcltisccp=.true.,
   Lmeantbisccp=.true.,
   Lmeantbclrisccp=.true.,
-  ! Use lidar and radar
+  !- MISR
+  LclMISR=.false.,
+  !- Use lidar and radar
   Lclcalipso2=.false.,
   Lcltlidarradar=.false.,
-  ! These are provided for debugging or special purposes
-  Lfrac_out=.false.,
-  Lbeta_mol532=.true.,  
+  !- These are provided for debugging or special purposes
+  Lfracout=.false.,
+  LlidarBetaMol532=.true.,  
+  !- MODIS
+  Lcltmodis=.false.,
+  Lclwmodis=.false.,
+  Lclimodis=.false.,
+  Lclhmodis=.false.,
+  Lclmmodis=.false.,
+  Lcllmodis=.false.,
+  Ltautmodis=.false.,
+  Ltauwmodis=.false.,
+  Ltauimodis=.false.,
+  Ltautlogmodis=.false.,
+  Ltauwlogmodis=.false.,
+  Ltauilogmodis=.false.,
+  Lreffclwmodis=.false.,
+  Lreffclimodis=.false.,
+  Lpctmodis=.false.,
+  Llwpmodis=.false.,
+  Liwpmodis=.false.,
+  Lclmodis=.false.,
+  !- RTTOV
+  Ltbrttov=.false.,
 /
Index: LMDZ5/branches/testing/DefLists/field_def_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/field_def_lmdz.xml	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/field_def_lmdz.xml	(revision 2435)
@@ -637,28 +637,28 @@
       <field id="clmcalipso"    long_name="Lidar Mid-level Cloud Fraction"   unit="1" />
       <field id="cltcalipso"    long_name="Lidar Total Cloud Fraction"   unit="1" />
-      <field id="clcalipso"  long_name="Lidar Cloud Fraction (532 nm)" unit="1" axis_ref="presnivs" />
+      <field id="clcalipso"  long_name="Lidar Cloud Fraction (532 nm)" unit="1" axis_ref="height" />
       <field id="parasol_refl"  long_name="PARASOL-like mono-directional reflectance" unit="1" axis_ref="sza" />
       <field id="parasol_crefl"  long_name="PARASOL-like mono-directional reflectance (integral)" unit="1" axis_ref="sza" />
       <field id="Ncrefl"  long_name="Nb for PARASOL-like mono-directional reflectance" unit="1" axis_ref="sza" />
-      <field id="c01_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c02_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c03_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c04_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c05_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c06_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c07_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c08_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c09_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c10_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c11_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c12_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c13_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c14_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c15_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c16_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c17_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c18_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c19_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
-      <field id="c20_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
+      <field id="c01_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c02_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c03_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c04_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c05_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c06_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c07_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c08_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c09_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c10_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c11_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c12_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c13_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c14_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c15_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c16_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c17_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c18_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c19_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
+      <field id="c20_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="height" />
       <field id="c01_atb532" long_name="Lidar Attenuated Total Backscatter (532 nm)" unit="1" axis_ref="height_mlev" />
       <field id="c02_atb532" long_name="Lidar Attenuated Total Backscatter (532 nm)" unit="1" axis_ref="height_mlev" />
@@ -682,4 +682,23 @@
       <field id="c20_atb532" long_name="Lidar Attenuated Total Backscatter (532 nm)" unit="1" axis_ref="height_mlev" />
       <field id="beta_mol532" long_name="Lidar Molecular Backscatter (532 nm)" unit="m-1 sr-1" axis_ref="height_mlev" />
+      <field id="cllcalipsoice"    long_name="Lidar Ice-Phase Low-level Cloud Fraction"   unit="%" />
+      <field id="clhcalipsoice"    long_name="Lidar Ice-Phase Hight-level Cloud Fraction"   unit="%" />
+      <field id="clmcalipsoice"    long_name="Lidar Ice-Phase Mid-level Cloud Fraction"   unit="%" />
+      <field id="cltcalipsoice"    long_name="Lidar Ice-Phase Total Cloud Fraction"   unit="%" />
+      <field id="clcalipsoice"  long_name="Lidar Ice-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
+      <field id="cllcalipsoliq"    long_name="Lidar Liq-Phase Low-level Cloud Fraction"   unit="%" />
+      <field id="clhcalipsoliq"    long_name="Lidar Liq-Phase Hight-level Cloud Fraction"   unit="%" />
+      <field id="clmcalipsoliq"    long_name="Lidar Liq-Phase Mid-level Cloud Fraction"   unit="%" />
+      <field id="cltcalipsoliq"    long_name="Lidar Liq-Phase Total Cloud Fraction"   unit="%" />
+      <field id="clcalipsoliq"  long_name="Lidar Liq-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
+      <field id="cllcalipsoun"    long_name="Lidar Undefined-Phase Low-level Cloud Fraction"   unit="%" />
+      <field id="clhcalipsoun"    long_name="Lidar Undefined-Phase Hight-level Cloud Fraction"   unit="%" />
+      <field id="clmcalipsoun"    long_name="Lidar Undefined-Phase Mid-level Cloud Fraction"   unit="%" />
+      <field id="cltcalipsoun"    long_name="Lidar Undefined-Phase Total Cloud Fraction"   unit="%" />
+      <field id="clcalipsoun"  long_name="Lidar Undefined-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
+      <field id="clcalipsotmp"  long_name="Lidar Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
+      <field id="clcalipsotmpliq"  long_name="Lidar Liq-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
+      <field id="clcalipsotmpice"  long_name="Lidar Ice-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
+      <field id="clcalipsotmpun"  long_name="Undefined-Phase Total Cloud Fraction"   unit="%" axis_ref="height" />
     </field_group>  
 
Index: LMDZ5/branches/testing/DefLists/file_def_histdayCOSP_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histdayCOSP_lmdz.xml	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/file_def_histdayCOSP_lmdz.xml	(revision 2435)
@@ -1,36 +1,55 @@
 <file_definition>
      <file_group id="defile">
-        <file id="histdayCOSP" name="XhistdayCOSP" output_freq="1d" output_level="10"  enabled=".FALSE.">
+        <file id="histdayCOSP" name="histdayCOSP" output_freq="1d" output_level="1"  enabled=".TRUE.">
 
             <!-- VARS 2D -->
-            <field_group operation="average" freq_op="3h">
+            <field_group operation="average" freq_op="3h" detect_missing_value=".true.">
                 <field field_ref="cllcalipso"         level="1" />
                 <field field_ref="clmcalipso"         level="1" />
                 <field field_ref="clhcalipso"         level="1" />
                 <field field_ref="cltcalipso"         level="1" />
-                <field field_ref="clcalipso"  level="1" axis_ref="presnivs" />
+                <field field_ref="cllcalipsoice"         level="1" />
+                <field field_ref="clmcalipsoice"         level="1" />
+                <field field_ref="clhcalipsoice"         level="1" />
+                <field field_ref="cltcalipsoice"         level="1" />
+                <field field_ref="cllcalipsoliq"         level="1" />
+                <field field_ref="clmcalipsoliq"         level="1" />
+                <field field_ref="clhcalipsoliq"         level="1" />
+                <field field_ref="cltcalipsoliq"         level="1" />
+                <field field_ref="cllcalipsoun"         level="1" />
+                <field field_ref="clmcalipsoun"         level="1" />
+                <field field_ref="clhcalipsoun"         level="1" />
+                <field field_ref="cltcalipsoun"         level="1" />
+                <field field_ref="clcalipso"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsoice"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsoliq"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsoun"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmp"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmpice"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmpliq"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmpun"  level="1" axis_ref="height" />
                 <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
                 <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
                 <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
-		<field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c03_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c04_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c05_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c06_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c07_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c08_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c09_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c10_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c11_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c12_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c13_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c14_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c15_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c16_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c17_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c18_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c19_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c20_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c03_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c04_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c05_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c06_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c07_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c08_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c09_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c10_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c11_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c12_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c13_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c14_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c15_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c16_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c17_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c18_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c19_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c20_cfad_lidarsr532"  level="10" axis_ref="height" />
                 <field field_ref="c01_atb532" level="10" axis_ref="height_mlev" />
                 <field field_ref="c02_atb532" level="10" axis_ref="height_mlev" />
@@ -65,7 +84,7 @@
                 <field field_ref="boxptopisccp" level="10" axis_ref="column" />
                 <field field_ref="tclisccp" level="1" />
-                <field field_ref="ctpisccp" level="10" />
-                <field field_ref="tauisccp" level="10" /> 
-                <field field_ref="albisccp" level="10" />
+                <field field_ref="ctpisccp" level="1" />
+                <field field_ref="tauisccp" level="1" /> 
+                <field field_ref="albisccp" level="1" />
                 <field field_ref="meantbisccp" level="10" />
                 <field field_ref="meantbclrisccp" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histdayNMC_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histdayNMC_lmdz.xml	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/file_def_histdayNMC_lmdz.xml	(revision 2435)
@@ -1,5 +1,5 @@
 <file_definition>
     <file_group id="defile">
-        <file id="histdayNMC" name="XhistdayNMC" output_freq="1d" output_level="5" enabled=".FALSE.">
+        <file id="histdayNMC" name="histdayNMC" output_freq="1d" output_level="5" enabled=".FALSE.">
 
             <!-- VARS 3D -->
Index: LMDZ5/branches/testing/DefLists/file_def_histhfCOSP_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histhfCOSP_lmdz.xml	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/file_def_histhfCOSP_lmdz.xml	(revision 2435)
@@ -1,36 +1,55 @@
 <file_definition>
      <file_group id="defile">
-        <file id="histhfCOSP" name="XhisthfCOSP" output_freq="3h" output_level="10"  enabled=".FALSE.">
+        <file id="histhfCOSP" name="XhisthfCOSP" output_freq="3h" output_level="1"  enabled=".TRUE.">
 
             <!-- VARS 2D -->
-            <field_group operation="instant" freq_op="3h">
+            <field_group operation="instant" freq_op="1ts">
                 <field field_ref="cllcalipso"         level="1" />
                 <field field_ref="clmcalipso"         level="1" />
                 <field field_ref="clhcalipso"         level="1" />
                 <field field_ref="cltcalipso"         level="1" />
-                <field field_ref="clcalipso"  level="1" axis_ref="presnivs" />
+                <field field_ref="cllcalipsoice"         level="1" />
+                <field field_ref="clmcalipsoice"         level="1" />
+                <field field_ref="clhcalipsoice"         level="1" />
+                <field field_ref="cltcalipsoice"         level="1" />
+                <field field_ref="cllcalipsoliq"         level="1" />
+                <field field_ref="clmcalipsoliq"         level="1" />
+                <field field_ref="clhcalipsoliq"         level="1" />
+                <field field_ref="cltcalipsoliq"         level="1" />
+                <field field_ref="cllcalipsoun"         level="1" />
+                <field field_ref="clmcalipsoun"         level="1" />
+                <field field_ref="clhcalipsoun"         level="1" />
+                <field field_ref="cltcalipsoun"         level="1" />
+                <field field_ref="clcalipso"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsoice"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsoliq"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsoun"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmp"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmpice"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmpliq"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmpun"  level="1" axis_ref="height" />
                 <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
                 <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
                 <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
-		<field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c03_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c04_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c05_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c06_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c07_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c08_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c09_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c10_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c11_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c12_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c13_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c14_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c15_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c16_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c17_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c18_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c19_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c20_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c03_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c04_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c05_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c06_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c07_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c08_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c09_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c10_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c11_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c12_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c13_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c14_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c15_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c16_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c17_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c18_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c19_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c20_cfad_lidarsr532"  level="10" axis_ref="height" />
                 <field field_ref="c01_atb532" level="10" axis_ref="height_mlev" />
                 <field field_ref="c02_atb532" level="10" axis_ref="height_mlev" />
Index: LMDZ5/branches/testing/DefLists/file_def_histhfNMC_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histhfNMC_lmdz.xml	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/file_def_histhfNMC_lmdz.xml	(revision 2435)
@@ -1,5 +1,5 @@
 <file_definition>
     <file_group id="defile">
-        <file id="histhfNMC" name="XhisthfNMC" output_freq="6h" output_level="5" enabled=".FALSE.">
+        <file id="histhfNMC" name="histhfNMC" output_freq="6h" output_level="5" enabled=".FALSE.">
 
             <!-- VARS 3D -->
Index: LMDZ5/branches/testing/DefLists/file_def_histmthCOSP_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histmthCOSP_lmdz.xml	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/file_def_histmthCOSP_lmdz.xml	(revision 2435)
@@ -1,36 +1,55 @@
 <file_definition>
      <file_group id="defile">
-        <file id="histmthCOSP" name="XhistmthCOSP" output_freq="1mo" output_level="10"  enabled=".FALSE.">
+        <file id="histmthCOSP" name="histmthCOSP" output_freq="30d" output_level="1"  enabled=".TRUE.">
 
             <!-- VARS 2D -->
-            <field_group operation="average" freq_op="3h">
+            <field_group operation="average" freq_op="3h" detect_missing_value=".true.">
                 <field field_ref="cllcalipso"         level="1" />
                 <field field_ref="clmcalipso"         level="1" />
                 <field field_ref="clhcalipso"         level="1" />
                 <field field_ref="cltcalipso"         level="1" />
-                <field field_ref="clcalipso"  level="1" axis_ref="presnivs" />
+                <field field_ref="cllcalipsoice"         level="1" />
+                <field field_ref="clmcalipsoice"         level="1" />
+                <field field_ref="clhcalipsoice"         level="1" />
+                <field field_ref="cltcalipsoice"         level="1" />
+                <field field_ref="cllcalipsoliq"         level="1" />
+                <field field_ref="clmcalipsoliq"         level="1" />
+                <field field_ref="clhcalipsoliq"         level="1" />
+                <field field_ref="cltcalipsoliq"         level="1" />
+                <field field_ref="cllcalipsoun"         level="1" />
+                <field field_ref="clmcalipsoun"         level="1" />
+                <field field_ref="clhcalipsoun"         level="1" />
+                <field field_ref="cltcalipsoun"         level="1" />
+                <field field_ref="clcalipso"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsoice"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsoliq"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsoun"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmp"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmpice"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmpliq"  level="1" axis_ref="height" />
+                <field field_ref="clcalipsotmpun"  level="1" axis_ref="height" />
                 <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
                 <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
                 <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
-		<field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c03_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c04_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c05_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c06_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c07_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c08_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c09_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c10_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c11_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c12_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c13_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c14_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c15_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c16_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c17_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c18_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c19_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
-		<field field_ref="c20_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c03_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c04_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c05_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c06_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c07_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c08_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c09_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c10_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c11_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c12_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c13_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c14_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c15_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c16_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c17_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c18_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c19_cfad_lidarsr532"  level="10" axis_ref="height" />
+		<field field_ref="c20_cfad_lidarsr532"  level="10" axis_ref="height" />
                 <field field_ref="c01_atb532" level="10" axis_ref="height_mlev" />
                 <field field_ref="c02_atb532" level="10" axis_ref="height_mlev" />
@@ -54,18 +73,18 @@
                 <field field_ref="c20_atb532" level="10" axis_ref="height_mlev" />
                 <field field_ref="beta_mol532" level="10" axis_ref="height_mlev" />
-                <field field_ref="sunlit" level="10" />
-                <field field_ref="c01_clisccp2" level="10" axis_ref="pressure2" />
-                <field field_ref="c02_clisccp2" level="10" axis_ref="pressure2" />
-                <field field_ref="c03_clisccp2" level="10" axis_ref="pressure2" />
-                <field field_ref="c04_clisccp2" level="10" axis_ref="pressure2" />
-                <field field_ref="c05_clisccp2" level="10" axis_ref="pressure2" />
-                <field field_ref="c06_clisccp2" level="10" axis_ref="pressure2" />
-                <field field_ref="c07_clisccp2" level="10" axis_ref="pressure2" />
+                <field field_ref="sunlit" level="1" />
+                <field field_ref="c01_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c02_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c03_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c04_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c05_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c06_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c07_clisccp2" level="1" axis_ref="pressure2" />
                 <field field_ref="boxtauisccp" level="10" axis_ref="column" />
                 <field field_ref="boxptopisccp" level="10" axis_ref="column" />
-                <field field_ref="tclisccp" level="10" />
-                <field field_ref="ctpisccp" level="10" />
-                <field field_ref="tauisccp" level="10" /> 
-                <field field_ref="albisccp" level="10" />
+                <field field_ref="tclisccp" level="1" />
+                <field field_ref="ctpisccp" level="1" />
+                <field field_ref="tauisccp" level="1" /> 
+                <field field_ref="albisccp" level="1" />
                 <field field_ref="meantbisccp" level="10" />
                 <field field_ref="meantbclrisccp" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histmthNMC_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histmthNMC_lmdz.xml	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/file_def_histmthNMC_lmdz.xml	(revision 2435)
@@ -1,5 +1,5 @@
 <file_definition>
     <file_group id="defile">
-        <file id="histmthNMC" name="XhistmthNMC" output_freq="5d" output_level="5" enabled=".FALSE.">
+        <file id="histmthNMC" name="histmthNMC" output_freq="1mo" output_level="5" enabled=".FALSE.">
 
             <!-- VARS 3D -->
Index: LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml	(revision 2435)
@@ -1,5 +1,5 @@
 <file_definition>
         <file_group id="defile">
-        <file id="histmth" name="histmth" output_freq="1d" output_level="5"  enabled=".FALSE.">
+        <file id="histmth" name="histmth" output_freq="1mo" output_level="5"  enabled=".FALSE.">
 
             <!-- VARS 1D -->
Index: LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml	(revision 2435)
@@ -1,5 +1,5 @@
 <file_definition>
     <file_group id="defile">
-        <file id="histstn" name="Xhiststn" output_freq="1h" output_level="5" enabled=".FALSE.">
+        <file id="histstn" name="histstn" output_freq="1800s" output_level="5" enabled=".FALSE.">
 
             <!-- VARS 1D -->