Ignore:
Timestamp:
06/04/19 10:00:52 (5 years ago)
Author:
yushan
Message:

MARK: branch merged with trunk @1663. One output graph file with output file names in file writer filter.

Location:
XIOS/dev/dev_trunk_omp/inputs
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/dev_trunk_omp/inputs/COMPLETE/context_atmosphere.xml

    r1661 r1671  
    33<context id="atmosphere"> 
    44 
    5   <field_definition level="1" enabled=".FALSE." default_value="9.96921e+36"> 
    6     <field id="field_A_atm"  name="field_A_atm_origin" operation="average" freq_op="1ts" grid_ref="grid_A_atm" /> 
    7     <field id="field_A_atm_zoom"  name="field_A_atm" operation="average" freq_op="1ts" field_ref="field_A_atm" grid_ref="grid_A_atm_zoom" /> 
     5  <field_definition level="1" enabled=".TRUE." default_value="9.96921e+36"> 
     6    <field id="field_A_atm"  name="field_A_atm" operation="average" freq_op="1ts" grid_ref="grid_A_atm" /> 
     7    <field id="field_A_atm_zoom"  operation="average" freq_op="1ts" field_ref="field_A_atm" grid_ref="grid_A_atm_zoom" /> 
    88  </field_definition> 
    99 
    10   <file_definition type="multiple_file" par_access="collective" output_freq="6h" sync_freq="6h" output_level="10" enabled=".TRUE."> 
     10  <file_definition type="one_file" par_access="collective" output_freq="6h" sync_freq="6h" output_level="10" enabled=".TRUE."> 
    1111    <file id="output_atmosphere" name="output_atmosphere"> 
    12       <field field_ref="field_A_atm" /> 
     12      <field field_ref="field_A_atm" build_workflow_graph=".TRUE."/> 
     13      <field field_ref="field_A_atm_zoom" name="field_A_atm_zoom" build_workflow_graph=".TRUE."/> 
    1314    </file> 
    1415    <file id="output_atmosphere_zoom" name="output_atmosphere_zoom"> 
    15       <field field_ref="field_A_atm_zoom" name="field_A_atm_zoom" /> 
     16      <field field_ref="field_A_atm_zoom" name="field_A_atm_zoom" build_workflow_graph=".FALSE."/> 
    1617    </file> 
    1718  </file_definition> 
  • XIOS/dev/dev_trunk_omp/inputs/COMPLETE/context_surface.xml

    r1668 r1671  
    1212  </field_definition> 
    1313 
    14   <file_definition type="multiple_file" par_access="collective" output_level="10" enabled=".TRUE."> 
     14  <file_definition type="one_file" par_access="collective" output_level="10" enabled=".TRUE."> 
    1515    <file id="output_surface" name="output_surface_6h" output_freq="6h"> 
    16       <field field_ref="field_A_srf"> 
     16      <field field_ref="field_A_srf" build_workflow_graph=".FALSE.">  
    1717        <variable id="my_attribute1" type="string">surf_att</variable> 
    1818        <variable id="my_attribute2" type="int"> 10 </variable> 
     
    2020        <variable id="my_attribute5" type="double">100.201</variable> 
    2121      </field> 
    22       <field field_ref="field_A_srf_K" build_workflow_graph=".TRUE." /> 
    23       <field field_ref="field_A_srf_K_2" name="field_A_srf_K_2" /> <!-- Should be identical to field_A_srf_K --> 
    24       <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 --> 
    25       <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> 
    26       <field field_ref="field_A_srf" name="field_A_srf_min" operation="minimum" /> 
    27       <field field_ref="field_A_srf_2" name="field_A_srf_min_2" operation="minimum" /> <!-- Should be identical to field_A_srf_min --> 
    28       <field field_ref="field_A_srf" name="field_A_srf_max" operation="maximum" /> 
    29       <field field_ref="field_A_srf" name="field_A_srf_prec4" prec="8" /> 
    30       <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> 
     22      <field field_ref="field_A_srf_K" build_workflow_graph=".FALSE." /> 
     23      <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 --> 
     24      <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 --> 
     25      <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> 
     26      <field field_ref="field_A_srf" name="field_A_srf_min" operation="minimum" build_workflow_graph=".FALSE."/> 
     27      <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 --> 
     28      <field field_ref="field_A_srf" name="field_A_srf_max" operation="maximum" build_workflow_graph=".FALSE."/> 
     29      <field field_ref="field_A_srf" name="field_A_srf_prec4" prec="8" build_workflow_graph=".FALSE."/> 
     30      <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> 
    3131      <variable id="my_global_attribute" type="string">file_6h</variable> 
    3232    </file> 
    3333 
    3434    <file type="one_file" id="output_surface_1d" name="output_surface_1d" output_freq="1d" enabled="TRUE"> 
    35       <field field_ref="field_A_srf" indexed_output="TRUE"> 
     35      <field field_ref="field_A_srf" indexed_output="TRUE" build_workflow_graph=".FALSE."> 
    3636        <variable id="my_attribute1" type="string">surf_att</variable> 
    3737        <variable id="my_attribute2" type="int">10</variable> 
     
    3939        <variable id="my_attribute4" type="double">100.201</variable> 
    4040      </field> 
    41       <field field_ref="field_A_srf_K" /> 
    42       <field field_ref="field_A_srf" name="field_A_srf_min" operation="minimum" /> 
    43       <field field_ref="field_A_srf" name="field_A_srf_max" operation="maximum" /> 
    44       <field field_ref="field_A_srf" name="field_A_srf_prec4" prec="8" /> 
    45       <field field_ref="field_A_srf_max" name="field_A_srf_mean_max" long_name="Average of hourly maximum over 1d" operation="average" freq_op="1h"> @field_A_srf_max </field> 
     41      <field field_ref="field_A_srf_K" build_workflow_graph=".FALSE."/> 
     42      <field field_ref="field_A_srf" name="field_A_srf_min" operation="minimum" build_workflow_graph=".FALSE." /> 
     43      <field field_ref="field_A_srf" name="field_A_srf_max" operation="maximum" build_workflow_graph=".FALSE."/> 
     44      <field field_ref="field_A_srf" name="field_A_srf_prec4" prec="8" build_workflow_graph=".FALSE."/> 
     45      <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> 
    4646      <variable id="my_global_attribute" type="string" >file_1d</variable> 
    4747    </file> 
  • XIOS/dev/dev_trunk_omp/inputs/REMAP/iodef.xml

    r1669 r1671  
    66   <field_definition level="1" > 
    77    <field_group id="fields_src" operation="instant"> 
    8        <field id="src_field_2D"  domain_ref="src_domain"/> 
     8       <field id="src_field_2D" domain_ref="src_domain"/> 
    99       <field id="src_field_2D_clone" domain_ref="src_domain_clone"/> 
    1010       <field id="src_field_3D" domain_ref="src_domain" axis_ref="src_axis"/>        
     
    3535        <file id="output_2D" name="output_2D" > 
    3636          <field field_ref="src_field_2D" name="field_src" build_workflow_graph=".TRUE."/> 
    37           <field field_ref="src_field_2D" name="field_dst_regular_0"  domain_ref="dst_domain_regular_pole" default_value="10.e+5" build_workflow_graph=".TRUE."/> 
     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"/> 
    3838          <field field_ref="dst_field_2D" name="field_dst_regular_1" build_workflow_graph=".TRUE."/> 
    3939          <field field_ref="dst_field_2D_regular_pole" name="field_dst_regular_2" build_workflow_graph=".TRUE."/> 
  • XIOS/dev/dev_trunk_omp/inputs/iodef.xml

    r1668 r1671  
    1919        <!-- <field field_ref="field_Domain" name="field_A" /> --> 
    2020        <field field_ref="field_A" name="field_A" build_workflow_graph=".TRUE." />  
    21         <field field_ref="field_A_zoom" name="field_B" /> 
     21        <field field_ref="field_A_zoom" name="field_B" build_workflow_graph=".TRUE."/> 
    2222     </file> 
    2323     <file id="output1" name="output1" enabled=".TRUE."> 
    2424        <!-- <field field_ref="field_Domain" name="field_A" /> --> 
    25         <field field_ref="field_A" name="field_A" />         
     25        <field field_ref="field_A" name="field_A_dup" build_workflow_graph=".TRUE."/>         
    2626     </file>   
    27      <file id="output2" name="output2" enabled=".FALSE."> 
     27     <file id="output2" name="output2" enabled=".TRUE."> 
    2828        <!-- <field field_ref="field_Domain" name="field_A" /> --> 
    29         <field field_ref="field_Scalar" name="field_A" />         
     29        <field field_ref="field_Scalar" name="field_A_scalar" build_workflow_graph=".TRUE."/>         
    3030     </file> 
    3131 <!--     <file id="output_s" name="output_s" mode="read" > 
Note: See TracChangeset for help on using the changeset viewer.