Ignore:
Timestamp:
07/28/15 13:37:07 (6 years ago)
Author:
mhnguyen
Message:

Making changes in domain to make sure unstructed grid work with new method of index distribution

+) Change the way define i_index and j_index of a domain
+) Remove some redundant attributes of domain
+) Adjust the way to calculate index distribution on server side

Test
+) Make some minor change to test_unstruct_complete to work with new XIOS
+) On Curie
+) All test pass and correct

File:
1 edited

Legend:

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

    r633 r657  
    1111     <field id="field_Two_Axis"  operation="average" freq_op="3600s" grid_ref="grid_Two_Axis" /> 
    1212     <field id="field_All_Axis" operation="average" freq_op="3600s" grid_ref="grid_All_Axis" /> 
    13      <field id="field_Axis_transformed"  operation="average" freq_op="3600s" field_ref="field_Two_Axis" grid_ref="grid_Axis_tranformed" /> 
     13     <field id="field_Axis_transformed"  operation="average" freq_op="3600s" field_ref="field_A" grid_ref="grid_Axis_tranformed" /> 
    1414     <field id="field_Axis_transformed_Interpolated"  operation="average" freq_op="3600s" field_ref="field_Axis" grid_ref="grid_Axis_tranformed_Interpolated" /> 
     15     <field id="field_Domain_transformed_Interpolated"  operation="average" freq_op="3600s" field_ref="field_A" grid_ref="grid_Domain_tranformed_Interpolated" /> 
    1516     <field id="field_Scalar" operation="average" freq_op="3600s" grid_ref="ScalarGrid" /> 
    1617   </field_definition> 
     
    1819   <file_definition type="multiple_file" par_access="collective" output_freq="6h" output_level="10" enabled=".TRUE."> 
    1920     <file id="output" name="output" type="one_file"> 
    20         <field field_ref="field_A" /> 
     21<!--        <field field_ref="field_A" />--> 
    2122     </file> 
    2223     <file id="output_Axis" name="output_Axis" type="one_file"> 
    23         <field field_ref="field_Axis" /> 
     24<!--        <field field_ref="field_Axis" />--> 
    2425     </file> 
    2526     <file id="output_All_Axis" name="output_All_Axis" type="one_file"> 
    26         <field field_ref="field_All_Axis" /> 
     27<!--        <field field_ref="field_All_Axis" />--> 
    2728     </file> 
    2829     <file id="output_Axis_transformed" name="output_Axis_transformed" type="one_file"> 
    29         <field field_ref="field_Axis_transformed" /> 
     30<!--        <field field_ref="field_Axis_transformed" />--> 
    3031     </file> 
    3132     <file id="output_Axis_transformed_interpolated" name="output_Axis_transformed_interpolated"> 
    32         <field field_ref="field_Axis_transformed_Interpolated" /> 
     33<!--        <field field_ref="field_Axis_transformed_Interpolated" />--> 
     34     </file> 
     35     <file id="output_Domain_transformed_interpolated" name="output_Domain_transformed_interpolated"> 
     36        <field field_ref="field_Domain_transformed_Interpolated" /> 
    3337     </file> 
    3438     <file id="output_Scalar" name="output_Scalar" type="one_file"> 
     
    5458     </axis> 
    5559     <axis id="axis_H" axis_ref="axis_C"> 
    56        <inverse_axis /> 
    57        <zoom_axis zoom_begin="0" zoom_size="1" /> 
     60<!--       <inverse_axis />--> 
     61<!--       <zoom_axis zoom_begin="0" zoom_size="1" />--> 
    5862     </axis> 
    5963   </axis_definition> 
     
    6266     <domain id="domain_A" /> 
    6367     <domain id="domain_A_zoom" domain_ref="domain_A"> 
    64        <zoom_domain zoom_ibegin="1" zoom_ni="3" zoom_jbegin="0" zoom_nj="4"/> 
    65        <zoom_domain zoom_ibegin="0" zoom_ni="2" zoom_jbegin="0" zoom_nj="2"/> 
     68<!--       <zoom_domain zoom_ibegin="1" zoom_ni="3" zoom_jbegin="0" zoom_nj="2"/>--> 
     69       <zoom_domain zoom_ibegin="39" zoom_ni="20" zoom_jbegin="39" zoom_nj="20"/> 
     70<!--       <zoom_domain zoom_ibegin="0" zoom_ni="2" zoom_jbegin="0" zoom_nj="2"/>--> 
     71     </domain> 
     72     <domain id="domain_A_transformed" domain_ref="domain_A"> 
     73       <interpolate_from_file_domain file="" /> 
    6674     </domain> 
    6775   </domain_definition> 
     
    8795       <grid id="grid_Axis_tranformed"> 
    8896<!--         <domain domain_ref="domain_A" />--> 
    89 <!--         <domain domain_ref="domain_A_zoom" />--> 
    90 <!--         <axis axis_ref="axis_H" />--> 
    91          <axis axis_ref="axis_E" /> 
    92          <axis axis_ref="axis_F" /> 
     97         <domain domain_ref="domain_A_zoom" /> 
     98         <axis axis_ref="axis_H" /> 
     99<!--         <axis axis_ref="axis_E" />--> 
     100<!--         <axis axis_ref="axis_F" />--> 
     101       </grid> 
     102       <grid id="grid_Domain_tranformed_Interpolated"> 
     103         <domain domain_ref="domain_A_transformed" /> 
     104         <axis axis_ref="axis_H" /> 
    93105       </grid> 
    94106       <grid id="grid_Axis_tranformed_Interpolated"> 
Note: See TracChangeset for help on using the changeset viewer.