Changeset 1179
- Timestamp:
- 06/21/17 17:57:47 (6 years ago)
- Location:
- XIOS/dev/branch_yushan_merged
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_yushan_merged/inputs/REMAP/iodef.xml
r1176 r1179 35 35 <file_definition type="one_file" par_access="collective" output_freq="1ts" output_level="10" enabled=".TRUE."> 36 36 37 <file_group id="read_then_write_files" enabled=". FALSE.">37 <file_group id="read_then_write_files" enabled=".TRUE."> 38 38 <file id="output_regular_pole" name="output_dst_regular" > 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." />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 42 <field field_ref="dst_field_regular_pole_1" name="field_regular_pole_1" enabled=".FALSE." /> 43 43 </file> 44 <file id="output_dst_curvilinear" name="output_dst_curvilinear" enabled=". FALSE." >44 <file id="output_dst_curvilinear" name="output_dst_curvilinear" enabled=".TRUE." > 45 45 <field field_ref="tmp_field_1" operation="instant"/> 46 46 </file> 47 <file id="output_dst_unstructured" name="output_dst_unstructured" enabled=". FALSE." >47 <file id="output_dst_unstructured" name="output_dst_unstructured" enabled=".TRUE." > 48 48 <field field_ref="tmp_field_2" operation="instant"/> 49 49 </file> … … 52 52 <file_group id="write_files" > 53 53 <file id="output_2D" name="output_2D" 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."/>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 56 <field field_ref="src_field_2D" name="field_dst_regular_0" domain_ref="dst_domain_regular_pole" enabled=".TRUE."/> 57 <field field_ref="dst_field_2D" name="field_dst_regular_1" enabled=". FALSE." />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."/>57 <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."/> 61 61 </file> 62 <file id="output_3D" name="output_3D" enabled=". FALSE.">62 <file id="output_3D" name="output_3D" enabled=".TRUE."> 63 63 <field field_ref="src_field_3D" name="field_src" /> 64 64 <field field_ref="src_field_3D_pression" name="field" /> … … 66 66 <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain_axis" domain_ref="dst_domain_regular_pole"/> 67 67 </file> 68 <file id="output_4D" name="output_4D" enabled=". FALSE.">69 <field field_ref="src_field_4D" name="field_4D" enabled=".FALSE."/>68 <file id="output_4D" name="output_4D" enabled=".TRUE."> 69 <field field_ref="src_field_4D" name="field_4D" /> 70 70 <field field_ref="dst_field_4D_extract" name="field_4D_extract" /> 71 71 </file> -
XIOS/dev/branch_yushan_merged/inputs/Unstruct/iodef.xml
r1176 r1179 16 16 <field field_ref="field_A_srf" name="field_A"/> 17 17 <field field_ref="field_A_srf" name="field_rect" grid_ref="grid_rect"/> 18 <!-- <field field_ref="field_A_srf" name="field_curv" grid_ref="grid_curv"/> --> 18 <field field_ref="field_A_srf" name="field_rect2" grid_ref="grid_rect2"/> 19 <!-- <field field_ref="field_A_srf" name="field_curv" grid_ref="grid_curv"/> --> 19 20 </file> 20 21 21 <!--<file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" >22 23 </file> -->22 <!-- <file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" > 23 <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear_read" operation="instant"/> 24 </file> --> 24 25 25 26 </file_definition> … … 40 41 <domain id="dst_domain_regular_pole" ni_glo="90" nj_glo="45" type="rectilinear"> 41 42 <generate_rectilinear_domain id="domain_regular_pole"/> 43 <interpolate_domain write_weight="false" order="1" renormalize="true"/> 44 </domain> 45 46 <domain id="dst_domain_regular_pole2" ni_glo="90" nj_glo="90" type="rectilinear"> 47 <generate_rectilinear_domain id="domain_regular_pole2"/> 42 48 <interpolate_domain write_weight="false" order="1" renormalize="true"/> 43 49 </domain> … … 62 68 <grid id="grid_rect"> 63 69 <domain domain_ref="dst_domain_regular_pole" /> 70 <axis axis_ref="axis_srf" /> 71 </grid> 72 73 <grid id="grid_rect2"> 74 <domain domain_ref="dst_domain_regular_pole2" /> 64 75 <axis axis_ref="axis_srf" /> 65 76 </grid> -
XIOS/dev/branch_yushan_merged/src/buffer_client.cpp
r1176 r1179 88 88 { 89 89 MPI_Issend(buffer[current], count, MPI_CHAR, serverRank, 20, interComm, &request); 90 #pragma omp critical (_output)91 90 pending = true; 92 91 if (current == 1) current = 0; -
XIOS/dev/branch_yushan_merged/src/client.cpp
r1176 r1179 107 107 MPI_Comm_rank(intraComm,&intraCommRank) ; 108 108 109 /*#pragma omp critical(_output)109 #pragma omp critical(_output) 110 110 { 111 111 info(10)<<"intercommCreate::client "<<test_omp_rank<< " "<< &test_omp_rank <<" intraCommSize : "<<intraCommSize 112 112 <<" intraCommRank :"<<intraCommRank<<" serverLeader "<< serverLeader 113 113 <<" globalComm : "<< &(CXios::globalComm) << endl ; 114 } */114 } 115 115 116 116 -
XIOS/dev/branch_yushan_merged/src/context_server.cpp
r1134 r1179 82 82 ep_lib::MPI_Iprobe(rank,20,interComm,&flag,&status); 83 83 traceOn(); 84 if (flag ==true)84 if (flag) 85 85 { 86 86 it=buffers.find(rank); -
XIOS/dev/branch_yushan_merged/src/test/test_remap_omp.f90
r1176 r1179 52 52 if(rank < size-2) then 53 53 54 !$omp parallel default( private) firstprivate(dtime)54 !$omp parallel default(firstprivate) firstprivate(dtime) 55 55 56 56 !!! XIOS Initialization (get the local communicator) … … 232 232 CALL xios_send_field("src_field_2D",src_field_2D) 233 233 234 DO i=1,src_ni235 src_field_2D_clone(i) = src_field_2D(i)236 IF ((23.5 * ts < src_lat(i)) .AND. (src_lat(i) < 65.5 *ts) .AND. (0 < src_lon(i)) .AND. (src_lon(i) < 30*ts)) THEN237 src_field_2D_clone(i) = missing_value238 ENDIF239 ENDDO240 241 CALL xios_send_field("src_field_2D_clone",src_field_2D_clone)242 CALL xios_send_field("src_field_3D",src_field_3D)243 CALL xios_send_field("src_field_3D_clone",src_field_3D)244 CALL xios_send_field("src_field_4D",src_field_4D)245 CALL xios_send_field("src_field_3D_pression",src_field_pression)234 !DO i=1,src_ni 235 ! src_field_2D_clone(i) = src_field_2D(i) 236 ! IF ((23.5 * ts < src_lat(i)) .AND. (src_lat(i) < 65.5 *ts) .AND. (0 < src_lon(i)) .AND. (src_lon(i) < 30*ts)) THEN 237 ! src_field_2D_clone(i) = missing_value 238 ! ENDIF 239 !ENDDO 240 241 !CALL xios_send_field("src_field_2D_clone",src_field_2D_clone) 242 !CALL xios_send_field("src_field_3D",src_field_3D) 243 !CALL xios_send_field("src_field_3D_clone",src_field_3D) 244 !CALL xios_send_field("src_field_4D",src_field_4D) 245 !CALL xios_send_field("src_field_3D_pression",src_field_pression) 246 246 CALL xios_send_field("tmp_field_0",tmp_field_0) 247 247 CALL xios_send_field("tmp_field_1",tmp_field_1) … … 258 258 CALL xios_finalize() 259 259 260 print *, "Client : xios_finalize " 260 print *, "Client : xios_finalize ", rank 261 261 262 262 !$omp barrier
Note: See TracChangeset
for help on using the changeset viewer.