Changeset 1677 for XIOS/dev/dev_trunk_omp/inputs

Timestamp:

06/25/19 16:14:54 (5 years ago)

Author:

yushan

Message:

MARK: Dynamic workflow graph developement. Branch up to date with trunk @1663.

Location:

XIOS/dev/dev_trunk_omp/inputs

Files:

• COMPLETE/context_atmosphere.xml (modified) (1 diff)
• COMPLETE/context_surface.xml (modified) (4 diffs)
• REMAP/iodef.xml (modified) (1 diff)
• iodef.xml (modified) (2 diffs)

XIOS/dev/dev_trunk_omp/inputs/COMPLETE/context_atmosphere.xml

@@ -9 +9 @@
 
   <file_definition type="one_file" par_access="collective" output_freq="6h" sync_freq="6h" output_level="10" enabled=".TRUE.">
-    <file id="output_atmosphere" name="output_atmosphere">
-      <field field_ref="field_A_atm" build_workflow_graph=".TRUE."/>
-      <field field_ref="field_A_atm_zoom" name="field_A_atm_zoom" build_workflow_graph=".TRUE."/>
+    <file id="output_atmosphere" name="output_atmosphere" enabled=".FALSE." >
+      <field field_ref="field_A_atm" enabled=".TRUE."/>
     </file>
-    <file id="output_atmosphere_zoom" name="output_atmosphere_zoom">
-      <field field_ref="field_A_atm_zoom" name="field_A_atm_zoom" build_workflow_graph=".FALSE."/>
+    <file id="output_atmosphere_zoom" name="output_atmosphere_zoom" enabled=".FALSE.">
+      <field field_ref="field_A_atm_zoom" name="field_A_atm_zoom" />
+      <!-- <field field_ref="field_A_atm" name="field_A_atm_zoom2" operation="average" freq_op="1ts" grid_ref="grid_A_atm_zoom"  build_workflow_graph=".TRUE."/> -->
     </file>
   </file_definition>

XIOS/dev/dev_trunk_omp/inputs/COMPLETE/context_surface.xml

@@ -4 +4 @@
 
   <field_definition level="1" enabled=".TRUE." domain_ref="domain_srf"  axis_ref="axis_srf" operation="average" freq_op="1ts" default_value="9.96921e+36" prec="4">
-    <field id="field_A_srf"  name="field_A_srf" long_name="Champ en degC" operation="average" unit="degC" />
+    <field id="field_A_srf"  name="field_A_srf" long_name="Champ en degC" operation="average" unit="degC" build_workflow_graph=".FALSE." />
     <field id="field_A_srf_2" field_ref="field_A_srf" />
     <field id="field_A_srf_K" name="field_A_srf_K" field_ref="field_A_srf" long_name="Champ en degK" unit="degK"> field_A_srf + 273.15 </field>
@@ -12 +12 @@
   </field_definition>
 
-  <file_definition type="one_file" par_access="collective" output_level="10" enabled=".TRUE.">
+  <file_definition type="one_file" par_access="collective" output_level="10" enabled=".FALSE.">
     <file id="output_surface" name="output_surface_6h" output_freq="6h">
-      <field field_ref="field_A_srf" build_workflow_graph=".FALSE."> 
+      <field field_ref="field_A_srf" > 
         <variable id="my_attribute1" type="string">surf_att</variable>
         <variable id="my_attribute2" type="int"> 10 </variable>
@@ -20 +20 @@
         <variable id="my_attribute5" type="double">100.201</variable>
       </field>
