Changeset dfed1c for src/comm/comm_serial.hpp

Timestamp:

Nov 22, 2011, 9:22:10 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

facba0

Parents:

66f24d

Message:

Major vmg update.

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

File:

• src/comm/comm_serial.hpp (modified) (1 diff)

src/comm/comm_serial.hpp

@@ -15 +15 @@
 
 #include "comm/comm.hpp"
+#include "comm/domain_decomposition_serial.hpp"
 
 namespace VMG
 {
 
-class MeshBase;
-class Stencil;
+class DomainDecomposition;
+class Grid;
+class Multigrid;
 
 class CommSerial : public Comm
 {
 public:
-  CommSerial(BC boundary) : Comm(boundary) {Init();}
+  CommSerial(const Boundary& boundary) :
+    Comm(boundary, new DomainDecompositionSerial())
+  {
+    InitCommSerial();
+  }
 
+  Grid& GetCoarserGrid(Multigrid& multigrid);
   Grid& GetFinerGrid(Multigrid& multigrid);
-  Grid& GetCoarserGrid(Multigrid& multigrid);
+  Grid& GetGlobalCoarseGrid(Multigrid& multigrid);
 
-  void CommFromGhosts(Grid& mesh);
-  void CommToGhosts(Grid& mesh);
-  Grid* CommMergeGrids(Grid& oldgrid) {return &oldgrid;}
+  void CommFromGhosts(Grid& grid);
+  void CommToGhosts(Grid& grid);
+  void CommSubgrid(Grid& grid_old, Grid& grid_new);
+  void CommAddSubgrid(Grid& grid_old, Grid& grid_new);
 
-  vmg_float ComputeResidualNorm(Multigrid& sol, Multigrid& rhs);
+  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 AllReduce(const vmg_float& value) {return value;}
+  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 PrintDefect(const Grid& sol, const Grid& rhs, const char* information);
-  void PrintGrid(const Grid& mesh, const char* information);
-  void PrintCorrectedGrid(const Grid& mesh, const char* information);
-
-  void PrintInnerGrid(const Grid& mesh, const char* information);
-  void PrintInnerCorrectedGrid(const Grid& mesh, const char* information);
+  void PrintString(const char* format, ...);
+  void PrintStringOnce(const char* format, ...);
+  void PrintXML(const std::string& filename, const std::string& xml_data);
+  void PrintXMLAll(const std::string& filename, const std::string& xml_data);
+  void PrintAllSettings();
+  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 DebugPrintGridStructure(Multigrid& grid);
+  void DebugPrintErrorNorm(Grid& sol);
+  void DebugPrintGridStructure(Multigrid& multigrid);
 
 private:
-  void Init();
+  void InitCommSerial();
 
-  void CreateOutputDirectory();
   void OpenFileAndPrintHeader(std::ofstream& out, const Grid& mesh, const char* information, bool inner);
   void PrintGridStructureLevel(Grid& grid, std::ofstream& out);
+  std::string CreateOutputDirectory();
 
-  int output_count, error_norm_count, residual_count;
-  std::string defects_path_str;
+  int error_norm_count, residual_count;
 
   std::map< const Grid*, Grid*> finer, coarser;
+
 };