Ignore:
Timestamp:
07/10/17 15:18:16 (4 years ago)
Author:
yushan
Message:

prep to merge with trunk @1200

Location:
XIOS/dev/branch_yushan_merged/inputs
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan_merged/inputs/REMAP/iodef.xml

    r1185 r1203  
    3636       
    3737      <file_group id="read_then_write_files" enabled=".TRUE."> 
    38        <file id="output_regular_pole" name="output_dst_regular" > 
    39           <field field_ref="tmp_field_0" name="field_regular_0" enabled=".TRUE."/> 
    40           <field field_ref="dst_field_regular" name="field_regular" enabled=".TRUE."/> 
    41           <field field_ref="dst_field_regular_pole_0" name="field_regular_pole_0" enabled=".TRUE." /> 
    42           <field field_ref="dst_field_regular_pole_1" name="field_regular_pole_1" enabled=".TRUE." /> 
    43        </file> 
    44        <file id="output_dst_curvilinear" name="output_dst_curvilinear" enabled=".TRUE." > 
     38       <file id="output_regular_pole" name="output_dst_regular" enabled=".FALSE."  > 
     39          <field field_ref="tmp_field_0" name="field_regular_0" enabled=".FALSE."/> 
     40          <field field_ref="dst_field_regular" name="field_regular" enabled=".FALSE."/> 
     41          <field field_ref="dst_field_regular_pole_0" name="field_regular_pole_0" enabled=".FALSE." /> 
     42          <field field_ref="dst_field_regular_pole_1" name="field_regular_pole_1" enabled=".FALSE." /> 
     43       </file> 
     44       <file id="output_dst_curvilinear" name="output_dst_curvilinear" enabled=".FALSE." > 
    4545          <field field_ref="tmp_field_1" operation="instant"/> 
    4646       </file> 
    47        <file id="output_dst_unstructured" name="output_dst_unstructured" enabled=".TRUE." > 
     47       <file id="output_dst_unstructured" name="output_dst_unstructured" enabled=".FALSE." > 
    4848          <field field_ref="tmp_field_2" operation="instant"/> 
    4949       </file> 
     
    5252      <file_group id="write_files" > 
    5353        <file id="output_2D" name="output_2D" enabled=".TRUE."> 
    54           <field field_ref="src_field_2D" name="field_src" enabled=".TRUE."/> 
    55           <field field_ref="src_field_2D_clone" name="field_src_clone" default_value="100000" enabled=".TRUE."/> 
    56           <field field_ref="src_field_2D" name="field_dst_regular_0"  domain_ref="dst_domain_regular_pole" enabled=".TRUE."/> 
     54          <field field_ref="src_field_2D" name="field_src" enabled=".FALSE."/> 
     55          <field field_ref="src_field_2D_clone" name="field_src_clone" default_value="100000" enabled=".FALSE."/> 
     56          <field field_ref="src_field_2D" name="field_dst_regular_0"  domain_ref="dst_domain_regular_pole" enabled=".FALSE."/> 
    5757          <field field_ref="dst_field_2D" name="field_dst_regular_1" enabled=".TRUE." /> 
    58           <field field_ref="dst_field_2D_regular_pole" name="field_dst_regular_2" enabled=".TRUE."/> 
    59           <field field_ref="dst_field_2D_clone" name="field_dst_regular_3" detect_missing_value=".false." default_value="100000" enabled=".TRUE."/> 
    60           <field field_ref="dst_field_2D_extract" name="field_dst_regular_4" enabled=".TRUE."/> 
     58          <field field_ref="dst_field_2D_regular_pole" name="field_dst_regular_2" enabled=".FALSE."/> 
     59          <field field_ref="dst_field_2D_clone" name="field_dst_regular_3" detect_missing_value=".false." default_value="100000" enabled=".FALSE."/> 
     60          <field field_ref="dst_field_2D_extract" name="field_dst_regular_4" enabled=".FALSE."/> 
    6161        </file>  
    62        <file id="output_3D" name="output_3D" enabled=".TRUE."> 
     62       <file id="output_3D" name="output_3D" enabled=".FALSE."> 
    6363          <field field_ref="src_field_3D" name="field_src" /> 
    6464          <field field_ref="src_field_3D_pression" name="field" /> 
    6565          <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain" /> 
    66           <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain_axis" domain_ref="dst_domain_regular_pole"/>   
    67        </file> 
    68        <file id="output_4D" name="output_4D" enabled=".TRUE."> 
     66          <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain_axis" domain_ref="dst_domain_regular_pole" enabled=".FALSE."/>   
     67       </file> 
     68       <file id="output_4D" name="output_4D" enabled=".FALSE."> 
    6969          <field field_ref="src_field_4D" name="field_4D" /> 
    70           <field field_ref="dst_field_4D_extract" name="field_4D_extract" /> 
     70          <field field_ref="dst_field_4D_extract" name="field_4D_extract" enabled=".FALSE."/> 
    7171        </file> 
    7272     </file_group> 
    73      <file_group id="read_files" > 
     73     <file_group id="read_files" enabled=".FALSE." > 
    7474       <file id="output_src_regular" name="output_src_regular" mode="read" > 
    7575          <field id="src_field_regular" name="field" grid_ref="src_grid_regular_read" operation="instant"/> 
  • XIOS/dev/branch_yushan_merged/inputs/Unstruct/iodef.xml

    r1179 r1203  
    1515<!--        <field field_ref="field_A_expand" name="field"/> --> 
    1616        <field field_ref="field_A_srf" name="field_A"/> 
    17         <field field_ref="field_A_srf" name="field_rect" grid_ref="grid_rect"/> 
    18         <field field_ref="field_A_srf" name="field_rect2" grid_ref="grid_rect2"/> 
     17        <field field_ref="field_A_srf" name="field_rect" grid_ref="grid_rect" enabled=".FALSE." /> 
     18        <field field_ref="field_A_srf" name="field_rect2" grid_ref="grid_rect2" enabled=".TRUE." /> 
     19        <field field_ref="field_A_srf" name="field_rect3" grid_ref="grid_rect3" enabled=".TRUE."/> 
    1920      <!--  <field field_ref="field_A_srf" name="field_curv" grid_ref="grid_curv"/> --> 
    2021     </file> 
     
    4445     </domain> 
    4546 
    46      <domain id="dst_domain_regular_pole2" ni_glo="90" nj_glo="90" type="rectilinear"> 
     47     <domain id="dst_domain_regular_pole2" ni_glo="80" nj_glo="80" type="rectilinear"> 
    4748       <generate_rectilinear_domain id="domain_regular_pole2"/> 
    4849       <interpolate_domain write_weight="false" order="1" renormalize="true"/>        
    4950     </domain> 
     51 
     52     <domain id="dst_domain_regular_pole3" ni_glo="80" nj_glo="80" type="rectilinear"> 
     53       <generate_rectilinear_domain id="domain_regular_pole3"/> 
     54       <interpolate_domain write_weight="false" order="1" renormalize="true"/>        
     55       <zoom_domain ibegin="0" ni="65" jbegin="0" nj="65" />  
     56     </domain> 
     57 
    5058 
    5159     <domain id="src_domain_curvilinear_read" type="curvilinear"> 
     
    7583       <axis axis_ref="axis_srf" /> 
    7684     </grid> 
     85 
     86     <grid id="grid_rect3"> 
     87       <domain domain_ref="dst_domain_regular_pole3" /> 
     88       <axis axis_ref="axis_srf" /> 
     89     </grid> 
     90 
    7791 
    7892     <grid id="grid_curv"> 
Note: See TracChangeset for help on using the changeset viewer.