Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/field_def.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/field_def.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/field_def.xml	(revision 484)
@@ -33,5 +33,6 @@
         <field id="omega"/>
         <field id="temp"/>
-        
+
+<!--        
         <field id="q1"/>
         <field id="q2"/>
@@ -39,5 +40,6 @@
         <field id="q4"/>
         <field id="q5"/>
-
+-->
+        
         <field id="mass_init" />
         <field id="p_init" />
@@ -49,11 +51,5 @@
         <field id="temp_init"/>
         
-        <field id="q_init1"/>
-        <field id="q_init2"/>
-        <field id="q_init3"/>
-        <field id="q_init4"/>
-        <field id="q_init5"/>
       </field_group>
-      
       <field id="u850" />
       <field id="v850" />
@@ -75,5 +71,6 @@
       </field_group>
     </field_group> 
-    
+    <field id="q_init" grid_ref="grid_q" />    
+    <field id="q" grid_ref="grid_q" />    
     
     <field_group domain_ref="v" axis_ref="lev">
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/filedef_dcmip2016.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/filedef_dcmip2016.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/filedef_dcmip2016.xml	(revision 484)
@@ -1,5 +1,5 @@
 <file_definition > 
 
-  <file id="output_dcmip2016_native" enabled=".TRUE." output_freq="3h" sync_freq="3h" output_level="10" timeseries="both" description="Dry baroclinic wave" > 
+  <file id="output_dcmip2016_native" convention="CF" enabled="true" output_freq="3h" sync_freq="3h" output_level="10" timeseries="none" description="Dry baroclinic wave" > 
     
     <field_group id="dcmip2016_output_field_once" operation="once" freq_offset="0ts" ts_enabled="true">
@@ -23,10 +23,14 @@
       <field field_ref="p"  name="P"        standard_name="air_pressure" long_name="Pressure"     unit="Pa"/>
       <field field_ref="temp"  name="T"        standard_name="air_temperature" long_name="Temperature"     unit="K"/>
+<!--
       <field field_ref="q1"  name="Q"        standard_name="specific_humidity"  long_name="Specific humidity"          unit="kg/kg"/>
       <field field_ref="q2"  name="Qc"                                          long_name="Cloud water mixing ration"  unit="kg/kg"/>
       <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/>
+-->
       <field field_ref="precl"  name="PRECT"     standard_name="rainfall_rate"  long_name="Large Scale precipitation rate"  unit="m/s"/>
+<!--
       <field field_ref="q4"  name="Q1"      long_name="Single chlorine mixing ratio"  unit="kg/kg"/> 
       <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/> 
+-->
       <field field_ref="Q1_col_int"  name="Q1_col_int"      long_name="Single chlorine column integrated mixing ratio"  unit="kg/m2"/> 
       <field field_ref="Q2_col_int"  name="Q2_col_int"      long_name="Chlorine gas column integrated mixing ratio"  unit="kg/m2"/> 
@@ -56,5 +60,5 @@
 
 
-  <file id="output_dcmip2016_regular" enabled=".TRUE." output_freq="3h" sync_freq="3h" output_level="10" description="Dry baroclinic wave" timeseries="both" > 
+  <file id="output_dcmip2016_regular" enabled="false" output_freq="3h" sync_freq="3h" output_level="10" description="Dry baroclinic wave" timeseries="none" > 
     
     <field_group group_ref="dcmip2016_output_field_once"/>
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/icosa.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/icosa.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/icosa.xml	(revision 484)
@@ -4,6 +4,6 @@
   <field_definition src="./field_def.xml" />
 
+<!--  <file_definition src="./filedef_debug.xml" /> -->     
   <file_definition src="./filedef_dcmip2016.xml" /> 
-<!--  <file_definition src="./filedef_debug.xml" /> -->     
 
   <file_definition type="one_file" par_access="collective">
@@ -12,13 +12,50 @@
       <field_group group_ref="standard_output"/>
     </file>
+
+    <file id="restart" name="restart" enabled="true">
+       <field_group id="group_restart" operation="once"> 
+          <field id="it_restart" name="iteration"  grid_ref="scalar" />
+          <field id="q_restart" name="q"  grid_ref="grid_q" />
+          <field_group domain_ref="i"> 
+             <field id="ps_restart" name="ps" />
+             <field id="phis_restart" name="phis" />
+             <field_group axis_ref="lev" >
+                <field id="theta_rhodz_restart" name="theta_rhodz" />
+                <field id="u_restart" name="u" domain_ref="u"/>
+                <field id="ulon_restart" name="ulon" />
+                <field id="ulat_restart" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
+    <file id="start" name="start" enabled="false" mode="read">
+       <field_group id="group_start" operation="once"> 
+          <field id="it_start" name="iteration"  grid_ref="scalar" enabled="false"/>
+          <field id="q_start" name="q"  grid_ref="grid_q_read" />
+          <field_group domain_ref="i"> 
+             <field id="ps_start" name="ps" />
+             <field id="phis_start" name="phis" />
+             <field_group axis_ref="lev_read" >
+                <field id="theta_rhodz_start" name="theta_rhodz" />
+                <field id="u_start" name="u" domain_ref="u"/>
+                <field id="ulon_start" name="ulon" />
+                <field id="ulat_start" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
     
   </file_definition>
     
   <axis_definition>
-    <axis id="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev" name="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev_read" />
     <axis id="levp1" name="ilev"  unit="level" positive="down" standard_name="atmopshere_hybride_sigma_pressure_coordinate" long_name="hybrid level at interface" />
     <axis id="lev_pressure" positive="down"  n_glo="2" unit="Pa" value="(0,1)[85000 50000]" >
       <interpolate_axis order="1" coordinate="p" />
     </axis>    
+    <axis id="nq" name="nq" n_glo="5" value="(0,4)[1 2 3 4 5]"/>
   </axis_definition>    
   
@@ -26,9 +63,10 @@
     
      <domain_group id="i"> 
-       <domain id="i"/>     
+       <domain id="i" name="mesh"/>     
      </domain_group> 
      
      
      <domain id="v" />
+     <domain id="u" />
      
      <domain id="regular_half_degree" type="rectilinear" ni_glo="720" nj_glo="360" >
@@ -52,4 +90,17 @@
     <grid id="scalar">
     </grid>
