Ignore:
Timestamp:
07/07/15 10:46:25 (6 years ago)
Author:
mhnguyen
Message:

Implementing interpolation (polynomial) and correct some bugs

+) Implement interpolation (polynomial)
+) Correct some minor bugs relating to memory allocation
+) Clear some redundant codes

Test
+) On Curie
+) test_client and test_complete pass

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/inputs/Version2/iodef.xml

    r624 r630  
    55   <calendar type="Gregorian" start_date="2012-03-01 15:00:00" time_origin="2012-02-29 15:00:00" /> 
    66 
    7  
    87   <field_definition level="1" enabled=".FALSE." default_value="9.96921e+36"> 
    9      <field id="field_AA"  operation="average" freq_op="3600s" domain_ref="domain_A"  axis_ref="axis_A" /> 
     8     <field id="field_Domain_Axis"  operation="average" freq_op="3600s" domain_ref="domain_A"  axis_ref="axis_A" /> 
    109     <field id="field_A"  operation="average" freq_op="3600s" grid_ref="grid_A" /> 
    1110     <field id="field_Axis"  operation="average" freq_op="3600s" grid_ref="grid_Axis" /> 
    1211     <field id="field_Two_Axis"  operation="average" freq_op="3600s" grid_ref="grid_Two_Axis" /> 
     12     <field id="field_All_Axis" operation="average" freq_op="3600s" grid_ref="grid_All_Axis" /> 
    1313     <field id="field_Axis_transformed"  operation="average" freq_op="3600s" field_ref="field_A" grid_ref="grid_Axis_tranformed" /> 
    14      <field id="field_All_Axis" operation="average" freq_op="3600s" grid_ref="grid_All_Axis" /> 
     14     <field id="field_Axis_transformed_Interpolated"  operation="average" freq_op="3600s" field_ref="field_Axis" grid_ref="grid_Axis_tranformed_Interpolated" /> 
    1515     <field id="field_Scalar" operation="average" freq_op="3600s" grid_ref="ScalarGrid" /> 
    1616   </field_definition> 
    1717 
    18  
    1918   <file_definition type="multiple_file" par_access="collective" output_freq="6h" output_level="10" enabled=".TRUE."> 
    2019     <file id="output" name="output"> 
    21 <!--        <field field_ref="field_A" />--> 
     20        <field field_ref="field_A" /> 
    2221     </file> 
    2322     <file id="output_Axis" name="output_Axis" type="one_file"> 
    24 <!--        <field field_ref="field_Axis" />--> 
     23        <field field_ref="field_Axis" /> 
    2524     </file> 
    26      <file id="output_Axis_transformed" name="output_Axis_transformed" type="one_file"> 
     25     <file id="output_All_Axis" name="output_All_Axis" type="one_file"> 
     26        <field field_ref="field_All_Axis" /> 
     27     </file> 
     28     <file id="output_Axis_transformed" name="output_Axis_transformed"> 
    2729        <field field_ref="field_Axis_transformed" /> 
    2830     </file> 
    29      <file id="output_All_Axis" name="output_All_Axis" type="one_file"> 
    30 <!--        <field field_ref="field_All_Axis" />--> 
     31     <file id="output_Axis_transformed_interpolated" name="output_Axis_transformed_interpolated"> 
     32        <field field_ref="field_Axis_transformed_Interpolated" /> 
    3133     </file> 
    3234     <file id="output_Scalar" name="output_Scalar" type="one_file"> 
     
    4042     <axis id="axis_C" /> 
    4143     <axis id="axis_D" /> 
    42      <axis id="axis_E" axis_ref="axis_C"> 
    43 <!--        <inverse_axis />--> 
    44  
    45         <zoom_axis zoom_begin="1" zoom_size="2" /> 
    46 <!--        <inverse_axis />--> 
     44     <axis id="axis_E" axis_ref="axis_A"> 
     45       <inverse_axis /> 
    4746     </axis> 
    48      <axis id="axis_F" axis_ref="axis_A"> 
    49        <inverse_axis /> 
     47     <axis id="axis_F" axis_ref="axis_B"> 
     48        <inverse_axis /> 
     49        <zoom_axis zoom_begin="0" zoom_size="4" /> 
     50        <inverse_axis /> 
     51     </axis> 
     52     <axis id="axis_G" axis_ref="axis_D"> 
     53       <interpolate_axis type="polynomial" order="3"/> 
     54     </axis> 
     55     <axis id="axis_H" axis_ref="axis_C"> 
     56<!--       <inverse_axis />--> 
     57       <zoom_axis zoom_begin="0" zoom_size="3" /> 
    5058     </axis> 
    5159   </axis_definition> 
     
    6371       <grid id="grid_Axis"> 
    6472         <axis axis_ref="axis_D" /> 
    65  
    6673       </grid> 
    6774       <grid id="grid_Two_Axis"> 
     
    6976         <axis axis_ref="axis_B" /> 
    7077       </grid> 
    71        <grid id="grid_Axis_tranformed"> 
    72          <domain domain_ref="domain_A" /> 
    73             <axis axis_ref="axis_E" /> 
    74 <!--         <axis axis_ref="axis_F" />--> 
    75 <!--         <axis axis_ref="axis_E" />--> 
    76        </grid> 
    7778       <grid id="grid_All_Axis"> 
    7879         <axis axis_ref="axis_A" /> 
    7980         <axis axis_ref="axis_B" /> 
    8081         <axis axis_ref="axis_C" /> 
     82       </grid> 
     83       <grid id="grid_Axis_tranformed"> 
     84         <domain domain_ref="domain_A" /> 
     85            <axis axis_ref="axis_H" /> 
     86<!--         <axis axis_ref="axis_E" />--> 
     87<!--         <axis axis_ref="axis_F" />--> 
     88       </grid> 
     89       <grid id="grid_Axis_tranformed_Interpolated"> 
     90         <axis axis_ref="axis_G" /> 
    8191       </grid> 
    8292       <grid id="ScalarGrid"> 
Note: See TracChangeset for help on using the changeset viewer.