Changeset 1876 for XIOS/trunk/inputs

Timestamp:

05/12/20 16:36:29 (4 years ago)

Author:

yushan

Message:

trunk : Bug fixed in workflow graph. wrong connection happens when a chain of arithmetic operations is applied on a field.

Location:

XIOS/trunk/inputs

Files:

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

XIOS/trunk/inputs/COMPLETE/context_atmosphere.xml

@@ -8 +8 @@
   </field_definition>
 
-  <file_definition type="multiple_file" par_access="collective" output_freq="6h" sync_freq="6h" output_level="10" enabled=".TRUE.">
+  <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" />

XIOS/trunk/inputs/COMPLETE/context_surface.xml

@@ -12 +12 @@
   </field_definition>
 
-  <file_definition type="multiple_file" par_access="collective" output_level="10" enabled=".TRUE.">
+  <file_definition type="one_file" par_access="collective" output_level="10" enabled=".TRUE.">
     <file id="output_surface" name="output_surface_6h" output_freq="6h">
-      <field field_ref="field_A_srf">
+      <field field_ref="field_A_srf" build_workflow_graph="false" >
         <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" />
+      <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" /> <!-- Should be identical to field_A_srf_K -->
-      <field field_ref="field_A_srf_K" name="field_A_srf_K_3">field_A_srf_K</field> <!-- Should be identical to field_A_srf_K -->
+      <field field_ref="field_A_srf_K" name="field_A_srf_K_3" build_workflow_graph="true"> 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" 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" />
@@ -32 +32 @@
     </file>
 
-    <file type="one_file" id="output_surface_1d" name="output_surface_1d" output_freq="1d" enabled="TRUE">
+    <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">
         <variable id="my_attribute1" type="string">surf_att</variable>

XIOS/trunk/inputs/iodef.xml

@@ -14 +14 @@
      <field id="field_A_zoom"  operation="average" freq_op="3600s" field_ref="field_A" grid_ref="grid_A_zoom"/>
      <field id="field_Scalar"  operation="average" freq_op="3600s" grid_ref="grid_Scalar"/>
+     <field id="test_field_B"  field_ref="field_A" > field_A+10 </field>
    </field_definition>
 
@@ -19 +20 @@
    <file_definition type="one_file" par_access="collective" output_freq="1h" output_level="10" >
       
+     <file id="test_output" output_freq="4h" enabled=".TRUE." >
+       <field field_ref="field_A"                        name ="field_A" build_workflow_graph=".FALSE." enabled=".FALSE."/>
+       <field field_ref="test_field_B"                   name ="field_B" build_workflow_graph=".FALSE." enabled=".TRUE."/>
+       <field id="test_field_C" field_ref="test_field_B" name ="field_C" build_workflow_graph=".TRUE."  enabled=".TRUE."  > 10*test_field_B </field>
+       <field id="test_field_D" field_ref="test_field_B" name ="field_D" build_workflow_graph=".TRUE."  enabled=".FALSE." > 100*field_A </field>
+       <field id="test_field_E" field_ref="test_field_B" name ="field_E" build_workflow_graph=".TRUE."  enabled=".FALSE." > field_A+10*test_field_B-field_C </field>
+     </file>
+
+
      <file id="output2" name="output2" output_freq="4h" enabled=".FALSE.">
         <field id="field_G" field_ref="field_A" name="field_G_zoom" grid_ref="grid_A_zoom" build_workflow_graph=".TRUE." build_workflow_graph_start="1h" build_workflow_graph_end="8h" />        
@@ -25 +35 @@
 
 
-     <file id="output1" name="output1" output_freq="24h" enabled=".TRUE.">
+     <file id="output1" name="output1" output_freq="24h" enabled=".FALSE.">
         <!-- <field field_ref="field_Domain" name="field_A" /> -->
         <field id="field_F" field_ref="field_A" name="field_24h" grid_ref="grid_A" build_workflow_graph=".TRUE." build_workflow_graph_start="4h" build_workflow_graph_end="24h"  />        
@@ -31 +41 @@
      </file>  
 
-     <file id="output" name="output" enabled=".TRUE.">
+     <file id="output" name="output" enabled=".FALSE.">
         <!-- <field field_ref="field_Domain" name="field_A" /> -->
-        <!-- <field field_ref="field_A" name="field_A_name"  build_workflow_graph=".FALSE." />  -->
+        <field field_ref="field_A" name="field_A_name"  build_workflow_graph=".TRUE." />
+        <field field_ref="field_A" name="field_A_unary"  build_workflow_graph=".TRUE." > field_A+50 </field>
         <!-- <field field_ref="field_B" name="field_B_name"  build_workflow_graph=".FALSE."/>  -->
         <!-- <field field_ref="field_C" name="field_C_name"  enabled=".TRUE." />  -->