Changeset 1464


Ignore:
Timestamp:
03/27/18 14:08:10 (2 years ago)
Author:
yushan
Message:

bug fix for server to correctly finalize. LMDZ OK.

Location:
XIOS/dev/branch_openmp
Files:
4 edited

Legend:

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

    r1463 r1464  
    3333bld::target libxios.a  
    3434#bld::target generate_fortran_interface.exe  
    35 #bld::target xios_server.exe  
     35bld::target xios_server.exe  
    3636#bld::target test_regular.exe 
    3737#bld::target test_expand_domain.exe 
  • XIOS/dev/branch_openmp/src/calendar.cpp

    r1460 r1464  
    128128      { 
    129129        #pragma omp critical (_output) 
    130         info(20) << "update step : " << step << " timestep " << this->timestep << std::endl; 
     130        info(80) << "update step : " << step << " timestep " << this->timestep << std::endl; 
    131131        this->step = step; 
    132132        return (this->currentDate = this->getInitDate() + step * this->timestep); 
  • XIOS/dev/branch_openmp/src/registry.cpp

    r1328 r1464  
    259259  void CRegistry::hierarchicalGatherRegistry(void) 
    260260  { 
    261     hierarchicalGatherRegistry(communicator) ; 
     261    //hierarchicalGatherRegistry(communicator) ; 
     262    gatherRegistry(communicator) ; 
    262263  } 
    263264 
  • XIOS/dev/branch_openmp/src/server.cpp

    r1461 r1464  
    439439        //else MPI_Finalize() ; 
    440440      } 
     441 
     442      MPI_Finalize(); 
     443 
    441444      report(0)<<"Performance report : Time spent for XIOS : "<<CTimer::get("XIOS server").getCumulatedTime()<<endl  ; 
    442445      report(0)<<"Performance report : Time spent in processing events : "<<CTimer::get("Process events").getCumulatedTime()<<endl  ; 
Note: See TracChangeset for help on using the changeset viewer.