Changeset 1464 for XIOS

Timestamp:

03/27/18 14:08:10 (6 years ago)

Author:

yushan

Message:

bug fix for server to correctly finalize. LMDZ OK.

Location:

XIOS/dev/branch_openmp

Files:

• bld.cfg (modified) (1 diff)
• src/calendar.cpp (modified) (1 diff)
• src/registry.cpp (modified) (1 diff)
• src/server.cpp (modified) (1 diff)

XIOS/dev/branch_openmp/bld.cfg

@@ -33 +33 @@
 bld::target libxios.a 
 #bld::target generate_fortran_interface.exe 
-#bld::target xios_server.exe 
+bld::target xios_server.exe 
 #bld::target test_regular.exe
 #bld::target test_expand_domain.exe

XIOS/dev/branch_openmp/src/calendar.cpp

@@ -128 +128 @@
       {
         #pragma omp critical (_output)
-        info(20) << "update step : " << step << " timestep " << this->timestep << std::endl;
+        info(80) << "update step : " << step << " timestep " << this->timestep << std::endl;
         this->step = step;
         return (this->currentDate = this->getInitDate() + step * this->timestep);

XIOS/dev/branch_openmp/src/registry.cpp

@@ -259 +259 @@
   void CRegistry::hierarchicalGatherRegistry(void)
   {
-    hierarchicalGatherRegistry(communicator) ;
+    //hierarchicalGatherRegistry(communicator) ;
+    gatherRegistry(communicator) ;
   }
 

XIOS/dev/branch_openmp/src/server.cpp

@@ -439 +439 @@
         //else MPI_Finalize() ;
       }
+
+      MPI_Finalize();
+
       report(0)<<"Performance report : Time spent for XIOS : "<<CTimer::get("XIOS server").getCumulatedTime()<<endl  ;
       report(0)<<"Performance report : Time spent in processing events : "<<CTimer::get("Process events").getCumulatedTime()<<endl  ;