Index: LMDZ6/branches/IPSLCM6.0.15/DefLists/file_def_histmth_lmdz.xml
===================================================================
--- LMDZ6/branches/IPSLCM6.0.15/DefLists/file_def_histmth_lmdz.xml	(revision 3242)
+++ LMDZ6/branches/IPSLCM6.0.15/DefLists/file_def_histmth_lmdz.xml	(revision 3243)
@@ -366,5 +366,4 @@
                 <field field_ref="z0m" level="10" />
                 <field field_ref="z0h" level="10" />
-<<<<<<< .mine
                 <field field_ref="topswad" level="10" />
                 <field field_ref="topswad0" level="10" />
@@ -392,5 +391,5 @@
                 <field field_ref="od550_CSNO3M" level="7" />
                 <field field_ref="od550_CINO3M" level="7" />
-                <field field_ref="od550_STRAT" level="7" />
+                <field field_ref="od550_STRAT" level="2" />
                 <field field_ref="dryod550_ASBCM" level="7" />
                 <field field_ref="dryod550_ASPOMM" level="7" />
@@ -557,8 +556,8 @@
                 <field field_ref="lcc3dcon" level="11" />
                 <field field_ref="lcc3dstra" level="11" />
-                <field field_ref="cldwatmxrat" level="2" />
+                <field field_ref="cldwatmxrat" level="5" />
                 <field field_ref="icc3dcon" level="11" />
                 <field field_ref="icc3dstra" level="11" />
-                <field field_ref="cldicemxrat" level="2" />
+                <field field_ref="cldicemxrat" level="5" />
                 <field field_ref="clwcon" level="7" />
                 <field field_ref="Ma" level="7" />
@@ -674,5 +673,5 @@
             <!-- VARS 3D -->
             <field_group operation="average" freq_op="1ts" grid_ref="grid_glo_spectband">
-                <field field_ref="solbnd" level="4" />
+                <field field_ref="solbnd" level="10" />
             </field_group>