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

src/solver/solver.hpp

@@ -10 +10 @@
 #ifndef SOLVER_HPP_
 #define SOLVER_HPP_
+
+#include <vector>
 
 #include "base/discretization.hpp"
@@ -33 +35 @@
   Solver()
   {
-    max_size = 0;
-    vec_size = 0;
-    b = NULL;
-    x = NULL;
-    A = NULL;
+    size = 0;
   }
 
   virtual ~Solver()
   {
-    delete [] b;
-    delete [] x;
-    for (int i=0; i<max_size; i++)
-      delete [] A[i];
-    delete [] A;
   }
 
-  void Run(Grid& sol, Grid& rhs)
-  {
-#ifdef DEBUG
-    sol.IsConsistent();
-    rhs.IsConsistent();
-    sol.IsCompatible(rhs);
-#endif
-
-    Grid *rhsGlobal = MG::GetComm()->CommMergeGrids(rhs);
-
-    this->Realloc(*rhsGlobal);
-    this->AssembleMatrix(*rhsGlobal);
-    this->Compute();
-    this->ExportSol(sol, rhs);
-  }
+  void Run(Grid& sol, Grid& rhs);
 
 private:
@@ -71 +50 @@
   virtual void ExportSol(Grid& sol, Grid& rhs) = 0; ///< Exports the solution back to a given mesh.
 
-  vmg_float **A, *b, *x;
-  int max_size, vec_size;
+  std::vector<vmg_float> A, b, x;
+  int size;
 
 protected:
@@ -80 +59 @@
   vmg_float& Mat(int i, int j)
   {
-    return A[i][j];
+    return A[j+size*i];
   }
 
@@ -93 +72 @@
   }
 
-  const int& Size() const {return vec_size;}
-  const int& MemSize()  const {return max_size;}
+  const int& Size() const {return size;}
 };