+    
+    <grid id="grid_q">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev" />
+      <axis axis_ref="nq" />
+    </grid >
+
+    <grid id="grid_q_read">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev_read" />
+      <axis axis_ref="nq" />
+    </grid >
+ 
   </grid_definition>   
   
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/iodef.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/iodef.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/iodef.xml	(revision 484)
@@ -5,10 +5,9 @@
 		<variable_definition>
                 <variable id="print_file" type="bool"> true </variable> 
-                <variable id="min_buffer_size" type="double">1000000</variable> 
        		<variable_group id="buffer">
          	</variable_group>
 
         	<variable_group id="parameters" >
-        		<variable id="using_server" type="bool">true</variable>
+        		<variable id="using_server" type="bool">false</variable>
         		<variable id="info_level" type="int">100</variable>
         	</variable_group>
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/run.def
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/run.def	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry/run.def	(revision 484)
@@ -1,2 +1,3 @@
+mpi_threading_mode=funneled
 INCLUDEDEF = const.def
 
@@ -4,5 +5,5 @@
 
 # Number of subdivisions on a main triangle : integer (default=40)
-nbp = 80
+nbp = 40
 
 # Number of vertical layers : integer (default=19)
@@ -14,10 +15,11 @@
 
 # Mesh optimisation : number of iterations : integer (default=0)
-optim_it = 2000
+optim_it = 0
 
 # Sub splitting of main rhombus : integer (default=1)
-nsplit_i = 4
-nsplit_j = 4
+nsplit_i = 2
+nsplit_j = 2
 
+omp_level_size=1
 
 #---------------- Numerics ----------------
@@ -49,6 +51,7 @@
 # Run length in s : real (default=??)
 #            30 days
-run_length = 2592000
-#run_length = 86400
+#run_length = 2592000
+#run_length = 604800
+run_length = 10800
 
 # Interval in s between two outputs : integer (default=??)
@@ -63,6 +66,10 @@
 # Initial state : 
 #   [jablonowsky06|academic|dcmip[1-4]|heldsz|dcmip2_schaer_noshear] (default=jablonowsky06)
-etat0 = dcmip2016_baroclinic_wave
+#etat0 = dcmip2016_baroclinic_wave
+etat0 = start_file
 
+restart_file_name=test_restart
+
+itau_check_conserv=1
 
 itau_physics=3
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry_variable/field_def.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry_variable/field_def.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry_variable/field_def.xml	(revision 484)
@@ -33,5 +33,6 @@
         <field id="omega"/>
         <field id="temp"/>
-        
+
+<!--        
         <field id="q1"/>
         <field id="q2"/>
@@ -39,5 +40,6 @@
         <field id="q4"/>
         <field id="q5"/>
-
+-->
+        
         <field id="mass_init" />
         <field id="p_init" />
@@ -49,11 +51,5 @@
         <field id="temp_init"/>
         
-        <field id="q_init1"/>
-        <field id="q_init2"/>
-        <field id="q_init3"/>
-        <field id="q_init4"/>
-        <field id="q_init5"/>
       </field_group>
-      
       <field id="u850" />
       <field id="v850" />
@@ -75,5 +71,6 @@
       </field_group>
     </field_group> 
-    
+    <field id="q_init" grid_ref="grid_q" />    
+    <field id="q" grid_ref="grid_q" />    
     
     <field_group domain_ref="v" axis_ref="lev">
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry_variable/filedef_dcmip2016.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry_variable/filedef_dcmip2016.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry_variable/filedef_dcmip2016.xml	(revision 484)
@@ -23,10 +23,12 @@
       <field field_ref="p"  name="P"        standard_name="air_pressure" long_name="Pressure"     unit="Pa"/>
       <field field_ref="temp"  name="T"        standard_name="air_temperature" long_name="Temperature"     unit="K"/>
+<!--
       <field field_ref="q1"  name="Q"        standard_name="specific_humidity"  long_name="Specific humidity"          unit="kg/kg"/>
       <field field_ref="q2"  name="Qc"                                          long_name="Cloud water mixing ration"  unit="kg/kg"/>
-      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/>
+      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/> -->
       <field field_ref="precl"  name="PRECT"     standard_name="rainfall_rate"  long_name="Large Scale precipitation rate"  unit="m/s"/>
+<!--
       <field field_ref="q4"  name="Q1"      long_name="Single chlorine mixing ratio"  unit="kg/kg"/> 
-      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/> 
+      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/>  -->
       <field field_ref="Q1_col_int"  name="Q1_col_int"      long_name="Single chlorine column integrated mixing ratio"  unit="kg/m2"/> 
       <field field_ref="Q2_col_int"  name="Q2_col_int"      long_name="Chlorine gas column integrated mixing ratio"  unit="kg/m2"/> 
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry_variable/icosa.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry_variable/icosa.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/dry_variable/icosa.xml	(revision 484)
@@ -4,6 +4,6 @@
   <field_definition src="./field_def.xml" />
 
+<!--  <file_definition src="./filedef_debug.xml" /> -->     
   <file_definition src="./filedef_dcmip2016.xml" /> 
-<!--  <file_definition src="./filedef_debug.xml" /> -->     
 
   <file_definition type="one_file" par_access="collective">
@@ -12,13 +12,50 @@
       <field_group group_ref="standard_output"/>
     </file>
+
+    <file id="restart" name="restart" enabled="true">
+       <field_group id="group_restart" operation="once"> 
+          <field id="it_restart" name="iteration"  grid_ref="scalar" />
+          <field id="q_restart" name="q"  grid_ref="grid_q" />
+          <field_group domain_ref="i"> 
+             <field id="ps_restart" name="ps" />
+             <field id="phis_restart" name="phis" />
+             <field_group axis_ref="lev" >
+                <field id="theta_rhodz_restart" name="theta_rhodz" />
+                <field id="u_restart" name="u" domain_ref="u"/>
+                <field id="ulon_restart" name="ulon" />
+                <field id="ulat_restart" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
+    <file id="start" name="start" enabled="false" mode="read">
+       <field_group id="group_start" operation="once"> 
+          <field id="it_start" name="iteration"  grid_ref="scalar" enabled="false"/>
+          <field id="q_start" name="q"  grid_ref="grid_q_read" />
+          <field_group domain_ref="i"> 
+             <field id="ps_start" name="ps" />
+             <field id="phis_start" name="phis" />
+             <field_group axis_ref="lev_read" >
+                <field id="theta_rhodz_start" name="theta_rhodz" />
+                <field id="u_start" name="u" domain_ref="u"/>
+                <field id="ulon_start" name="ulon" />
+                <field id="ulat_start" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
     
   </file_definition>
     
   <axis_definition>
