Changeset 1556


Ignore:
Timestamp:
07/04/18 13:38:47 (2 years ago)
Author:
yushan
Message:

bug fixed in intercomm_create

Location:
XIOS/dev/branch_openmp
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_openmp/bld.cfg

    r1555 r1556  
    4646#bld::target test_unstruct_omp.exe 
    4747#bld::target test_netcdf_omp.exe 
    48 bld::target test_client.exe  
     48#bld::target test_client.exe  
    4949#bld::target test_complete.exe 
    5050#bld::target test_remap.exe 
  • XIOS/dev/branch_openmp/extern/src_ep_dev/ep_intercomm.cpp

    r1541 r1556  
    262262 
    263263 
    264     int ownership = priority; 
     264    int ownership = 1; 
    265265 
    266266    if(rank_in_world == ranks_in_world_local[local_leader]) ownership = 1; 
  • XIOS/dev/branch_openmp/src/client.cpp

    r1545 r1556  
    7474 
    7575          MPI_Allgather(&hashClient,1,MPI_LONG,hashAll,1,MPI_LONG,CXios::globalComm) ; 
    76  
     76           
    7777          map<unsigned long, int> colors ; 
    7878          map<unsigned long, int> leaders ; 
     
    101101          myColor=colors[hashClient]; 
    102102          MPI_Comm_split(CXios::globalComm,myColor,rank_,&intraComm) ; 
    103  
     103           
    104104          if (CXios::usingServer) 
    105105          { 
  • XIOS/dev/branch_openmp/src/cxios.cpp

    r1545 r1556  
    125125  { 
    126126    isClient = true; 
     127    isServer = false; 
    127128 
    128129    initialize() ; 
  • XIOS/dev/branch_openmp/src/node/file.cpp

    r1545 r1556  
    721721 
    722722     // Now everything is ok, close it 
    723      //close(); 
     723     close(); 
    724724   } 
    725725 
  • XIOS/dev/branch_openmp/src/xios_server.f90

    r1545 r1556  
    33  IMPLICIT NONE 
    44  INCLUDE "mpif.h" 
    5   INTEGER :: ierr 
    6    
     5  INTEGER :: ierr, provided 
     6    
     7    CALL MPI_Init_thread(3, provided, ierr) 
    78    CALL xios_init_server 
    8      
     9    CALL MPI_Finalize(ierr) 
     10  
    911 
    1012  END PROGRAM server_main 
Note: See TracChangeset for help on using the changeset viewer.