-      <field field_ref="field_A_srf_K" build_workflow_graph=".FALSE." />
-      <field field_ref="field_A_srf_K_2" name="field_A_srf_K_2" build_workflow_graph=".FALSE."/> <!-- Should be identical to field_A_srf_K -->
-      <field field_ref="field_A_srf_K" name="field_A_srf_K_3" build_workflow_graph=".FALSE.">field_A_srf_K</field> <!-- Should be identical to field_A_srf_K -->
-      <field field_ref="field_A_srf_K_2" name="field_A_srf_K_max_mean" build_workflow_graph=".FALSE." long_name="Maximum of hourly average over 6h" operation="maximum" freq_op="1h"> @field_A_srf_K </field>
-      <field field_ref="field_A_srf" name="field_A_srf_min" operation="minimum" build_workflow_graph=".FALSE."/>
-      <field field_ref="field_A_srf_2" name="field_A_srf_min_2" operation="minimum" build_workflow_graph=".FALSE."/> <!-- Should be identical to field_A_srf_min -->
-      <field field_ref="field_A_srf" name="field_A_srf_max" operation="maximum" build_workflow_graph=".FALSE."/>
-      <field field_ref="field_A_srf" name="field_A_srf_prec4" prec="8" build_workflow_graph=".FALSE."/>
-      <field field_ref="field_A_srf_max" name="field_A_srf_mean_max" build_workflow_graph=".FALSE." long_name="Average of hourly maximum over 6h" operation="average" freq_op="1h"> @field_A_srf_max </field>
-      <variable id="my_global_attribute" type="string">file_6h</variable>
+     <!--  <field field_ref="field_A_srf_K"  />
+      <field field_ref="field_A_srf_K_2" name="field_A_srf_K_2" /> 
+      <field field_ref="field_A_srf_K" name="field_A_srf_K_3" >field_A_srf_K</field>
+      <field field_ref="field_A_srf_K_2" name="field_A_srf_K_max_mean"  long_name="Maximum of hourly average over 6h" operation="maximum" freq_op="1h"> @field_A_srf_K </field>
+      <field field_ref="field_A_srf" name="field_A_srf_min" operation="minimum" />
+      <field field_ref="field_A_srf_2" name="field_A_srf_min_2" operation="minimum" />
+      <field field_ref="field_A_srf_max" name="field_A_srf_max" operation="maximum" />
+      <field field_ref="field_A_srf" name="field_A_srf_prec4" prec="8" />
+      <field field_ref="field_A_srf_max" name="field_A_srf_mean_max"  long_name="Average of hourly maximum over 6h" operation="average" freq_op="1h"> @field_A_srf_max </field>
+      <variable id="my_global_attribute" type="string">file_6h</variable> -->
     </file>
 
-    <file type="one_file" id="output_surface_1d" name="output_surface_1d" output_freq="1d" enabled="TRUE">
-      <field field_ref="field_A_srf" indexed_output="TRUE" build_workflow_graph=".FALSE.">
+    <file type="one_file" id="output_surface_1d" name="output_surface_1d" output_freq="1d" enabled=".TRUE.">
+      <field field_ref="field_A_srf" indexed_output="TRUE" build_workflow_graph=".TRUE.">
         <variable id="my_attribute1" type="string">surf_att</variable>
         <variable id="my_attribute2" type="int">10</variable>
@@ -39 +39 @@
         <variable id="my_attribute4" type="double">100.201</variable>
       </field>
-      <field field_ref="field_A_srf_K" build_workflow_graph=".FALSE."/>
+      <field field_ref="field_A_srf_K" build_workflow_graph=".TRUE."/>
       <field field_ref="field_A_srf" name="field_A_srf_min" operation="minimum" build_workflow_graph=".FALSE." />
       <field field_ref="field_A_srf" name="field_A_srf_max" operation="maximum" build_workflow_graph=".FALSE."/>
       <field field_ref="field_A_srf" name="field_A_srf_prec4" prec="8" build_workflow_graph=".FALSE."/>
-      <field field_ref="field_A_srf_max" name="field_A_srf_mean_max"  build_workflow_graph=".FALSE." long_name="Average of hourly maximum over 1d" operation="average" freq_op="1h"> @field_A_srf_max </field>
+      <field field_ref="field_A_srf_max" name="field_A_srf_mean_max"  build_workflow_graph=".TRUE." long_name="Average of hourly maximum over 1d" operation="average" freq_op="1h"> @field_A_srf_max </field>
       <variable id="my_global_attribute" type="string" >file_1d</variable>
     </file>

XIOS/dev/dev_trunk_omp/inputs/REMAP/iodef.xml