-    <axis id="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev" name="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev_read" />
     <axis id="levp1" name="ilev"  unit="level" positive="down" standard_name="atmopshere_hybride_sigma_pressure_coordinate" long_name="hybrid level at interface" />
     <axis id="lev_pressure" positive="down"  n_glo="2" unit="Pa" value="(0,1)[85000 50000]" >
       <interpolate_axis order="1" coordinate="p" />
     </axis>    
+    <axis id="nq" name="nq" n_glo="5" value="(0,4)[1 2 3 4 5]"/>
   </axis_definition>    
   
@@ -26,9 +63,10 @@
     
      <domain_group id="i"> 
-       <domain id="i"/>     
+       <domain id="i" name="mesh"/>     
      </domain_group> 
      
      
      <domain id="v" />
+     <domain id="u" />
      
      <domain id="regular_half_degree" type="rectilinear" ni_glo="720" nj_glo="360" >
@@ -52,4 +90,17 @@
     <grid id="scalar">
     </grid>
+    
+    <grid id="grid_q">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev" />
+      <axis axis_ref="nq" />
+    </grid >
+
+    <grid id="grid_q_read">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev_read" />
+      <axis axis_ref="nq" />
+    </grid >
+ 
   </grid_definition>   
   
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq/field_def.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq/field_def.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq/field_def.xml	(revision 484)
@@ -15,4 +15,5 @@
       <field id="Ai" />
       <field id="phis" />
+      <field id="phi" />
       <field id="precl" />
       <field id="Q1_col_int" />     
@@ -32,5 +33,6 @@
         <field id="omega"/>
         <field id="temp"/>
-        
+
+<!--        
         <field id="q1"/>
         <field id="q2"/>
@@ -38,5 +40,6 @@
         <field id="q4"/>
         <field id="q5"/>
-
+-->
+        
         <field id="mass_init" />
         <field id="p_init" />
@@ -48,11 +51,5 @@
         <field id="temp_init"/>
         
-        <field id="q_init1"/>
-        <field id="q_init2"/>
-        <field id="q_init3"/>
-        <field id="q_init4"/>
-        <field id="q_init5"/>
       </field_group>
-      
       <field id="u850" />
       <field id="v850" />
@@ -74,5 +71,6 @@
       </field_group>
     </field_group> 
-    
+    <field id="q_init" grid_ref="grid_q" />    
+    <field id="q" grid_ref="grid_q" />    
     
     <field_group domain_ref="v" axis_ref="lev">
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq/filedef_dcmip2016.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq/filedef_dcmip2016.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq/filedef_dcmip2016.xml	(revision 484)
@@ -23,12 +23,14 @@
       <field field_ref="p"  name="P"        standard_name="air_pressure" long_name="Pressure"     unit="Pa"/>
       <field field_ref="temp"  name="T"        standard_name="air_temperature" long_name="Temperature"     unit="K"/>
+<!--
       <field field_ref="q1"  name="Q"        standard_name="specific_humidity"  long_name="Specific humidity"          unit="kg/kg"/>
       <field field_ref="q2"  name="Qc"                                          long_name="Cloud water mixing ration"  unit="kg/kg"/>
-      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/>
+      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/> -->
       <field field_ref="precl"  name="PRECT"     standard_name="rainfall_rate"  long_name="Large Scale precipitation rate"  unit="m/s"/>
       <field field_ref="Q1_col_int"  name="Q1_col_int"      long_name="Single chlorine column integrated mixing ratio"  unit="kg/m2"/> 
       <field field_ref="Q2_col_int"  name="Q2_col_int"      long_name="Chlorine gas column integrated mixing ratio"  unit="kg/m2"/> 
+<!--
       <field field_ref="q4"  name="Q1"      long_name="Single chlorine mixing ratio"  unit="kg/kg"/> 
-      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/> 
+      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/>  -->
       <field field_ref="u850" name="U850"       long_name="Zonal wind at 850 hPa"      unit="m/s"/>
       <field field_ref="v850" name="V850"       long_name="Meridional wind at 850 hPa"   unit="m/s"/>
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq/icosa.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq/icosa.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq/icosa.xml	(revision 484)
@@ -4,6 +4,6 @@
   <field_definition src="./field_def.xml" />
 
+<!--  <file_definition src="./filedef_debug.xml" /> -->     
   <file_definition src="./filedef_dcmip2016.xml" /> 
-<!--  <file_definition src="./filedef_debug.xml" /> -->     
 
   <file_definition type="one_file" par_access="collective">
@@ -12,13 +12,50 @@
       <field_group group_ref="standard_output"/>
     </file>
+
+    <file id="restart" name="restart" enabled="true">
+       <field_group id="group_restart" operation="once"> 
+          <field id="it_restart" name="iteration"  grid_ref="scalar" />
+          <field id="q_restart" name="q"  grid_ref="grid_q" />
+          <field_group domain_ref="i"> 
+             <field id="ps_restart" name="ps" />
+             <field id="phis_restart" name="phis" />
+             <field_group axis_ref="lev" >
+                <field id="theta_rhodz_restart" name="theta_rhodz" />
+                <field id="u_restart" name="u" domain_ref="u"/>
+                <field id="ulon_restart" name="ulon" />
+                <field id="ulat_restart" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
+    <file id="start" name="start" enabled="false" mode="read" >
+       <field_group id="group_start" operation="once"> 
+          <field id="it_start" name="iteration"  grid_ref="scalar" enabled="false"/>
+          <field id="q_start" name="q"  grid_ref="grid_q_read" />
+          <field_group domain_ref="i"> 
+             <field id="ps_start" name="ps" />
+             <field id="phis_start" name="phis" />
+             <field_group axis_ref="lev_read" >
+                <field id="theta_rhodz_start" name="theta_rhodz" />
+                <field id="u_start" name="u" domain_ref="u"/>
+                <field id="ulon_start" name="ulon" />
+                <field id="ulat_start" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
     
   </file_definition>
     
   <axis_definition>
