Changeset 562 for XIOS/trunk/inputs


Ignore:
Timestamp:
02/24/15 09:50:14 (9 years ago)
Author:
rlacroix
Message:

Fix incorrect output values when using a field_ref or the @ operator on a field computed from an operation.

The computed values were never transmitted from the source field to the destination field.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/trunk/inputs/COMPLETE/context_surface.xml

    r549 r562  
    11<!-- Context surface --> 
    2    
     2 
    33<context id="surface"> 
    44 
    55  <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"> 
    66    <field id="field_A_srf"  name="field_A_srf" long_name="Champ en degC" operation="average" unit="degC" /> 
     7    <field id="field_A_srf_2" field_ref="field_A_srf" /> 
    78    <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> 
     9    <field id="field_A_srf_K_2" field_ref="field_A_srf_K" /> 
    810    <field id="field_A_srf_max" name="field_A_srf_max" field_ref="field_A_srf" long_name="maximum field_A_srf" operation="maximum" /> 
    9     <field id="field_D_srf" name="field_D_srf" long_name="Somme champ A et C" > field_A_srf + field_C_srf </field> 
    10      
     11    <field id="field_D_srf" name="field_D_srf" long_name="Somme champ A et C"> field_A_srf + field_C_srf </field> 
    1112  </field_definition> 
    12      
     13 
    1314  <file_definition type="multiple_file" par_access="collective" output_level="10" enabled=".TRUE."> 
    14     <file id="output_surface" name="output_surface_6h" output_freq="6h" >  
    15       <field field_ref="field_A_srf" > 
    16         <variable id="my_attribute1" type="string" >surf_att</variable> 
    17         <variable id="my_attribute2" type="int" > 10 </variable> 
    18         <variable id="my_attribute3" type="float" >6.8</variable> 
    19         <variable id="my_attribute5" type="double" >100.201</variable> 
     15    <file id="output_surface" name="output_surface_6h" output_freq="6h"> 
     16      <field field_ref="field_A_srf"> 
     17        <variable id="my_attribute1" type="string">surf_att</variable> 
     18        <variable id="my_attribute2" type="int"> 10 </variable> 
     19        <variable id="my_attribute3" type="float">6.8</variable> 
     20        <variable id="my_attribute5" type="double">100.201</variable> 
     21      </field> 
     22      <field field_ref="field_A_srf_K" /> 
     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> 
     31      <variable id="my_global_attribute" type="string">file_6h</variable> 
     32    </file> 
     33 
     34    <file type="one_file" id="output_surface_1d" name="output_surface_1d" output_freq="1d"> 
     35      <field field_ref="field_A_srf"> 
     36        <variable id="my_attribute1" type="string">surf_att</variable> 
     37        <variable id="my_attribute2" type="int">10</variable> 
     38        <variable id="my_attribute3" type="float">6.8</variable> 
     39        <variable id="my_attribute4" type="double">100.201</variable> 
    2040      </field> 
    2141      <field field_ref="field_A_srf_K" /> 
    2242      <field field_ref="field_A_srf" name="field_A_srf_min" operation="minimum" /> 
    2343      <field field_ref="field_A_srf" name="field_A_srf_max" operation="maximum" /> 
    24       <field field_ref="field_A_srf" name="field_A_srf_prec4" prec="8"/> 
    25       <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> 
    26       <variable id="my_global_attribute" type="string" >file_6h</variable> 
    27     </file> 
    28  
    29     <file type="one_file" id="output_surface_1d" name="output_surface_1d" output_freq="1d" >  
    30       <field field_ref="field_A_srf" > 
    31         <variable id="my_attribute1" type="string" >surf_att</variable> 
    32         <variable id="my_attribute2" type="int" >10</variable> 
    33         <variable id="my_attribute3" type="float" >6.8</variable> 
    34         <variable id="my_attribute4" type="double" >100.201</variable> 
    35       </field> 
    36       <field field_ref="field_A_srf_K" /> 
    37       <field field_ref="field_A_srf" name="field_A_srf_min" operation="minimum" /> 
    38       <field field_ref="field_A_srf" name="field_A_srf_max" operation="maximum" /> 
    39       <field field_ref="field_A_srf" name="field_A_srf_prec4" prec="8"/> 
    40       <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> 
     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> 
    4146      <variable id="my_global_attribute" type="string" >file_1d</variable> 
    4247    </file> 
    4348  </file_definition> 
    44   
    45    <axis_definition> 
    46      <axis id="axis_srf"/> 
    47    </axis_definition> 
    48      
    49    <domain_definition> 
    50      <domain id="domain_srf" /> 
    51    </domain_definition>     
    52    
    53    <grid_definition />     
    54    
     49 
     50  <axis_definition> 
     51    <axis id="axis_srf" /> 
     52  </axis_definition> 
     53 
     54  <domain_definition> 
     55    <domain id="domain_srf" /> 
     56  </domain_definition> 
     57 
     58  <grid_definition /> 
     59 
    5560</context> 
Note: See TracChangeset for help on using the changeset viewer.