Changeset ac6d04 for src/comm/comm_serial.hpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1666 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/comm/comm_serial.hpp (modified) (3 diffs)

src/comm/comm_serial.hpp

@@ -35 +35 @@
   Grid& GetCoarserGrid(Multigrid& multigrid);
   Grid& GetFinerGrid(Multigrid& multigrid);
-  Grid& GetGlobalCoarseGrid(Multigrid& multigrid);
 
   void CommFromGhosts(Grid& grid);
   void CommToGhosts(Grid& grid);
-  void CommToGhostsRB(Grid& grid, const int& offset);
-  void CommSubgrid(Grid& grid_old, Grid& grid_new);
-  void CommAddSubgrid(Grid& grid_old, Grid& grid_new);
+  void CommSubgrid(Grid& grid_old, Grid& grid_new, const int& direction);
+  void CommAddSubgrid(Grid& grid_old, Grid& grid_new, const int& direction);
 
   void CommToGhostsAsyncStart(Grid& grid);
-  void CommToGhostsAsyncFinish();
+  void CommToGhostsAsyncFinish(Grid& grid);
   void CommFromGhostsAsyncStart(Grid& grid);
   void CommFromGhostsAsyncFinish(Grid& grid);
 
   void CommParticles(const Grid& grid, std::list<Particle::Particle>& particles);
-  void CommLCListGhosts(const Grid& grid, Particle::LinkedCellList& lc);
-  void CommAddPotential(std::list<Particle::Particle>& particles);
-  void CommAddPotential(Particle::LinkedCellList& lc);
-
-  vmg_float GlobalSum(const vmg_float& value) {return value;}
-  vmg_float GlobalSumRoot(const vmg_float& value)  {return value;}
-  void GlobalSumArray(vmg_float* array, const vmg_int& size) {}
+  void CommParticlesBack(std::list<Particle::Particle>& particles);
+  void CommLCListToGhosts(const Grid& grid, Particle::LinkedCellList& lc);
+  void CommLCListFromGhosts(const Grid& grid, Particle::LinkedCellList& lc);
 
   void PrintString(const char* format, ...);
@@ -62 +56 @@
   void PrintXMLAll(const std::string& filename, const std::string& xml_data);
   void PrintAllSettings();
+  void PrintGrid(Grid& grid, const char* information);
   void PrintDefect(Grid& sol, Grid& rhs, const char* information);
-  void PrintGrid(Grid& grid, const char* information);
-  void PrintCorrectedGrid(Grid& grid, const char* information);
-  void PrintInnerGrid(Grid& grid, const char* information);
-  void PrintInnerCorrectedGrid(Grid& grid, const char* information);
 
-  void DebugPrintError(const Grid& sol, const char* information);
-  void DebugPrintErrorNorm(Grid& sol);
   void DebugPrintGridStructure(Multigrid& multigrid);
 
@@ -77 +66 @@
   void InitCommSerial();
 
-  void OpenFileAndPrintHeader(std::ofstream& out, const Grid& mesh, const char* information, bool inner);
+  void OpenFileAndPrintHeader(std::ofstream& out, const Grid& mesh, const char* information);
   void PrintGridStructureLevel(Grid& grid, std::ofstream& out);
   std::string CreateOutputDirectory();