Changeset 871 for XIOS/trunk/inputs


Ignore:
Timestamp:
06/09/16 11:33:37 (8 years ago)
Author:
mhnguyen
Message:

Correcting a bug which sometimes make transformations between different size grids incorrect

+) Correct inputs of some functions
+) Add some auxilliary functions.
+) Add new test cases for test_remap

Test
+) Basic test pass
+) Single horizontal and vertical interpolation are correct
+) Chained interpolation are not correct

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/trunk/inputs/REMAP/iodef.xml

    r837 r871  
    44 <context id="test"> 
    55   <calendar type="Gregorian" start_date="2012-03-01 15:00:00" time_origin="2012-02-28 15:00:00 + 1d" /> 
    6  
    7  
    86   <field_definition level="1" > 
    97     <field id="src_field" operation="instant" domain_ref="src_domain"/> 
     8     <field id="src_field_3D" operation="instant" domain_ref="src_domain" axis_ref="src_axis"/> 
     9     <field id="src_field_3D_interp" operation="instant" field_ref="src_field_3D" axis_ref="dst_axis"/> 
     10     <field id="src_field_3D_pression" operation="instant" grid_ref="src_grid_3D"/> 
    1011     <field id="src_field_clone" operation="instant" field_ref="src_field" domain_ref="src_domain_clone"/> 
    1112     <field id="dst_field" operation="instant" field_ref="src_field" domain_ref="dst_domain"/> 
    12      <field id="tmp_field" operation="instant" domain_ref="src_domain_regular_tmp"/> 
    13      <field id="tmp_field_clone" field_ref="tmp_field"/> 
    14      <field id="tmp_field_1" operation="instant" grid_ref="src_grid_curvilinear" /> 
    15      <field id="tmp_field_2" operation="instant" grid_ref="src_grid_unstructured" /> 
    16      <field id="dst_field_regular" operation="instant" field_ref="tmp_field_2" grid_ref="dst_grid_regular" read_access="true"/> 
    1713     <field id="dst_field_regular_pole" operation="instant" field_ref="src_field" domain_ref="dst_domain_regular_pole"/> 
    18      <field id="dst_field_regular_pole_1" operation="instant" field_ref="tmp_field" domain_ref="dst_domain_regular_pole"/> 
    19      <field id="dst_field_regular_pole_2" operation="instant" field_ref="tmp_field_clone" domain_ref="dst_domain_regular_pole"/> 
     14<!--     <field id="tmp_field" operation="instant" domain_ref="src_domain_regular_tmp"/>--> 
     15<!--     <field id="tmp_field_clone" field_ref="tmp_field"/>--> 
     16<!--     <field id="tmp_field_1" operation="instant" grid_ref="src_grid_curvilinear" />--> 
     17<!--     <field id="tmp_field_2" operation="instant" grid_ref="src_grid_unstructured" />--> 
     18<!--     <field id="dst_field_regular" operation="instant" field_ref="tmp_field_2" grid_ref="dst_grid_regular" read_access="true"/>--> 
     19<!--     <field id="dst_field_3D" operation="instant" field_ref="src_field_3D" grid_ref="dst_grid_3D"/>--> 
     20<!--     <field id="dst_field_regular_pole_1" operation="instant" field_ref="tmp_field" domain_ref="dst_domain_regular_pole"/>--> 
     21<!--     <field id="dst_field_regular_pole_2" operation="instant" field_ref="tmp_field_clone" domain_ref="dst_domain_regular_pole"/>--> 
    2022   </field_definition> 
    2123 
    2224   <file_definition type="one_file" par_access="collective" output_freq="1ts" output_level="10" enabled=".TRUE."> 
    2325     <file id="output" name="output"> 
    24         <field field_ref="src_field" name="field" /> 
     26<!--        <field field_ref="src_field" name="field" />--> 
     27     </file> 
     28     <file id="output_3D" name="output_3D"> 
     29        <field field_ref="src_field_3D" name="field" /> 
     30     </file> 
     31    <file id="output_3D_pression" name="output_3D_pression"> 
     32        <field field_ref="src_field_3D_pression" name="field" /> 
    2533     </file> 
    2634     <file id="output_clone" name="output_clone"> 
    27         <field field_ref="src_field_clone" name="field" /> 
     35<!--        <field field_ref="src_field_clone" name="field" />--> 
    2836     </file> 
    2937     <file id="output_dst" name="output_dst" type="one_file"> 
    30         <field field_ref="dst_field" name="field" /> 
     38<!--        <field field_ref="dst_field" name="field" />--> 
    3139     </file> 
    3240     <file id="out_dst_regular_pole" name="out_dst_regular_pole" type="one_file"> 
    33         <field field_ref="dst_field_regular_pole" name="field" /> 
     41<!--        <field field_ref="dst_field_regular_pole" name="field" />--> 
    3442     </file> 
    35      <file id="out_dst_regular_pole_1" name="out_dst_regular_pole_1" type="one_file"> 
    36         <field field_ref="dst_field_regular_pole_1" name="field" /> 
     43     <file id="regular_field_3D" name="regular_field_3D" type="one_file"> 
     44        <field field_ref="src_field_3D_interp" name="field" domain_ref="dst_domain_regular_pole" /> 
    3745     </file> 
    38      <file id="out_dst_regular_pole_2" name="out_dst_regular_pole_2" type="one_file"> 
    39         <field field_ref="dst_field_regular_pole_2" name="field" /> 
     46    <file id="regular_field_3D_interp" name="regular_field_3D_interp" type="one_file"> 
     47        <field field_ref="src_field_3D_interp" name="field" /> 
    4048     </file> 
    41      <file id="output_dst_regular" name="output_dst_regular" type="one_file"> 
    42         <field field_ref="dst_field_regular" name="field" /> 
    43      </file> 
    44      <file id="output_dst_curvilinear" name="output_dst_curvilinear" type="one_file"> 
    45         <field field_ref="tmp_field_1" operation="instant"/> 
    46      </file> 
    47      <file id="output_dst_unstructured" name="output_dst_unstructured" type="one_file"> 
    48         <field field_ref="tmp_field_2" operation="instant"/> 
    49      </file> 
    50      <file id="output_src_regular_tmp" name="output_src_regular_tmp" mode="read" type="one_file"> 
    51         <field id="src_field_regular_tmp" name="field" domain_ref="src_domain_regular_tmp" operation="instant"/> 
    52      </file> 
    53      <file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" type="one_file"> 
    54         <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear" operation="instant"/> 
    55      </file> 
    56      <file id="output_unstructured" name="output_unstructured" mode="read" type="one_file"> 
    57         <field id="field_src_unstructred" name="field" grid_ref="src_grid_unstructured" operation="instant"/> 
    58      </file> 
     49<!--     <file id="out_dst_regular_pole_1" name="out_dst_regular_pole_1" type="one_file">--> 
     50<!--        <field field_ref="dst_field_regular_pole_1" name="field" />--> 
     51<!--     </file>--> 
     52<!--     <file id="out_dst_regular_pole_2" name="out_dst_regular_pole_2" type="one_file">--> 
     53<!--        <field field_ref="dst_field_regular_pole_2" name="field" />--> 
     54<!--     </file>--> 
     55<!--     <file id="output_dst_regular" name="output_dst_regular" type="one_file">--> 
     56<!--        <field field_ref="dst_field_regular" name="field" />--> 
     57<!--     </file>--> 
     58<!--     <file id="output_dst_curvilinear" name="output_dst_curvilinear" type="one_file">--> 
     59<!--        <field field_ref="tmp_field_1" operation="instant"/>--> 
     60<!--     </file>--> 
     61<!--     <file id="output_dst_unstructured" name="output_dst_unstructured" type="one_file">--> 
     62<!--        <field field_ref="tmp_field_2" operation="instant"/>--> 
     63<!--     </file>--> 
     64<!--     <file id="output_src_regular_tmp" name="output_src_regular_tmp" mode="read" type="one_file">--> 
     65<!--        <field id="src_field_regular_tmp" name="field" domain_ref="src_domain_regular_tmp" operation="instant"/>--> 
     66<!--     </file>--> 
     67<!--     <file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" type="one_file">--> 
     68<!--        <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear" operation="instant"/>--> 
     69<!--     </file>--> 
     70<!--     <file id="output_unstructured" name="output_unstructured" mode="read" type="one_file">--> 
     71<!--        <field id="field_src_unstructred" name="field" grid_ref="src_grid_unstructured" operation="instant"/>--> 
     72<!--     </file>--> 
    5973   </file_definition> 
    6074 
    6175 
    6276   <axis_definition> 
     77     <axis id="dst_axis" positive="down" n_glo="2" value="(0,1)[120 220]"> 
     78        <interpolate_axis type="polynomial" order="1" coordinate="src_field_3D_pression"/> 
     79<!--        <interpolate_axis type="polynomial" order="1" />--> 
     80     </axis> 
     81     <axis id="src_axis" positive="down" /> 
    6382     <axis id="src_axis_curvilinear" /> 
    64    </axis_definition> 
    65    <axis_definition> 
    66      <axis id="axis_surface_curvi" /> 
    6783   </axis_definition> 
    6884 
    … …  
    7389       <interpolate_domain/> 
    7490     </domain> 
    75      <domain id="dst_domain_regular_pole" ni_glo="180" nj_glo="90" type="rectilinear"> 
     91     <domain id="dst_domain_regular_pole" ni_glo="90" nj_glo="45" type="rectilinear"> 
    7692       <generate_rectilinear_domain id="domain_regular_pole"/> 
    7793       <interpolate_domain/> 
    78        <zoom_domain id="zoom_0" ibegin="0" ni="90" jbegin="0" nj="90"/> 
    7994     </domain> 
    8095     <domain id="dst_domain_regular" ni_glo="90" nj_glo="45" type="rectilinear"> 
    … …  
    104119      <domain domain_ref="dst_domain_regular"/> 
    105120    </grid> 
     121    <grid id="src_grid_3D"> 
     122      <domain domain_ref="src_domain"/> 
     123      <axis axis_ref="src_axis"/> 
     124    </grid> 
     125    <grid id="dst_grid_3D"> 
     126<!--      <domain domain_ref="src_domain"/>--> 
     127      <domain domain_ref="dst_domain_regular_pole"/> 
     128<!--      <axis axis_ref="src_axis"/>--> 
     129      <axis axis_ref="dst_axis"/> 
     130    </grid> 
    106131  </grid_definition> 
    107132  </context> 
Note: See TracChangeset for help on using the changeset viewer.