-    <axis id="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev" name="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev_read" />
     <axis id="levp1" name="ilev"  unit="level" positive="down" standard_name="atmopshere_hybride_sigma_pressure_coordinate" long_name="hybrid level at interface" />
     <axis id="lev_pressure" positive="down"  n_glo="2" unit="Pa" value="(0,1)[85000 50000]" >
       <interpolate_axis order="1" coordinate="p" />
     </axis>    
+    <axis id="nq" name="nq" n_glo="5" value="(0,4)[1 2 3 4 5]"/>
   </axis_definition>    
   
@@ -26,9 +63,10 @@
     
      <domain_group id="i"> 
-       <domain id="i"/>     
+       <domain id="i" name="mesh"/>     
      </domain_group> 
      
      
      <domain id="v" />
+     <domain id="u" />
      
      <domain id="regular_half_degree" type="rectilinear" ni_glo="720" nj_glo="360" >
@@ -52,4 +90,17 @@
     <grid id="scalar">
     </grid>
+    
+    <grid id="grid_q">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev" />
+      <axis axis_ref="nq" />
+    </grid >
+
+    <grid id="grid_q_read">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev_read" />
+      <axis axis_ref="nq" />
+    </grid >
+ 
   </grid_definition>   
   
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg/field_def.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg/field_def.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg/field_def.xml	(revision 484)
@@ -15,4 +15,5 @@
       <field id="Ai" />
       <field id="phis" />
+      <field id="phi" />
       <field id="precl" />
       <field id="Q1_col_int" />     
@@ -32,5 +33,6 @@
         <field id="omega"/>
         <field id="temp"/>
-        
+
+<!--        
         <field id="q1"/>
         <field id="q2"/>
@@ -38,5 +40,6 @@
         <field id="q4"/>
         <field id="q5"/>
-
+-->
+        
         <field id="mass_init" />
         <field id="p_init" />
@@ -48,11 +51,5 @@
         <field id="temp_init"/>
         
-        <field id="q_init1"/>
-        <field id="q_init2"/>
-        <field id="q_init3"/>
-        <field id="q_init4"/>
-        <field id="q_init5"/>
       </field_group>
-      
       <field id="u850" />
       <field id="v850" />
@@ -74,5 +71,6 @@
       </field_group>
     </field_group> 
-    
+    <field id="q_init" grid_ref="grid_q" />    
+    <field id="q" grid_ref="grid_q" />    
     
     <field_group domain_ref="v" axis_ref="lev">
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg/filedef_dcmip2016.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg/filedef_dcmip2016.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg/filedef_dcmip2016.xml	(revision 484)
@@ -23,12 +23,14 @@
       <field field_ref="p"  name="P"        standard_name="air_pressure" long_name="Pressure"     unit="Pa"/>
       <field field_ref="temp"  name="T"        standard_name="air_temperature" long_name="Temperature"     unit="K"/>
+<!--
       <field field_ref="q1"  name="Q"        standard_name="specific_humidity"  long_name="Specific humidity"          unit="kg/kg"/>
       <field field_ref="q2"  name="Qc"                                          long_name="Cloud water mixing ration"  unit="kg/kg"/>
-      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/>
+      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/> -->
       <field field_ref="precl"  name="PRECT"     standard_name="rainfall_rate"  long_name="Large Scale precipitation rate"  unit="m/s"/>
       <field field_ref="Q1_col_int"  name="Q1_col_int"      long_name="Single chlorine column integrated mixing ratio"  unit="kg/m2"/> 
       <field field_ref="Q2_col_int"  name="Q2_col_int"      long_name="Chlorine gas column integrated mixing ratio"  unit="kg/m2"/> 
+<!--
       <field field_ref="q4"  name="Q1"      long_name="Single chlorine mixing ratio"  unit="kg/kg"/> 
-      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/> 
+      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/>  -->
       <field field_ref="u850" name="U850"       long_name="Zonal wind at 850 hPa"      unit="m/s"/>
       <field field_ref="v850" name="V850"       long_name="Meridional wind at 850 hPa"   unit="m/s"/>
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg/icosa.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg/icosa.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg/icosa.xml	(revision 484)
@@ -4,6 +4,6 @@
   <field_definition src="./field_def.xml" />
 
+<!--  <file_definition src="./filedef_debug.xml" /> -->     
   <file_definition src="./filedef_dcmip2016.xml" /> 
-<!--  <file_definition src="./filedef_debug.xml" /> -->     
 
   <file_definition type="one_file" par_access="collective">
@@ -12,13 +12,50 @@
       <field_group group_ref="standard_output"/>
     </file>
+
+    <file id="restart" name="restart" enabled="true">
+       <field_group id="group_restart" operation="once"> 
+          <field id="it_restart" name="iteration"  grid_ref="scalar" />
+          <field id="q_restart" name="q"  grid_ref="grid_q" />
+          <field_group domain_ref="i"> 
+             <field id="ps_restart" name="ps" />
+             <field id="phis_restart" name="phis" />
+             <field_group axis_ref="lev" >
+                <field id="theta_rhodz_restart" name="theta_rhodz" />
+                <field id="u_restart" name="u" domain_ref="u"/>
+                <field id="ulon_restart" name="ulon" />
+                <field id="ulat_restart" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
+    <file id="start" name="start" enabled="false" mode="read" >
+       <field_group id="group_start" operation="once"> 
+          <field id="it_start" name="iteration"  grid_ref="scalar" enabled="false"/>
+          <field id="q_start" name="q"  grid_ref="grid_q_read" />
+          <field_group domain_ref="i"> 
+             <field id="ps_start" name="ps" />
+             <field id="phis_start" name="phis" />
+             <field_group axis_ref="lev_read" >
+                <field id="theta_rhodz_start" name="theta_rhodz" />
+                <field id="u_start" name="u" domain_ref="u"/>
+                <field id="ulon_start" name="ulon" />
+                <field id="ulat_start" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
     
   </file_definition>
     
   <axis_definition>
-    <axis id="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev" name="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev_read" />
     <axis id="levp1" name="ilev"  unit="level" positive="down" standard_name="atmopshere_hybride_sigma_pressure_coordinate" long_name="hybrid level at interface" />
     <axis id="lev_pressure" positive="down"  n_glo="2" unit="Pa" value="(0,1)[85000 50000]" >
       <interpolate_axis order="1" coordinate="p" />
     </axis>    
+    <axis id="nq" name="nq" n_glo="5" value="(0,4)[1 2 3 4 5]"/>
   </axis_definition>    
   
