Changeset 1179


Ignore:
Timestamp:
06/21/17 17:57:47 (4 years ago)
Author:
yushan
Message:

MARK! This version is working for test_client and test_complete with large number of procs and threads

Location:
XIOS/dev/branch_yushan_merged
Files:
6 edited

Legend:

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

    r1176 r1179  
    3535   <file_definition type="one_file" par_access="collective" output_freq="1ts" output_level="10" enabled=".TRUE."> 
    3636       
    37       <file_group id="read_then_write_files" enabled=".FALSE."> 
     37      <file_group id="read_then_write_files" enabled=".TRUE."> 
    3838       <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." /> 
    4242          <field field_ref="dst_field_regular_pole_1" name="field_regular_pole_1" enabled=".FALSE." /> 
    4343       </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." > 
    4545          <field field_ref="tmp_field_1" operation="instant"/> 
    4646       </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." > 
    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=".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."/> 
    5656          <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."/> 
    6161        </file>  
    62        <file id="output_3D" name="output_3D" enabled=".FALSE."> 
     62       <file id="output_3D" name="output_3D" enabled=".TRUE."> 
    6363          <field field_ref="src_field_3D" name="field_src" /> 
    6464          <field field_ref="src_field_3D_pression" name="field" /> 
     
    6666          <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain_axis" domain_ref="dst_domain_regular_pole"/>   
    6767       </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" /> 
    7070          <field field_ref="dst_field_4D_extract" name="field_4D_extract" /> 
    7171        </file> 
  • XIOS/dev/branch_yushan_merged/inputs/Unstruct/iodef.xml

    r1176 r1179  
    1616        <field field_ref="field_A_srf" name="field_A"/> 
    1717        <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"/> --> 
    1920     </file> 
    2021 
    21  <!--    <file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" > 
    22           <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear_read" operation="instant"/> 
    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> -->  
    2425  
    2526   </file_definition> 
     
    4041     <domain id="dst_domain_regular_pole" ni_glo="90" nj_glo="45" type="rectilinear"> 
    4142       <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"/> 
    4248       <interpolate_domain write_weight="false" order="1" renormalize="true"/>        
    4349     </domain> 
     
    6268     <grid id="grid_rect"> 
    6369       <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" /> 
    6475       <axis axis_ref="axis_srf" /> 
    6576     </grid> 
  • XIOS/dev/branch_yushan_merged/src/buffer_client.cpp

    r1176 r1179  
    8888      { 
    8989        MPI_Issend(buffer[current], count, MPI_CHAR, serverRank, 20, interComm, &request); 
    90         #pragma omp critical (_output) 
    9190        pending = true; 
    9291        if (current == 1) current = 0; 
  • XIOS/dev/branch_yushan_merged/src/client.cpp

    r1176 r1179  
    107107            MPI_Comm_rank(intraComm,&intraCommRank) ; 
    108108             
    109             /*#pragma omp critical(_output) 
     109            #pragma omp critical(_output) 
    110110            { 
    111111              info(10)<<"intercommCreate::client "<<test_omp_rank<< " "<< &test_omp_rank <<" intraCommSize : "<<intraCommSize 
    112112                 <<" intraCommRank :"<<intraCommRank<<"  serverLeader "<< serverLeader 
    113113                 <<" globalComm : "<< &(CXios::globalComm) << endl ;   
    114             }*/ 
     114            } 
    115115 
    116116             
  • XIOS/dev/branch_yushan_merged/src/context_server.cpp

    r1134 r1179  
    8282        ep_lib::MPI_Iprobe(rank,20,interComm,&flag,&status); 
    8383        traceOn(); 
    84         if (flag==true) 
     84        if (flag) 
    8585        { 
    8686          it=buffers.find(rank); 
  • XIOS/dev/branch_yushan_merged/src/test/test_remap_omp.f90

    r1176 r1179  
    5252  if(rank < size-2) then 
    5353 
    54   !$omp parallel default(private) firstprivate(dtime) 
     54  !$omp parallel default(firstprivate) firstprivate(dtime) 
    5555 
    5656!!! XIOS Initialization (get the local communicator) 
     
    232232    CALL xios_send_field("src_field_2D",src_field_2D) 
    233233     
    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) 
     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) 
    246246    CALL xios_send_field("tmp_field_0",tmp_field_0) 
    247247    CALL xios_send_field("tmp_field_1",tmp_field_1) 
     
    258258  CALL xios_finalize() 
    259259   
    260   print *, "Client : xios_finalize " 
     260  print *, "Client : xios_finalize ", rank 
    261261 
    262262  !$omp barrier 
Note: See TracChangeset for help on using the changeset viewer.