Changeset dfed1c for src/solver/solver.cpp

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.cpp (modified) (1 diff)

src/solver/solver.cpp

@@ -16 +16 @@
 using namespace VMG;
 
+void Solver::Run(Grid& sol, Grid& rhs)
+{
+#ifdef DEBUG_MATRIX_CHECKS
+  sol.IsConsistent();
+  rhs.IsConsistent();
+#endif
+
+#ifdef DEBUG
+  sol.IsCompatible(rhs);
+#endif
+
+  Comm* comm = MG::GetComm();
+
+  Grid& rhsGlobal = comm->GetGlobalCoarseGrid(*rhs.Father());
+
+  this->Realloc(rhsGlobal);
+  this->AssembleMatrix(rhsGlobal);
+  this->Compute();
+  this->ExportSol(sol, rhs);
+}
+
 void Solver::Realloc(int n)
 {
   //Reallocate memory if necessary
-  this->vec_size = n;
+  this->size = n;
 
-  if (n > this->max_size) {
+  if (static_cast<int>(A.size()) < n*n)
+    A.resize(n*n);
 
-    delete [] b;
-    delete [] x;
-    for (int i=0; i<this->max_size; i++)
-      delete [] A[i];
-    delete [] A;
+  if (static_cast<int>(b.size()) < n)
+    b.resize(n);
 
-    b = new vmg_float[n];
-    x = new vmg_float[n];
-    A = new vmg_float*[n];
-    for (int i=0; i<n; i++)
-      A[i] = new vmg_float[n];
-
-    this->max_size = n;
-
-  }
+  if (static_cast<int>(x.size()) < n)
+    x.resize(n);
 }
 
 void Solver::Realloc(Grid& sol)
 {
-  this->Realloc(sol.Global().Size().Product());
+  this->Realloc(sol.Global().SizeGlobal().Product());
 }