@@ -26,9 +63,10 @@
     
      <domain_group id="i"> 
-       <domain id="i"/>     
+       <domain id="i" name="mesh"/>     
      </domain_group> 
      
      
      <domain id="v" />
+     <domain id="u" />
      
      <domain id="regular_half_degree" type="rectilinear" ni_glo="720" nj_glo="360" >
@@ -52,4 +90,17 @@
     <grid id="scalar">
     </grid>
+    
+    <grid id="grid_q">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev" />
+      <axis axis_ref="nq" />
+    </grid >
+
+    <grid id="grid_q_read">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev_read" />
+      <axis axis_ref="nq" />
+    </grid >
+ 
   </grid_definition>   
   
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_1ts/field_def.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_1ts/field_def.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_1ts/field_def.xml	(revision 484)
@@ -15,4 +15,5 @@
       <field id="Ai" />
       <field id="phis" />
+      <field id="phi" />
       <field id="precl" />
       <field id="Q1_col_int" />     
@@ -32,5 +33,6 @@
         <field id="omega"/>
         <field id="temp"/>
-        
+
+<!--        
         <field id="q1"/>
         <field id="q2"/>
@@ -38,5 +40,6 @@
         <field id="q4"/>
         <field id="q5"/>
-
+-->
+        
         <field id="mass_init" />
         <field id="p_init" />
@@ -48,11 +51,5 @@
         <field id="temp_init"/>
         
-        <field id="q_init1"/>
-        <field id="q_init2"/>
-        <field id="q_init3"/>
-        <field id="q_init4"/>
-        <field id="q_init5"/>
       </field_group>
-      
       <field id="u850" />
       <field id="v850" />
@@ -74,5 +71,6 @@
       </field_group>
     </field_group> 
-    
+    <field id="q_init" grid_ref="grid_q" />    
+    <field id="q" grid_ref="grid_q" />    
     
     <field_group domain_ref="v" axis_ref="lev">
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_1ts/filedef_dcmip2016.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_1ts/filedef_dcmip2016.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_1ts/filedef_dcmip2016.xml	(revision 484)
@@ -23,12 +23,14 @@
       <field field_ref="p"  name="P"        standard_name="air_pressure" long_name="Pressure"     unit="Pa"/>
       <field field_ref="temp"  name="T"        standard_name="air_temperature" long_name="Temperature"     unit="K"/>
+<!--
       <field field_ref="q1"  name="Q"        standard_name="specific_humidity"  long_name="Specific humidity"          unit="kg/kg"/>
       <field field_ref="q2"  name="Qc"                                          long_name="Cloud water mixing ration"  unit="kg/kg"/>
-      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/>
+      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/> -->
       <field field_ref="precl"  name="PRECT"     standard_name="rainfall_rate"  long_name="Large Scale precipitation rate"  unit="m/s"/>
       <field field_ref="Q1_col_int"  name="Q1_col_int"      long_name="Single chlorine column integrated mixing ratio"  unit="kg/m2"/> 
       <field field_ref="Q2_col_int"  name="Q2_col_int"      long_name="Chlorine gas column integrated mixing ratio"  unit="kg/m2"/> 
+<!--
       <field field_ref="q4"  name="Q1"      long_name="Single chlorine mixing ratio"  unit="kg/kg"/> 
-      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/> 
+      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/>  -->
       <field field_ref="u850" name="U850"       long_name="Zonal wind at 850 hPa"      unit="m/s"/>
       <field field_ref="v850" name="V850"       long_name="Meridional wind at 850 hPa"   unit="m/s"/>
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_1ts/icosa.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_1ts/icosa.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_1ts/icosa.xml	(revision 484)
@@ -4,6 +4,6 @@
   <field_definition src="./field_def.xml" />
 
+<!--  <file_definition src="./filedef_debug.xml" /> -->     
   <file_definition src="./filedef_dcmip2016.xml" /> 
-<!--  <file_definition src="./filedef_debug.xml" /> -->     
 
   <file_definition type="one_file" par_access="collective">
@@ -12,13 +12,50 @@
       <field_group group_ref="standard_output"/>
     </file>
+
+    <file id="restart" name="restart" enabled="true">
+       <field_group id="group_restart" operation="once"> 
+          <field id="it_restart" name="iteration"  grid_ref="scalar" />
+          <field id="q_restart" name="q"  grid_ref="grid_q" />
+          <field_group domain_ref="i"> 
+             <field id="ps_restart" name="ps" />
+             <field id="phis_restart" name="phis" />
+             <field_group axis_ref="lev" >
+                <field id="theta_rhodz_restart" name="theta_rhodz" />
+                <field id="u_restart" name="u" domain_ref="u"/>
+                <field id="ulon_restart" name="ulon" />
+                <field id="ulat_restart" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
+    <file id="start" name="start" enabled="false" mode="read" >
+       <field_group id="group_start" operation="once"> 
+          <field id="it_start" name="iteration"  grid_ref="scalar" enabled="false"/>
+          <field id="q_start" name="q"  grid_ref="grid_q_read" />
+          <field_group domain_ref="i"> 
+             <field id="ps_start" name="ps" />
+             <field id="phis_start" name="phis" />
+             <field_group axis_ref="lev_read" >
+                <field id="theta_rhodz_start" name="theta_rhodz" />
+                <field id="u_start" name="u" domain_ref="u"/>
+                <field id="ulon_start" name="ulon" />
+                <field id="ulat_start" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
     
   </file_definition>
     
   <axis_definition>
-    <axis id="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev" name="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev_read" />
     <axis id="levp1" name="ilev"  unit="level" positive="down" standard_name="atmopshere_hybride_sigma_pressure_coordinate" long_name="hybrid level at interface" />
     <axis id="lev_pressure" positive="down"  n_glo="2" unit="Pa" value="(0,1)[85000 50000]" >
       <interpolate_axis order="1" coordinate="p" />
     </axis>    
+    <axis id="nq" name="nq" n_glo="5" value="(0,4)[1 2 3 4 5]"/>
   </axis_definition>    
   
@@ -26,9 +63,10 @@
     
      <domain_group id="i"> 
-       <domain id="i"/>     
+       <domain id="i" name="mesh"/>     
      </domain_group> 
      
      
      <domain id="v" />
+     <domain id="u" />
      
      <domain id="regular_half_degree" type="rectilinear" ni_glo="720" nj_glo="360" >
