Changeset 1069


Ignore:
Timestamp:
03/09/17 18:13:51 (4 years ago)
Author:
yushan
Message:

Clean Up

Location:
XIOS/dev/branch_yushan
Files:
3 added
10 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan/extern/src_ep_dev/ep_create.cpp

    r1060 r1069  
    103103    } 
    104104 
    105     printf("ep_lib::MPI_Comm_create_endpoints()       OK from int\n"); 
     105    // printf("ep_lib::MPI_Comm_create_endpoints()       OK from int\n"); 
    106106 
    107107    return 0; 
     
    273273    } 
    274274 
    275     printf("ep_lib::MPI_Comm_create_endpoints()       OK from MPI_Comm\n"); 
     275    // printf("ep_lib::MPI_Comm_create_endpoints()       OK from MPI_Comm\n"); 
    276276 
    277277    return 0; 
  • XIOS/dev/branch_yushan/extern/src_ep_dev/ep_fortran.cpp

    r1068 r1069  
    2525    { 
    2626      fc_comm_map.insert(std::make_pair( std::make_pair( fint, omp_get_thread_num()) , comm)); 
    27       printf("EP_Comm_c2f : MAP insert: %d, %d, %p\n", fint, omp_get_thread_num(), &comm); 
     27      // printf("EP_Comm_c2f : MAP insert: %d, %d, %p\n", fint, omp_get_thread_num(), &comm); 
    2828    } 
    2929     
     
    4545      MPI_Comm comm_ptr; 
    4646      comm_ptr = it->second; 
    47       printf("EP_Comm_f2c : MAP find: %d, %d, %p\n", it->first.first, it->first.second, it->second); 
     47      // printf("EP_Comm_f2c : MAP find: %d, %d, %p\n", it->first.first, it->first.second, it->second); 
    4848      return  comm_ptr; 
    4949    } 
  • XIOS/dev/branch_yushan/src/cxios.cpp

    r1068 r1069  
    8787    globalComm = passage[omp_get_thread_num()]; 
    8888     
    89     int tmp_size; 
    90     MPI_Comm_size(globalComm, &tmp_size); 
    91     if(isClient) printf("Client : globalcomm size = %d\n", tmp_size); 
    92     if(isServer) printf("Server : globalcomm size = %d\n", tmp_size); 
     89    // int tmp_size; 
     90    // MPI_Comm_size(globalComm, &tmp_size); 
     91    // if(isClient) printf("Client : globalcomm size = %d\n", tmp_size); 
     92    // if(isServer) printf("Server : globalcomm size = %d\n", tmp_size); 
    9393 
    9494     
     
    199199    CServer::eventLoop(); 
    200200     
    201     printf("server start finalize \n"); 
    202  
    203201    // Finalize 
    204202     if (CServer::getRank()==0) 
     
    209207     } 
    210208      
    211      printf("server globalRegistry OK\n"); 
    212209      
    213210    CServer::finalize(); 
    214      
    215     printf("server finalize OK\n"); 
    216      
     211         
    217212    CServer::closeInfoStream(); 
    218213  } 
  • XIOS/dev/branch_yushan/src/interface/c/icdata.cpp

    r1068 r1069  
    132132     CTimer::get("XIOS context finalize").resume(); 
    133133      
    134       
    135       
    136134     CContext* context = CContext::getCurrent(); 
    137135     context->finalize(); 
    138       
    139      printf("client context_finalize OK\n"); 
    140       
     136           
    141137     CTimer::get("XIOS context finalize").suspend(); 
    142138     CTimer::get("XIOS").suspend(); 
  • XIOS/dev/branch_yushan/src/interface/fortran/idata.F90

    r1053 r1069  
    473473 
    474474      CALL cxios_init_client(client_id,LEN(client_id),f_local_comm,f_return_comm) 
    475        
    476        
    477       !print*, "in fortran, world_f = ", MPI_COMM_WORLD  
    478  
    479       print*, "in fortran, f_return_comm = ", f_return_comm  
    480475 
    481476      IF (PRESENT(return_comm)) return_comm=f_return_comm 
  • XIOS/dev/branch_yushan/src/io/onetcdf4.cpp

    r1068 r1069  
    6565            { 
    6666               CNetCdfInterface::create(filename, mode, this->ncidp); 
    67                printf("creating file with create\n");   
     67               // printf("creating file with create\n");   
    6868            }   
    6969                
     
    8484            { 
    8585               CNetCdfInterface::open(filename, mode, this->ncidp); 
    86                printf("opening file with open\n"); 
     86               // printf("opening file with open\n"); 
    8787            } 
    8888 
  • XIOS/dev/branch_yushan/src/server.cpp

    r1067 r1069  
    101101             MPI_Intercomm_create(intraComm,0,CXios::globalComm,clientLeader,0,&newComm) ; 
    102102             interComm.push_back(newComm) ; 
    103              printf("after inter create, interComm.size = %lu\n", interComm.size()); 
    104103           } 
    105104         } 
  • XIOS/dev/branch_yushan/src/test/test_client.f90

    r1067 r1069  
    4242  CALL xios_initialize(id,return_comm=comm) 
    4343   
    44   print*, "test_client xios_initialize OK" 
    45  
    4644  CALL MPI_COMM_RANK(comm,rank,ierr) 
    47   print*, "test_client MPI_COMM_RANK OK", rank 
    4845  CALL MPI_COMM_SIZE(comm,size,ierr) 
    49   print*, "test_client MPI_COMM_SIZE OK", size 
    5046   
    5147 
     
    7975 
    8076  CALL xios_get_handle("test",ctx_hdl) 
    81   print*, "Client xios_get_handle OK" 
    8277  CALL xios_set_current_context(ctx_hdl) 
    83   print*, "Client xios_set_current_handle OK"   
    84    
    85    
    8678   
    8779   
    8880  CALL xios_get_calendar_type(calendar_type) 
    89   PRINT *, "calendar_type = ", calendar_type 
    9081 
    9182  CALL xios_set_axis_attr("axis_A",n_glo=llm ,value=lval) ; 
     
    10596  dtime%second = 3600 
    10697  CALL xios_set_timestep(dtime) 
    107   print*, "Client xios_set_timestep OK"   
    10898 
    10999  ! The calendar is created as soon as the calendar type is defined. This way 
     
    144134 
    145135  call MPI_Barrier(comm, ierr) 
    146   PRINT*,"MPI_Barrier OK " 
    147136 
    148137  !DO ts=1,24*10 
    149138  DO ts=1,6 
    150139    CALL xios_update_calendar(ts) 
    151     print*, "xios_update_calendar OK, ts = ", ts 
    152140    CALL xios_send_field("field_A",field_A) 
    153     print*, "xios_send_field OK, ts = ", ts 
    154141    CALL wait_us(5000) 
    155142  ENDDO 
     
    157144 
    158145  CALL xios_context_finalize() 
    159   print*, "xios_context_finalize OK"   
    160146 
    161147  DEALLOCATE(lon, lat, field_A, lonvalue) 
     
    164150 
    165151  CALL xios_finalize() 
     152  print *, "Client : xios_finalize " 
    166153 
    167154   else 
    168155 
    169156   CALL xios_init_server 
     157   print *, "Server : xios_finalize " 
    170158   
    171159   endif 
  • XIOS/dev/branch_yushan/src/test/test_complete.f90

    r1067 r1069  
    3434  CALL MPI_INIT(ierr) 
    3535 
     36  CALL MPI_COMM_RANK(MPI_COMM_WORLD,rank,ierr)   
     37 
     38   
     39 
    3640  CALL init_wait 
     41 
     42  if (rank <2) then 
    3743 
    3844!!! XIOS Initialization (get the local communicator) 
     
    8086 
    8187  CALL xios_context_initialize("atmosphere",comm) 
    82   print*, "init context atmosphere comm = ", comm 
     88!   print*, "init context atmosphere comm = ", comm 
    8389 
    8490  CALL xios_get_handle("atmosphere",ctx_hdl) 
     
    137143  CALL xios_close_context_definition() 
    138144 
    139   print *, "xios_close_context_definition(atmosphere)" 
     145!   print *, "xios_close_context_definition(atmosphere)" 
    140146 
    141147!!! Test des valeurs des champs/fichiers 
     
    174180 
    175181  CALL xios_context_initialize("surface",comm) 
    176   print*, "init context surface comm = ", comm 
     182!   print*, "init context surface comm = ", comm 
    177183 
    178184  CALL xios_get_handle("surface",ctx_hdl) 
     
    221227  CALL xios_close_context_definition() 
    222228 
    223  print *, "xios_close_context_definition(surface)"  
     229! print *, "xios_close_context_definition(surface)"  
    224230 
    225231 
     
    260266    ENDDO 
    261267 
    262     print *, "end temporal loop" 
     268!     print *, "end temporal loop" 
    263269 
    264270!#################################################################################### 
     
    276282    CALL xios_context_finalize() 
    277283 
    278     print *, "xios_context_finalize(surface)"  
     284!     print *, "xios_context_finalize(surface)"  
    279285 
    280286     CALL xios_get_handle("atmosphere",ctx_hdl) 
     
    284290     CALL xios_context_finalize() 
    285291 
    286     print *, "xios_context_finalize(atmosphere)" 
     292!     print *, "xios_context_finalize(atmosphere)" 
    287293 
    288294    DEALLOCATE(lon, lat, field_A_atm, lonvalue) 
     
    295301    CALL xios_finalize() 
    296302 
    297     print *, "xios_finalize" 
     303     print *, "Client : xios_finalize " 
     304 
     305  else  
     306    CALL xios_init_server 
     307 
     308    print *, "Server : xios_finalize " 
     309  endif 
    298310 
    299311    CALL MPI_FINALIZE(ierr) 
  • XIOS/dev/branch_yushan/src/transformation/axis_algorithm_inverse.cpp

    r1053 r1069  
    211211 
    212212  status.resize(requests.size()); 
    213   //printf("(%d) src/transformation/axis_algorithm_inverse 1st waitall\n", clientRank); 
    214213  MPI_Waitall(requests.size(), &requests[0], &status[0]); 
    215   //printf("(%d) src/transformation/axis_algorithm_inverse 1st waitall OK\n", clientRank); 
    216214 
    217215  std::vector<ep_lib::MPI_Request>().swap(requests); 
     
    246244  } 
    247245  status.resize(requests.size()); 
    248   //printf("(%d) src/transformation/axis_algorithm_inverse 2nd waitall\n", clientRank); 
    249  
    250246  MPI_Waitall(requests.size(), &requests[0], &status[0]); 
    251   //printf("(%d) src/transformation/axis_algorithm_inverse 2nd waitall OK\n", clientRank); 
     247 
    252248 
    253249  size_t nGloAxisDest = axisDest_->n_glo.getValue() - 1; 
Note: See TracChangeset for help on using the changeset viewer.