@@ -37 +37 @@
           <field field_ref="src_field_2D" name="field_dst_regular_0" build_workflow_graph=".TRUE." domain_ref="dst_domain_regular_pole" default_value="10.e+5"/>
           <field field_ref="dst_field_2D" name="field_dst_regular_1" build_workflow_graph=".TRUE."/>
-          <field field_ref="dst_field_2D_regular_pole" name="field_dst_regular_2" build_workflow_graph=".TRUE."/>
-          <field field_ref="dst_field_2D_clone" name="field_dst_regular_3" build_workflow_graph=".TRUE."/>
+          <field field_ref="dst_field_2D_regular_pole" name="field_dst_regular_2" build_workflow_graph=".FALSE."/>
+          <field field_ref="dst_field_2D_clone" name="field_dst_regular_3" build_workflow_graph=".FALSE."/>
         </file> 
        <file id="output_3D" name="output_3D" >
-          <field field_ref="src_field_3D" name="field_src" build_workflow_graph=".TRUE."/>
-          <field field_ref="src_field_3D_pression" name="field" build_workflow_graph=".TRUE."/>
-          <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain" build_workflow_graph=".TRUE."/>
-          <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain_axis" domain_ref="dst_domain_regular_pole" build_workflow_graph=".TRUE."/>  
+          <field field_ref="src_field_3D" name="field_src" build_workflow_graph=".FALSE."/>
+          <field field_ref="src_field_3D_pression" name="field" build_workflow_graph=".FALSE."/>
+          <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain" build_workflow_graph=".FALSE."/>
+          <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain_axis" domain_ref="dst_domain_regular_pole" build_workflow_graph=".FALSE."/>  
        </file>
        <file id="output_4D" name="output_4D" >

XIOS/dev/dev_trunk_omp/inputs/iodef.xml

@@ -8 +8 @@
    <field_definition level="1" enabled=".TRUE.">
      <field id="field_A"  operation="average" freq_op="3600s" grid_ref="grid_A"/>
+     <field id="field_B"  operation="average" freq_op="3600s" grid_ref="grid_A"/>
+     <field id="field_C"  operation="average" freq_op="3600s" grid_ref="grid_A"/>
      <field id="field_Axis"  operation="average" freq_op="3600s" axis_ref="axis_A"/>
      <field id="field_Domain"  operation="average" freq_op="3600s" domain_ref="domain_A"/>
@@ -18 +20 @@
       <file id="output" name="output" enabled=".TRUE.">
         <!-- <field field_ref="field_Domain" name="field_A" /> -->
-        <field field_ref="field_A" name="field_A" build_workflow_graph=".TRUE." /> 
-        <field field_ref="field_A_zoom" name="field_B" build_workflow_graph=".TRUE."/>
+        <field field_ref="field_A" name="field_A_name" enabled=".TRUE." build_workflow_graph=".TRUE." /> 
+        <field field_ref="field_B" name="field_B_name" enabled=".TRUE." build_workflow_graph=".FALSE."/> 
+        <!-- <field field_ref="field_C" name="field_C_name" enabled=".TRUE." />  -->
+        <field id="field_D" field_ref="field_A" operation="instant" build_workflow_graph=".FALSE." name="field_D_name" enabled=".TRUE."> field_A + field_B</field>
+        <field id="field_E" field_ref="field_A" operation="instant" build_workflow_graph=".FALSE." name="field_E_name" enabled=".TRUE."> field_D </field>
+        <!-- <field field_ref="field_A_zoom" name="field_B" build_workflow_graph=".TRUE."/> -->
      </file>
      <file id="output1" name="output1" enabled=".TRUE.">
         <!-- <field field_ref="field_Domain" name="field_A" /> -->
-        <field field_ref="field_A" name="field_A_dup" build_workflow_graph=".TRUE."/>        
+        <field id="field_F" field_ref="field_A" name="field_A_zoom" grid_ref="grid_A_zoom" build_workflow_graph=".TRUE."/>        
      </file>  
-     <file id="output2" name="output2" enabled=".TRUE.">
+     <file id="output2" name="output2" enabled=".FALSE.">
         <!-- <field field_ref="field_Domain" name="field_A" /> -->
         <field field_ref="field_Scalar" name="field_A_scalar" build_workflow_graph=".TRUE."/>