@@ -52,4 +90,17 @@
     <grid id="scalar">
     </grid>
+    
+    <grid id="grid_q">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev" />
+      <axis axis_ref="nq" />
+    </grid >
+
+    <grid id="grid_q_read">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev_read" />
+      <axis axis_ref="nq" />
+    </grid >
+ 
   </grid_definition>   
   
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_2ts/field_def.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_2ts/field_def.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_2ts/field_def.xml	(revision 484)
@@ -15,4 +15,5 @@
       <field id="Ai" />
       <field id="phis" />
+      <field id="phi" />
       <field id="precl" />
       <field id="Q1_col_int" />     
@@ -32,5 +33,6 @@
         <field id="omega"/>
         <field id="temp"/>
-        
+
+<!--        
         <field id="q1"/>
         <field id="q2"/>
@@ -38,5 +40,6 @@
         <field id="q4"/>
         <field id="q5"/>
-
+-->
+        
         <field id="mass_init" />
         <field id="p_init" />
@@ -48,11 +51,5 @@
         <field id="temp_init"/>
         
-        <field id="q_init1"/>
-        <field id="q_init2"/>
-        <field id="q_init3"/>
-        <field id="q_init4"/>
-        <field id="q_init5"/>
       </field_group>
-      
       <field id="u850" />
       <field id="v850" />
@@ -74,5 +71,6 @@
       </field_group>
     </field_group> 
-    
+    <field id="q_init" grid_ref="grid_q" />    
+    <field id="q" grid_ref="grid_q" />    
     
     <field_group domain_ref="v" axis_ref="lev">
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_2ts/filedef_dcmip2016.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_2ts/filedef_dcmip2016.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_2ts/filedef_dcmip2016.xml	(revision 484)
@@ -23,12 +23,14 @@
       <field field_ref="p"  name="P"        standard_name="air_pressure" long_name="Pressure"     unit="Pa"/>
       <field field_ref="temp"  name="T"        standard_name="air_temperature" long_name="Temperature"     unit="K"/>
+<!--
       <field field_ref="q1"  name="Q"        standard_name="specific_humidity"  long_name="Specific humidity"          unit="kg/kg"/>
       <field field_ref="q2"  name="Qc"                                          long_name="Cloud water mixing ration"  unit="kg/kg"/>
-      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/>
+      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/> -->
       <field field_ref="precl"  name="PRECT"     standard_name="rainfall_rate"  long_name="Large Scale precipitation rate"  unit="m/s"/>
       <field field_ref="Q1_col_int"  name="Q1_col_int"      long_name="Single chlorine column integrated mixing ratio"  unit="kg/m2"/> 
       <field field_ref="Q2_col_int"  name="Q2_col_int"      long_name="Chlorine gas column integrated mixing ratio"  unit="kg/m2"/> 
+<!--
       <field field_ref="q4"  name="Q1"      long_name="Single chlorine mixing ratio"  unit="kg/kg"/> 
-      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/> 
+      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/>  -->
       <field field_ref="u850" name="U850"       long_name="Zonal wind at 850 hPa"      unit="m/s"/>
       <field field_ref="v850" name="V850"       long_name="Meridional wind at 850 hPa"   unit="m/s"/>
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_2ts/icosa.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_2ts/icosa.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_0.5deg_2ts/icosa.xml	(revision 484)
@@ -4,6 +4,6 @@
   <field_definition src="./field_def.xml" />
 
+<!--  <file_definition src="./filedef_debug.xml" /> -->     
   <file_definition src="./filedef_dcmip2016.xml" /> 
-<!--  <file_definition src="./filedef_debug.xml" /> -->     
 
   <file_definition type="one_file" par_access="collective">
@@ -12,13 +12,50 @@
       <field_group group_ref="standard_output"/>
     </file>
+
+    <file id="restart" name="restart" enabled="true">
+       <field_group id="group_restart" operation="once"> 
+          <field id="it_restart" name="iteration"  grid_ref="scalar" />
+          <field id="q_restart" name="q"  grid_ref="grid_q" />
+          <field_group domain_ref="i"> 
+             <field id="ps_restart" name="ps" />
+             <field id="phis_restart" name="phis" />
+             <field_group axis_ref="lev" >
+                <field id="theta_rhodz_restart" name="theta_rhodz" />
+                <field id="u_restart" name="u" domain_ref="u"/>
+                <field id="ulon_restart" name="ulon" />
+                <field id="ulat_restart" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
+    <file id="start" name="start" enabled="false" mode="read" >
+       <field_group id="group_start" operation="once"> 
+          <field id="it_start" name="iteration"  grid_ref="scalar" enabled="false"/>
+          <field id="q_start" name="q"  grid_ref="grid_q_read" />
+          <field_group domain_ref="i"> 
+             <field id="ps_start" name="ps" />
+             <field id="phis_start" name="phis" />
+             <field_group axis_ref="lev_read" >
+                <field id="theta_rhodz_start" name="theta_rhodz" />
+                <field id="u_start" name="u" domain_ref="u"/>
+                <field id="ulon_start" name="ulon" />
+                <field id="ulat_start" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
     
   </file_definition>
     
   <axis_definition>
-    <axis id="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev" name="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev_read" />
     <axis id="levp1" name="ilev"  unit="level" positive="down" standard_name="atmopshere_hybride_sigma_pressure_coordinate" long_name="hybrid level at interface" />
     <axis id="lev_pressure" positive="down"  n_glo="2" unit="Pa" value="(0,1)[85000 50000]" >
       <interpolate_axis order="1" coordinate="p" />
     </axis>    
+    <axis id="nq" name="nq" n_glo="5" value="(0,4)[1 2 3 4 5]"/>
   </axis_definition>    
   
@@ -26,9 +63,10 @@
     
      <domain_group id="i"> 
-       <domain id="i"/>     
+       <domain id="i" name="mesh"/>     
      </domain_group> 
      
      
      <domain id="v" />
+     <domain id="u" />
      
      <domain id="regular_half_degree" type="rectilinear" ni_glo="720" nj_glo="360" >
@@ -52,4 +90,17 @@
     <grid id="scalar">
     </grid>
+    
+    <grid id="grid_q">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev" />
+      <axis axis_ref="nq" />
+    </grid >
+
+    <grid id="grid_q_read">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev_read" />
+      <axis axis_ref="nq" />
+    </grid >
+ 
   </grid_definition>   
   
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_30min/field_def.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_30min/field_def.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_30min/field_def.xml	(revision 484)
@@ -15,4 +15,5 @@
       <field id="Ai" />
       <field id="phis" />
