Changeset ac6d04 for src/solver/solver.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/solver/solver.hpp (modified) (4 diffs)

src/solver/solver.hpp

@@ -20 +20 @@
 #include "mg.hpp"
 
-namespace VMGTests
-{
-class SolverTestSuite;
-}
-
 namespace VMG
 {
@@ -31 +26 @@
 {
 public:
-  friend class VMGTests::SolverTestSuite;
-
   Solver()
   {
     size = 0;
+  }
+
+  Solver(int size) :
+    size(size)
+  {
+    this->Realloc(size);
   }
 
@@ -44 +43 @@
   void Run(Grid& sol, Grid& rhs);
 
-private:
-
-  virtual void Compute() = 0; ///< Solves the system of equations
-  virtual void AssembleMatrix(const Grid& rhs) = 0; ///< Assembles all matrices and vectors.
-  virtual void ExportSol(Grid& sol, Grid& rhs) = 0; ///< Exports the solution back to a given mesh.
-
-  std::vector<vmg_float> A, b, x;
-  int size;
-
-protected:
   void Realloc(int n);
   void Realloc(Grid& x);
@@ -73 +62 @@
 
   const int& Size() const {return size;}
+
+protected:
+  virtual void Compute() = 0; ///< Solves the system of equations
+
+private:
+  virtual void AssembleMatrix(const Grid& rhs) = 0; ///< Assembles all matrices and vectors.
+  virtual void ExportSol(Grid& sol, Grid& rhs) = 0; ///< Exports the solution back to a given mesh.
+
+  std::vector<vmg_float> A, b, x;
+  int size;
 };