Index: ICOSA_LMDZ/xml/XML_XIOS2/icosa_lmdz.xml
===================================================================
--- ICOSA_LMDZ/xml/XML_XIOS2/icosa_lmdz.xml	(revision 4968)
+++ ICOSA_LMDZ/xml/XML_XIOS2/icosa_lmdz.xml	(revision 4968)
@@ -0,0 +1,3 @@
+<context_group>
+  <context id="icosagcm" src="./param_gw.xml" />
+</context_group>
Index: ICOSA_LMDZ/xml/XML_XIOS2/param_gw.xml
===================================================================
--- ICOSA_LMDZ/xml/XML_XIOS2/param_gw.xml	(revision 4968)
+++ ICOSA_LMDZ/xml/XML_XIOS2/param_gw.xml	(revision 4968)
@@ -0,0 +1,175 @@
+<context id="icosagcm" >
+
+   <file_definition>    
+ 
+     <file id="relief_gw" name="Relief" type="one_file" mode="read" output_freq="100y" enabled="false" >
+        <field id="relief_gw" freq_offset="0ts" name="RELIEF" domain_ref="domain_relief_gw" operation="instant" />
+     </file>
+  
+
+     <file id="orography" name="orography" mode="read" output_freq="100y" enabled="false">
+
+         <field_group domain_ref="domain_orography" operation="instant" freq_offset="0ts"> 
+            <field id="zmea_sso_read" name="phi" />
+            <field id="zstd_sso_read" name="mu" />
+            <field id="zsig_sso_read" name="sigma" />
+            <field id="zgam_sso_read" name="gama" />
+            <field id="zthe_sso_read" name="theta" />
+         </field_group >
+
+     </file>
+
+
+    <!--  needed only for test and debugging
+     
+    <file name="param_gw_reg" type="one_file" output_freq="1ts" >
+       <field id="zmask_regout" name="zmask" domain_ref="regular_gw" operation="instant"  prec="8"/>
+       <field id="zmea_regout"  name="zmea" domain_ref="regular_gw" operation="instant"  prec="8"/>
+       <field id="zpic_regout"  name="zpic" domain_ref="regular_gw" operation="instant"  prec="8"/>
+       <field id="zval_regout"  name="zval" domain_ref="regular_gw" operation="instant"  prec="8"/>
+       <field id="zsig_regout"  name="zsig" domain_ref="regular_gw" operation="instant"  prec="8"/>
+       <field id="zgam_regout"  name="zgam" domain_ref="regular_gw" operation="instant"  prec="8"/>
+       <field id="zthe_regout"  name="zthe" domain_ref="regular_gw" operation="instant"  prec="8"/>
+     </file>     
+     
+    <file name="test_gw" type="one_file" output_freq="1ts" >
+       <field field_ref="zmea_out" name="zmea" operation="instant" prec="8"/>
+       <field field_ref="zpic_out" name="zpic" operation="instant"  prec="8"/>
+       <field field_ref="zval_out" name="zval" operation="instant"  prec="8"/>
+       <field field_ref="ztz_out" name="ztz" operation="instant"  prec="8"/>
+       <field field_ref="zxtzx_out" name="zxtzx" operation="instant"  prec="8"/>
+       <field field_ref="zytzy_out" name="zytzy" operation="instant"  prec="8"/>
+       <field field_ref="zxtzy_out" name="zxtzy" operation="instant"  prec="8"/>
+     </file>
+
+     <file name="test_gw_orig" type="one_file" output_freq="1ts" >
+       <field field_ref="zxtzx_in" name="zxtzx" operation="instant"  prec="8"/>
+       <field field_ref="zytzy_in" name="zytzy" operation="instant"  prec="8"/>
+       <field field_ref="zxtzy_in" name="zxtzy" operation="instant"  prec="8"/>
+     </file>
+     
+     <file name="param_gw" type="one_file" output_freq="1ts" >
+       <field id="zmask" domain_ref="i" operation="instant"  prec="8"/>
+       <field id="zmea" domain_ref="i" operation="instant"  prec="8"/>
+       <field id="zpic" domain_ref="i" operation="instant"  prec="8"/>
+       <field id="zval" domain_ref="i" operation="instant"  prec="8"/>
+       <field id="zsig" domain_ref="i" operation="instant"  prec="8"/>
+       <field id="zgam" domain_ref="i" operation="instant"  prec="8"/>
+       <field id="zthe" domain_ref="i" operation="instant"  prec="8"/>
+     </file>       
+     
+     <file name="lmdz_mesh" type="one_file" mode="read" output_freq="1ts" >
+       <field id="dummy" name="phis" domain_ref="regular_gw" operation="instant"  prec="8"/>
+     </file>       
+
+    -->
+
+   </file_definition>
+
+
+   <domain_definition>
+
+      <domain id="domain_relief_gw" type="rectilinear" >
+        <generate_rectilinear_domain />
+      </domain>
+      
+      <domain id="domain_relief_expand" domain_ref="domain_relief_gw">
+	 <expand_domain type="edge" i_periodic="true" j_periodic="true" />
+      </domain>
+      
+      <domain id="from_relief_gw" domain_ref="i">
+        <interpolate_domain order="1" />
+      </domain>
+      
+      <domain id="regular_gw" type="rectilinear" >
+        <generate_rectilinear_domain/>
+      </domain>
+
+      <domain id="regular_gw_interp" domain_ref="regular_gw" >
+        <interpolate_domain order="1" />
+      </domain>
+
+      <domain id="regular_gw_exp" domain_ref="regular_gw_interp" >
+        <expand_domain type="edge" i_periodic="true" j_periodic="true" />
+      </domain>
+        
+      <domain id="domain_orography" type="rectilinear" >
+        <generate_rectilinear_domain /> 
+      </domain>  
+
+      <domain id="from_orography" domain_ref="i">
+        <interpolate_domain order="1" write_weight="true" mode="read_or_compute"/>
+      </domain>
+
+   </domain_definition>
+
+   <field_definition>
+   
+     <field id="lon2d_in" domain_ref="domain_relief_gw" />
+     <field id="lat2d_in" domain_ref="domain_relief_gw" />
+     <field id="mask_in"  domain_ref="domain_relief_gw" />
+     <field id="zmea_in"  domain_ref="domain_relief_gw" />
+     <field id="zpic_in" domain_ref="domain_relief_gw" > exp(this/20.) </field>
+     <field id="zpic_tmp" field_ref="zpic_in"  domain_ref="from_relief_gw" /> 
+     <field id="zval_in" domain_ref="domain_relief_gw" > exp(-this/20.) </field>
+     <field id="zval_tmp" field_ref="zval_in"  domain_ref="from_relief_gw" /> 
+     <field id="ztz_in" domain_ref="domain_relief_gw" />
+     <field id="zytzy_in" domain_ref="domain_relief_gw" />
+     <field id="zxtzx_in" domain_ref="domain_relief_gw" />
+     <field id="zxtzy_in" domain_ref="domain_relief_gw" />
+
+
+     <field_group id="gw_read_access" read_access="false" >
+       <field id="relief_exp" field_ref="relief_gw" domain_ref="domain_relief_expand" />
+       <field id="lon2d_out" field_ref="lon2d_in" domain_ref="domain_relief_expand" />
+       <field id="lat2d_out" field_ref="lat2d_in" domain_ref="domain_relief_expand" />
+       <field id="mask_out" field_ref="mask_in" domain_ref="from_relief_gw" />
+       <field id="zmea_out" field_ref="zmea_in" domain_ref="from_relief_gw" />
+       <field id="zpic_out" field_ref="zpic_tmp" > log(this)*20. </field>
+       <field id="zval_out" field_ref="zval_tmp" > -log(this)*20. </field>
+       <field id="ztz_out" field_ref="ztz_in" domain_ref="from_relief_gw" />
+       <field id="zytzy_out" field_ref="zytzy_in" domain_ref="from_relief_gw" />
+       <field id="zxtzx_out" field_ref="zxtzx_in" domain_ref="from_relief_gw" />
+       <field id="zxtzy_out" field_ref="zxtzy_in" domain_ref="from_relief_gw" />
+     </field_group>
+
+
+     <field_group id="gwsso_read_access" read_access="false" >
+       <field id="zmea_sso"  field_ref="zmea_sso_read" domain_ref="from_orography" />
+       <field id="zstd_sso"  field_ref="zstd_sso_read" domain_ref="from_orography" />
+       <field id="zsig_sso" field_ref="zsig_sso_read" domain_ref="from_orography" />
+       <field id="zgam_sso"  field_ref="zgam_sso_read" domain_ref="from_orography" />
+       <field id="zthe_sso"  field_ref="zthe_sso_read" domain_ref="from_orography" />
+    </field_group>
+     
+     <!-- for test and debugging (projection onto regular lonlat grid for comparison)
+     
+     <field id="mask_reg" field_ref="mask_in" domain_ref="regular_gw_interp" read_access="true"/>
+     <field id="mask_reg_exp" field_ref="mask_reg" domain_ref="regular_gw_exp" read_access="true"/>
+
+     <field id="zmea_reg" field_ref="zmea_in" domain_ref="regular_gw_interp"/>
+     <field id="zmea_reg_exp" field_ref="zmea_reg" domain_ref="regular_gw_exp" read_access="true"/>
+
+     <field id="zpic_reg" field_ref="zpic_in" domain_ref="regular_gw_interp"/>
+     <field id="zpic_reg_exp" field_ref="zpic_reg" domain_ref="regular_gw_exp" read_access="true"> log(this)*20. </field>
+
+     <field id="zval_reg" field_ref="zval_in" domain_ref="regular_gw_interp"/>
+     <field id="zval_reg_exp" field_ref="zval_reg" domain_ref="regular_gw_exp" read_access="true"> -log(this)*20. </field>
+
+     <field id="ztz_reg" field_ref="ztz_in" domain_ref="regular_gw_interp"/>
+     <field id="ztz_reg_exp" field_ref="ztz_reg" domain_ref="regular_gw_exp" read_access="true"/>
+
+     <field id="zytzy_reg" field_ref="zytzy_in" domain_ref="regular_gw_interp"/>
+     <field id="zytzy_reg_exp" field_ref="zytzy_reg" domain_ref="regular_gw_exp" read_access="true"/>
+
+     <field id="zxtzx_reg" field_ref="zxtzx_in" domain_ref="regular_gw_interp"/>
+     <field id="zxtzx_reg_exp" field_ref="zxtzx_reg" domain_ref="regular_gw_exp" read_access="true"/>
+
+     <field id="zxtzy_reg" field_ref="zxtzy_in" domain_ref="regular_gw_interp"/>
+     <field id="zxtzy_reg_exp" field_ref="zxtzy_reg" domain_ref="regular_gw_exp" read_access="true"/>
+    
+     -->
+     
+   </field_definition>
+   
+</context>
Index: ICOSA_LMDZ/xml/icosa_lmdz.xml
===================================================================
--- ICOSA_LMDZ/xml/icosa_lmdz.xml	(revision 4967)
+++ 	(revision )
@@ -1,3 +1,0 @@
-<context_group>
-  <context id="icosagcm" src="./param_gw.xml" />
-</context_group>
Index: ICOSA_LMDZ/xml/param_gw.xml
===================================================================
--- ICOSA_LMDZ/xml/param_gw.xml	(revision 4967)
+++ 	(revision )
@@ -1,175 +1,0 @@
-<context id="icosagcm" >
-
-   <file_definition>    
- 
-     <file id="relief_gw" name="Relief" type="one_file" mode="read" output_freq="100y" enabled="false" >
-        <field id="relief_gw" freq_offset="0ts" name="RELIEF" domain_ref="domain_relief_gw" operation="instant" />
-     </file>
-  
-
-     <file id="orography" name="orography" mode="read" output_freq="100y" enabled="false">
-
-         <field_group domain_ref="domain_orography" operation="instant" freq_offset="0ts"> 
-            <field id="zmea_sso_read" name="phi" />
-            <field id="zstd_sso_read" name="mu" />
-            <field id="zsig_sso_read" name="sigma" />
-            <field id="zgam_sso_read" name="gama" />
-            <field id="zthe_sso_read" name="theta" />
-         </field_group >
-
-     </file>
-
-
-    <!--  needed only for test and debugging
-     
-    <file name="param_gw_reg" type="one_file" output_freq="1ts" >
-       <field id="zmask_regout" name="zmask" domain_ref="regular_gw" operation="instant"  prec="8"/>
-       <field id="zmea_regout"  name="zmea" domain_ref="regular_gw" operation="instant"  prec="8"/>
-       <field id="zpic_regout"  name="zpic" domain_ref="regular_gw" operation="instant"  prec="8"/>
-       <field id="zval_regout"  name="zval" domain_ref="regular_gw" operation="instant"  prec="8"/>
-       <field id="zsig_regout"  name="zsig" domain_ref="regular_gw" operation="instant"  prec="8"/>
-       <field id="zgam_regout"  name="zgam" domain_ref="regular_gw" operation="instant"  prec="8"/>
-       <field id="zthe_regout"  name="zthe" domain_ref="regular_gw" operation="instant"  prec="8"/>
-     </file>     
-     
-    <file name="test_gw" type="one_file" output_freq="1ts" >
-       <field field_ref="zmea_out" name="zmea" operation="instant" prec="8"/>
-       <field field_ref="zpic_out" name="zpic" operation="instant"  prec="8"/>
-       <field field_ref="zval_out" name="zval" operation="instant"  prec="8"/>
-       <field field_ref="ztz_out" name="ztz" operation="instant"  prec="8"/>
-       <field field_ref="zxtzx_out" name="zxtzx" operation="instant"  prec="8"/>
-       <field field_ref="zytzy_out" name="zytzy" operation="instant"  prec="8"/>
-       <field field_ref="zxtzy_out" name="zxtzy" operation="instant"  prec="8"/>
-     </file>
-
-     <file name="test_gw_orig" type="one_file" output_freq="1ts" >
-       <field field_ref="zxtzx_in" name="zxtzx" operation="instant"  prec="8"/>
-       <field field_ref="zytzy_in" name="zytzy" operation="instant"  prec="8"/>
-       <field field_ref="zxtzy_in" name="zxtzy" operation="instant"  prec="8"/>
-     </file>
-     
-     <file name="param_gw" type="one_file" output_freq="1ts" >
-       <field id="zmask" domain_ref="i" operation="instant"  prec="8"/>
-       <field id="zmea" domain_ref="i" operation="instant"  prec="8"/>
-       <field id="zpic" domain_ref="i" operation="instant"  prec="8"/>
-       <field id="zval" domain_ref="i" operation="instant"  prec="8"/>
-       <field id="zsig" domain_ref="i" operation="instant"  prec="8"/>
-       <field id="zgam" domain_ref="i" operation="instant"  prec="8"/>
-       <field id="zthe" domain_ref="i" operation="instant"  prec="8"/>
-     </file>       
-     
-     <file name="lmdz_mesh" type="one_file" mode="read" output_freq="1ts" >
-       <field id="dummy" name="phis" domain_ref="regular_gw" operation="instant"  prec="8"/>
-     </file>       
-
-    -->
-
-   </file_definition>
-
-
-   <domain_definition>
-
-      <domain id="domain_relief_gw" type="rectilinear" >
-        <generate_rectilinear_domain />
-      </domain>
-      
-      <domain id="domain_relief_expand" domain_ref="domain_relief_gw">
-	 <expand_domain type="edge" i_periodic="true" j_periodic="true" />
-      </domain>
-      
-      <domain id="from_relief_gw" domain_ref="i">
-        <interpolate_domain order="1" />
-      </domain>
-      
-      <domain id="regular_gw" type="rectilinear" >
-        <generate_rectilinear_domain/>
-      </domain>
-
-      <domain id="regular_gw_interp" domain_ref="regular_gw" >
-        <interpolate_domain order="1" />
-      </domain>
-
-      <domain id="regular_gw_exp" domain_ref="regular_gw_interp" >
-        <expand_domain type="edge" i_periodic="true" j_periodic="true" />
-      </domain>
-        
-      <domain id="domain_orography" type="rectilinear" >
-        <generate_rectilinear_domain /> 
-      </domain>  
-
-      <domain id="from_orography" domain_ref="i">
-        <interpolate_domain order="1" write_weight="true" mode="read_or_compute"/>
-      </domain>
-
-   </domain_definition>
-
-   <field_definition>
-   
-     <field id="lon2d_in" domain_ref="domain_relief_gw" />
-     <field id="lat2d_in" domain_ref="domain_relief_gw" />
-     <field id="mask_in"  domain_ref="domain_relief_gw" />
-     <field id="zmea_in"  domain_ref="domain_relief_gw" />
-     <field id="zpic_in" domain_ref="domain_relief_gw" > exp(this/20.) </field>
-     <field id="zpic_tmp" field_ref="zpic_in"  domain_ref="from_relief_gw" /> 
-     <field id="zval_in" domain_ref="domain_relief_gw" > exp(-this/20.) </field>
-     <field id="zval_tmp" field_ref="zval_in"  domain_ref="from_relief_gw" /> 
-     <field id="ztz_in" domain_ref="domain_relief_gw" />
-     <field id="zytzy_in" domain_ref="domain_relief_gw" />
-     <field id="zxtzx_in" domain_ref="domain_relief_gw" />
-     <field id="zxtzy_in" domain_ref="domain_relief_gw" />
-
-
-     <field_group id="gw_read_access" read_access="false" >
-       <field id="relief_exp" field_ref="relief_gw" domain_ref="domain_relief_expand" />
-       <field id="lon2d_out" field_ref="lon2d_in" domain_ref="domain_relief_expand" />
-       <field id="lat2d_out" field_ref="lat2d_in" domain_ref="domain_relief_expand" />
-       <field id="mask_out" field_ref="mask_in" domain_ref="from_relief_gw" />
-       <field id="zmea_out" field_ref="zmea_in" domain_ref="from_relief_gw" />
-       <field id="zpic_out" field_ref="zpic_tmp" > log(this)*20. </field>
-       <field id="zval_out" field_ref="zval_tmp" > -log(this)*20. </field>
-       <field id="ztz_out" field_ref="ztz_in" domain_ref="from_relief_gw" />
-       <field id="zytzy_out" field_ref="zytzy_in" domain_ref="from_relief_gw" />
-       <field id="zxtzx_out" field_ref="zxtzx_in" domain_ref="from_relief_gw" />
-       <field id="zxtzy_out" field_ref="zxtzy_in" domain_ref="from_relief_gw" />
-     </field_group>
-
-
-     <field_group id="gwsso_read_access" read_access="false" >
-       <field id="zmea_sso"  field_ref="zmea_sso_read" domain_ref="from_orography" />
-       <field id="zstd_sso"  field_ref="zstd_sso_read" domain_ref="from_orography" />
-       <field id="zsig_sso" field_ref="zsig_sso_read" domain_ref="from_orography" />
-       <field id="zgam_sso"  field_ref="zgam_sso_read" domain_ref="from_orography" />
-       <field id="zthe_sso"  field_ref="zthe_sso_read" domain_ref="from_orography" />
-    </field_group>
-     
-     <!-- for test and debugging (projection onto regular lonlat grid for comparison)
-     
-     <field id="mask_reg" field_ref="mask_in" domain_ref="regular_gw_interp" read_access="true"/>
-     <field id="mask_reg_exp" field_ref="mask_reg" domain_ref="regular_gw_exp" read_access="true"/>
-
-     <field id="zmea_reg" field_ref="zmea_in" domain_ref="regular_gw_interp"/>
-     <field id="zmea_reg_exp" field_ref="zmea_reg" domain_ref="regular_gw_exp" read_access="true"/>
-
-     <field id="zpic_reg" field_ref="zpic_in" domain_ref="regular_gw_interp"/>
-     <field id="zpic_reg_exp" field_ref="zpic_reg" domain_ref="regular_gw_exp" read_access="true"> log(this)*20. </field>
-
-     <field id="zval_reg" field_ref="zval_in" domain_ref="regular_gw_interp"/>
-     <field id="zval_reg_exp" field_ref="zval_reg" domain_ref="regular_gw_exp" read_access="true"> -log(this)*20. </field>
-
-     <field id="ztz_reg" field_ref="ztz_in" domain_ref="regular_gw_interp"/>
-     <field id="ztz_reg_exp" field_ref="ztz_reg" domain_ref="regular_gw_exp" read_access="true"/>
-
-     <field id="zytzy_reg" field_ref="zytzy_in" domain_ref="regular_gw_interp"/>
-     <field id="zytzy_reg_exp" field_ref="zytzy_reg" domain_ref="regular_gw_exp" read_access="true"/>
-
-     <field id="zxtzx_reg" field_ref="zxtzx_in" domain_ref="regular_gw_interp"/>
-     <field id="zxtzx_reg_exp" field_ref="zxtzx_reg" domain_ref="regular_gw_exp" read_access="true"/>
-
-     <field id="zxtzy_reg" field_ref="zxtzy_in" domain_ref="regular_gw_interp"/>
-     <field id="zxtzy_reg_exp" field_ref="zxtzy_reg" domain_ref="regular_gw_exp" read_access="true"/>
-    
-     -->
-     
-   </field_definition>
-   
-</context>