+      <field id="phi" />
       <field id="precl" />
       <field id="Q1_col_int" />     
@@ -32,5 +33,6 @@
         <field id="omega"/>
         <field id="temp"/>
-        
+
+<!--        
         <field id="q1"/>
         <field id="q2"/>
@@ -38,5 +40,6 @@
         <field id="q4"/>
         <field id="q5"/>
-
+-->
+        
         <field id="mass_init" />
         <field id="p_init" />
@@ -48,11 +51,5 @@
         <field id="temp_init"/>
         
-        <field id="q_init1"/>
-        <field id="q_init2"/>
-        <field id="q_init3"/>
-        <field id="q_init4"/>
-        <field id="q_init5"/>
       </field_group>
-      
       <field id="u850" />
       <field id="v850" />
@@ -74,5 +71,6 @@
       </field_group>
     </field_group> 
-    
+    <field id="q_init" grid_ref="grid_q" />    
+    <field id="q" grid_ref="grid_q" />    
     
     <field_group domain_ref="v" axis_ref="lev">
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_30min/filedef_dcmip2016.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_30min/filedef_dcmip2016.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_30min/filedef_dcmip2016.xml	(revision 484)
@@ -23,12 +23,14 @@
       <field field_ref="p"  name="P"        standard_name="air_pressure" long_name="Pressure"     unit="Pa"/>
       <field field_ref="temp"  name="T"        standard_name="air_temperature" long_name="Temperature"     unit="K"/>
+<!--
       <field field_ref="q1"  name="Q"        standard_name="specific_humidity"  long_name="Specific humidity"          unit="kg/kg"/>
       <field field_ref="q2"  name="Qc"                                          long_name="Cloud water mixing ration"  unit="kg/kg"/>
-      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/>
+      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/> -->
       <field field_ref="precl"  name="PRECT"     standard_name="rainfall_rate"  long_name="Large Scale precipitation rate"  unit="m/s"/>
       <field field_ref="Q1_col_int"  name="Q1_col_int"      long_name="Single chlorine column integrated mixing ratio"  unit="kg/m2"/> 
       <field field_ref="Q2_col_int"  name="Q2_col_int"      long_name="Chlorine gas column integrated mixing ratio"  unit="kg/m2"/> 
+<!--
       <field field_ref="q4"  name="Q1"      long_name="Single chlorine mixing ratio"  unit="kg/kg"/> 
-      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/> 
+      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/>  -->
       <field field_ref="u850" name="U850"       long_name="Zonal wind at 850 hPa"      unit="m/s"/>
       <field field_ref="v850" name="V850"       long_name="Meridional wind at 850 hPa"   unit="m/s"/>
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_30min/icosa.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_30min/icosa.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_full_physiq_30min/icosa.xml	(revision 484)
@@ -4,6 +4,6 @@
   <field_definition src="./field_def.xml" />
 
+<!--  <file_definition src="./filedef_debug.xml" /> -->     
   <file_definition src="./filedef_dcmip2016.xml" /> 
-<!--  <file_definition src="./filedef_debug.xml" /> -->     
 
   <file_definition type="one_file" par_access="collective">
@@ -12,13 +12,50 @@
       <field_group group_ref="standard_output"/>
     </file>
+
+    <file id="restart" name="restart" enabled="true">
+       <field_group id="group_restart" operation="once"> 
+          <field id="it_restart" name="iteration"  grid_ref="scalar" />
+          <field id="q_restart" name="q"  grid_ref="grid_q" />
+          <field_group domain_ref="i"> 
+             <field id="ps_restart" name="ps" />
+             <field id="phis_restart" name="phis" />
+             <field_group axis_ref="lev" >
+                <field id="theta_rhodz_restart" name="theta_rhodz" />
+                <field id="u_restart" name="u" domain_ref="u"/>
+                <field id="ulon_restart" name="ulon" />
+                <field id="ulat_restart" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
+    <file id="start" name="start" enabled="false" mode="read" >
+       <field_group id="group_start" operation="once"> 
+          <field id="it_start" name="iteration"  grid_ref="scalar" enabled="false"/>
+          <field id="q_start" name="q"  grid_ref="grid_q_read" />
+          <field_group domain_ref="i"> 
+             <field id="ps_start" name="ps" />
+             <field id="phis_start" name="phis" />
+             <field_group axis_ref="lev_read" >
+                <field id="theta_rhodz_start" name="theta_rhodz" />
+                <field id="u_start" name="u" domain_ref="u"/>
+                <field id="ulon_start" name="ulon" />
+                <field id="ulat_start" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
     
   </file_definition>
     
   <axis_definition>
-    <axis id="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev" name="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev_read" />
     <axis id="levp1" name="ilev"  unit="level" positive="down" standard_name="atmopshere_hybride_sigma_pressure_coordinate" long_name="hybrid level at interface" />
     <axis id="lev_pressure" positive="down"  n_glo="2" unit="Pa" value="(0,1)[85000 50000]" >
       <interpolate_axis order="1" coordinate="p" />
     </axis>    
+    <axis id="nq" name="nq" n_glo="5" value="(0,4)[1 2 3 4 5]"/>
   </axis_definition>    
   
@@ -26,9 +63,10 @@
     
      <domain_group id="i"> 
-       <domain id="i"/>     
+       <domain id="i" name="mesh"/>     
      </domain_group> 
      
      
      <domain id="v" />
+     <domain id="u" />
      
      <domain id="regular_half_degree" type="rectilinear" ni_glo="720" nj_glo="360" >
@@ -52,4 +90,17 @@
     <grid id="scalar">
     </grid>
+    
+    <grid id="grid_q">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev" />
+      <axis axis_ref="nq" />
+    </grid >
+
+    <grid id="grid_q_read">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev_read" />
+      <axis axis_ref="nq" />
+    </grid >
+ 
   </grid_definition>   
   
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_kessler/field_def.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_kessler/field_def.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_kessler/field_def.xml	(revision 484)
@@ -15,4 +15,5 @@
       <field id="Ai" />
       <field id="phis" />
+      <field id="phi" />
       <field id="precl" />
       <field id="Q1_col_int" />     
@@ -32,5 +33,6 @@
         <field id="omega"/>
         <field id="temp"/>
