- Timestamp:
- 02/10/16 14:34:46 (8 years ago)
- Location:
- XIOS/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/inputs/REMAP/iodef.xml
r818 r820 10 10 <field id="dst_field" operation="instant" field_ref="src_field" domain_ref="dst_domain"/> 11 11 <field id="tmp_field" operation="instant" domain_ref="src_domain_regular_tmp"/> 12 <!-- <field id="tmp_field_1" operation="instant" grid_ref="src_grid_curvilinear" />-->13 <!-- <field id="tmp_field_2" operation="instant" domain_ref="domain_src_unstructured" />-->14 <field id="dst_field_regular" operation="instant" field_ref="tmp_field " domain_ref="dst_domain_regular" read_access="true"/>15 <!-- <field id="dst_field_regular_pole" operation="instant" field_ref="src_field" domain_ref="dst_domain_regular_pole"/>-->12 <field id="tmp_field_1" operation="instant" grid_ref="src_grid_curvilinear" /> 13 <field id="tmp_field_2" operation="instant" grid_ref="src_grid_unstructured" /> 14 <field id="dst_field_regular" operation="instant" field_ref="tmp_field_2" grid_ref="dst_grid_regular" read_access="true"/> 15 <field id="dst_field_regular_pole" operation="instant" field_ref="src_field" domain_ref="dst_domain_regular_pole"/> 16 16 </field_definition> 17 17 … … 25 25 </file> 26 26 <file id="out_dst_regular_pole" name="out_dst_regular_pole" type="one_file"> 27 <!-- <field field_ref="dst_field_regular_pole" name="field" />-->27 <field field_ref="dst_field_regular_pole" name="field" /> 28 28 </file> 29 29 <file id="output_dst_regular" name="output_dst_regular" type="one_file"> … … 31 31 </file> 32 32 <file id="output_dst_curvilinear" name="output_dst_curvilinear" type="one_file"> 33 <!-- <field field_ref="tmp_field_1" operation="instant"/>-->33 <field field_ref="tmp_field_1" operation="instant"/> 34 34 </file> 35 35 <file id="output_dst_unstructured" name="output_dst_unstructured" type="one_file"> 36 <!-- <field field_ref="tmp_field_2" operation="instant"/>--> 37 </file> 38 39 <file id="output_src_regular" name="output_src_regular" mode="read" type="multiple_file"> 40 <!-- <field id="src_field_regular" name="field" domain_ref="src_domain_regular" operation="instant"/>--> 36 <field field_ref="tmp_field_2" operation="instant"/> 41 37 </file> 42 38 <file id="output_src_regular_tmp" name="output_src_regular_tmp" mode="read" type="one_file"> … … 45 41 46 42 <file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" type="one_file"> 47 <!-- <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear" operation="instant"/>-->43 <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear" operation="instant"/> 48 44 </file> 49 45 <file id="output_unstructured" name="output_unstructured" mode="read" type="one_file"> 50 <!-- <field id="field_src_unstructred" name="field" domain_ref="domain_src_unstructured" operation="instant"/>-->46 <field id="field_src_unstructred" name="field" grid_ref="src_grid_unstructured" operation="instant"/> 51 47 </file> 52 48 </file_definition> … … 68 64 <generate_rectilinear_domain id="domain_regular_pole"/> 69 65 <interpolate_domain/> 66 <!-- <zoom_domain id="zoom_0" ibegin="0" ni="180" jbegin="0" nj="90"/>--> 70 67 </domain> 71 68 <domain id="dst_domain_regular" ni_glo="90" nj_glo="45" type="rectilinear"> 72 69 <generate_rectilinear_domain /> 73 70 <interpolate_domain/> 74 </domain>75 <domain id="src_domain_regular" ni_glo="180" nj_glo="90" type="rectilinear">76 <generate_rectilinear_domain lat_start="-90" lat_end="90" lon_start="2" lon_end="360" />77 71 </domain> 78 72 <domain id="src_domain_regular_tmp" type="rectilinear"> … … 82 76 <generate_rectilinear_domain /> 83 77 </domain> 84 <domain id=" domain_src_unstructured" type="unstructured">78 <domain id="src_domain_unstructured" type="unstructured"> 85 79 <generate_rectilinear_domain /> 86 80 </domain> … … 91 85 <domain domain_ref="src_domain_curvilinear"/> 92 86 <axis axis_ref="src_axis_curvilinear" /> 87 </grid> 88 <grid id="src_grid_unstructured"> 89 <domain domain_ref="src_domain_unstructured"/> 90 </grid> 91 <grid id="dst_grid_regular"> 92 <domain domain_ref="dst_domain_regular"/> 93 93 </grid> 94 94 </grid_definition> -
XIOS/trunk/src/declare_ref_func.hpp
r777 r820 54 54 { \ 55 55 for (int i = 1; i < refObjects.size(); ++i) \ 56 refObjects[i]->setAttributes(refObjects[0], apply); \ 56 refObjects[i]->setAttributes(refObjects[i-1], apply); \ 57 if (refObjects.size() > 1) \ 58 refObjects[refObjects.size()-1]->removeRefInheritance(); \ 57 59 } \ 58 60 \ -
XIOS/trunk/src/test/test_remap.f90
r786 r820 120 120 bounds_lon_1D=dst_boundslon, bounds_lat_1D=dst_boundslat, nvertex=dst_nvertex) 121 121 122 CALL xios_set_generate_rectilinear_domain_attr("domain_regular_pole", lat_start=dble(-90.0), lat_end=dble(90), &123 lon_start=dble(2), lon_end=dble(360))124 125 122 dtime%second = 3600 126 123 CALL xios_set_timestep(dtime) … … 134 131 ALLOCATE(tmp_field_1(src_tmp_ni*src_tmp_nj*src_tmp_n)) 135 132 136 CALL xios_get_domain_attr(" domain_src_unstructured", ni=src_tmp_ni, nj=src_tmp_nj)133 CALL xios_get_domain_attr("src_domain_unstructured", ni=src_tmp_ni, nj=src_tmp_nj) 137 134 ALLOCATE(tmp_field_2(src_tmp_ni*src_tmp_nj)) 138 135 139 136 DO ts=1,1 137 140 138 CALL xios_recv_field("src_field_regular_tmp", tmp_field) 141 139 CALL xios_recv_field("src_field_curvilinear", tmp_field_1)
Note: See TracChangeset
for help on using the changeset viewer.