Ignore:
Timestamp:
03/26/18 17:15:45 (3 years ago)
Author:
yushan
Message:

test_remap modified to follow trunk. memory free issue in mapper.cpp solved by changing tags. Yet need to know why.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_openmp/inputs/Unstruct/iodef.xml

    r1220 r1463  
    99     <field id="field_B_srf"  operation="average" freq_op="3600s" grid_ref="grid_A"/> 
    1010     <field id="field_A_expand"  operation="average" grid_ref="grid_dst" field_ref="field_A_srf"/> 
     11 
     12   <!--  <field id="tmp_field_0" domain_ref="src_domain_regular_read"/>       
     13     <field id="tmp_field_1" grid_ref="src_grid_curvilinear_read" /> 
     14     <field id="tmp_field_2" grid_ref="src_grid_unstructured_read" /> --> 
     15 
    1116   </field_definition> 
    1217 
     
    1823        <field field_ref="field_A_srf" name="field_rect2" grid_ref="grid_rect2" enabled=".TRUE." /> 
    1924        <field field_ref="field_A_srf" name="field_rect3" grid_ref="grid_rect3" enabled=".TRUE."/> 
    20       <!--  <field field_ref="field_A_srf" name="field_curv" grid_ref="grid_curv"/> --> 
     25      <!--  <field field_ref="tmp_field_0" name="field_regular_0" enabled=".TRUE."/> --> 
     26    <!--    <field field_ref="tmp_field_1" operation="instant"/> --> 
     27  <!--        <field field_ref="tmp_field_2" operation="instant"/> --> 
    2128     </file> 
    2229 
    23      <!-- <file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" > 
    24        <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear_read" operation="instant"/> 
    25      </file> -->  
     30    <!-- <file_group id="read_files" enabled=".TRUE." > 
     31       <file id="output_src_regular" name="output_src_regular" mode="read" > 
     32          <field id="src_field_regular" name="field" grid_ref="src_grid_regular_read" operation="instant"/> 
     33       </file> 
     34       <file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" > 
     35          <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear_read" operation="instant"/> 
     36       </file> 
     37       <file id="output_src_unstructured" name="output_src_unstructured" mode="read" > 
     38          <field id="src_field_unstructured" name="field" grid_ref="src_grid_unstructured_read" operation="instant"/> 
     39       </file> 
     40     </file_group> 
     41--> 
    2642  
    2743   </file_definition> 
     
    2945   <axis_definition> 
    3046     <axis id="axis_srf" positive="up"/> 
    31       <axis id="src_axis_curvilinear_read" positive="down" /> 
     47     <axis id="src_axis_curvilinear_read" positive="down" /> 
    3248   </axis_definition> 
    3349 
     
    5369       <generate_rectilinear_domain id="domain_regular_pole3"/> 
    5470       <interpolate_domain write_weight="false" order="1" renormalize="true"/>        
    55        <zoom_domain ibegin="0" ni="40" jbegin="0" nj="40" />  
     71       <zoom_domain ibegin="0" ni="30" jbegin="0" nj="30" />  
    5672     </domain> 
    5773 
    58  
    59      <domain id="src_domain_curvilinear_read" type="curvilinear"> 
     74    <domain_group id="read_domains"> 
     75      <domain id="src_domain_regular_read" type="rectilinear"> 
    6076        <generate_rectilinear_domain /> 
    61      </domain> 
     77      </domain> 
     78      <domain id="src_domain_curvilinear_read" type="curvilinear"> 
     79        <generate_rectilinear_domain /> 
     80      </domain> 
     81      <domain id="src_domain_unstructured_read" type="unstructured"> 
     82        <generate_rectilinear_domain/> 
     83      </domain> 
     84    </domain_group> 
    6285 
    6386   </domain_definition> 
     
    90113 
    91114 
    92      <grid id="grid_curv"> 
    93        <domain id="src_domain_curvilinear_read" /> 
    94        <axis axis_ref="axis_srf" /> 
    95      </grid> 
    96  
    97      <grid id="src_grid_curvilinear_read"> 
    98         <domain id="src_domain_curvilinear_read"/> 
     115     <grid_group id="read_grids"> 
     116      <grid id="src_grid_regular_read"> 
     117        <domain domain_ref="src_domain_regular_read"/> 
     118      </grid> 
     119      <grid id="src_grid_curvilinear_read"> 
     120        <domain domain_ref="src_domain_curvilinear_read"/> 
    99121        <axis axis_ref="src_axis_curvilinear_read" /> 
    100      </grid>  
     122      </grid> 
     123      <grid id="src_grid_unstructured_read"> 
     124        <domain domain_ref="src_domain_unstructured_read"/> 
     125      </grid> 
     126    </grid_group>  
    101127 
    102128   </grid_definition> 
Note: See TracChangeset for help on using the changeset viewer.