-        
+
+<!--        
         <field id="q1"/>
         <field id="q2"/>
@@ -38,5 +40,6 @@
         <field id="q4"/>
         <field id="q5"/>
-
+-->
+        
         <field id="mass_init" />
         <field id="p_init" />
@@ -48,11 +51,5 @@
         <field id="temp_init"/>
         
-        <field id="q_init1"/>
-        <field id="q_init2"/>
-        <field id="q_init3"/>
-        <field id="q_init4"/>
-        <field id="q_init5"/>
       </field_group>
-      
       <field id="u850" />
       <field id="v850" />
@@ -74,5 +71,6 @@
       </field_group>
     </field_group> 
-    
+    <field id="q_init" grid_ref="grid_q" />    
+    <field id="q" grid_ref="grid_q" />    
     
     <field_group domain_ref="v" axis_ref="lev">
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_kessler/filedef_dcmip2016.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_kessler/filedef_dcmip2016.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_kessler/filedef_dcmip2016.xml	(revision 484)
@@ -23,12 +23,14 @@
       <field field_ref="p"  name="P"        standard_name="air_pressure" long_name="Pressure"     unit="Pa"/>
       <field field_ref="temp"  name="T"        standard_name="air_temperature" long_name="Temperature"     unit="K"/>
+<!--
       <field field_ref="q1"  name="Q"        standard_name="specific_humidity"  long_name="Specific humidity"          unit="kg/kg"/>
       <field field_ref="q2"  name="Qc"                                          long_name="Cloud water mixing ration"  unit="kg/kg"/>
-      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/>
+      <field field_ref="q3"  name="Qr"                                          long_name="Rain water mixing ration"  unit="kg/kg"/> -->
       <field field_ref="precl"  name="PRECT"     standard_name="rainfall_rate"  long_name="Large Scale precipitation rate"  unit="m/s"/>
       <field field_ref="Q1_col_int"  name="Q1_col_int"      long_name="Single chlorine column integrated mixing ratio"  unit="kg/m2"/> 
       <field field_ref="Q2_col_int"  name="Q2_col_int"      long_name="Chlorine gas column integrated mixing ratio"  unit="kg/m2"/> 
+<!--
       <field field_ref="q4"  name="Q1"      long_name="Single chlorine mixing ratio"  unit="kg/kg"/> 
-      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/> 
+      <field field_ref="q5"  name="Q2"      long_name="Chlorine gas mixing ratio"  unit="kg/kg"/>  -->
       <field field_ref="u850" name="U850"       long_name="Zonal wind at 850 hPa"      unit="m/s"/>
       <field field_ref="v850" name="V850"       long_name="Meridional wind at 850 hPa"   unit="m/s"/>
Index: configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_kessler/icosa.xml
===================================================================
--- configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_kessler/icosa.xml	(revision 450)
+++ configs/dcmip2016/RUNS/BAROCLINIC_WAVE/moist_kessler/icosa.xml	(revision 484)
@@ -4,6 +4,6 @@
   <field_definition src="./field_def.xml" />
 
+<!--  <file_definition src="./filedef_debug.xml" /> -->     
   <file_definition src="./filedef_dcmip2016.xml" /> 
-<!--  <file_definition src="./filedef_debug.xml" /> -->     
 
   <file_definition type="one_file" par_access="collective">
@@ -12,13 +12,50 @@
       <field_group group_ref="standard_output"/>
     </file>
+
+    <file id="restart" name="restart" enabled="true">
+       <field_group id="group_restart" operation="once"> 
+          <field id="it_restart" name="iteration"  grid_ref="scalar" />
+          <field id="q_restart" name="q"  grid_ref="grid_q" />
+          <field_group domain_ref="i"> 
+             <field id="ps_restart" name="ps" />
+             <field id="phis_restart" name="phis" />
+             <field_group axis_ref="lev" >
+                <field id="theta_rhodz_restart" name="theta_rhodz" />
+                <field id="u_restart" name="u" domain_ref="u"/>
+                <field id="ulon_restart" name="ulon" />
+                <field id="ulat_restart" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
+    <file id="start" name="start" enabled="false" mode="read" >
+       <field_group id="group_start" operation="once"> 
+          <field id="it_start" name="iteration"  grid_ref="scalar" enabled="false"/>
+          <field id="q_start" name="q"  grid_ref="grid_q_read" />
+          <field_group domain_ref="i"> 
+             <field id="ps_start" name="ps" />
+             <field id="phis_start" name="phis" />
+             <field_group axis_ref="lev_read" >
+                <field id="theta_rhodz_start" name="theta_rhodz" />
+                <field id="u_start" name="u" domain_ref="u"/>
+                <field id="ulon_start" name="ulon" />
+                <field id="ulat_start" name="ulat" />
+             </field_group>
+          </field_group>
+       </field_group>
+    </file>
+
     
   </file_definition>
     
   <axis_definition>
-    <axis id="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev" name="lev" positive="down" standard_name="atmopshere_hybrid_sigma_pressure_coordinate" long_name="hybrid level at midpoints" />
+    <axis id="lev_read" />
     <axis id="levp1" name="ilev"  unit="level" positive="down" standard_name="atmopshere_hybride_sigma_pressure_coordinate" long_name="hybrid level at interface" />
     <axis id="lev_pressure" positive="down"  n_glo="2" unit="Pa" value="(0,1)[85000 50000]" >
       <interpolate_axis order="1" coordinate="p" />
     </axis>    
+    <axis id="nq" name="nq" n_glo="5" value="(0,4)[1 2 3 4 5]"/>
   </axis_definition>    
   
@@ -26,9 +63,10 @@
     
      <domain_group id="i"> 
-       <domain id="i"/>     
+       <domain id="i" name="mesh"/>     
      </domain_group> 
      
      
      <domain id="v" />
+     <domain id="u" />
      
      <domain id="regular_half_degree" type="rectilinear" ni_glo="720" nj_glo="360" >
@@ -52,4 +90,17 @@
     <grid id="scalar">
     </grid>
+    
+    <grid id="grid_q">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev" />
+      <axis axis_ref="nq" />
+    </grid >
+
+    <grid id="grid_q_read">
+      <domain domain_ref="i" />
+      <axis axis_ref="lev_read" />
+      <axis axis_ref="nq" />
+    </grid >
+ 
   </grid_definition>   
   
