Merge branch 'commutingAMG_fix' into 'master'

shared_ptr-ix for commutingAMG See merge request !208
NGSolve · Jul 12, 2017 · e555ad7de36edcdae5bda41afb283e673b851458 · e555ad7
2 parents 7e5a364 + a11c4c1
commit e555ad7de36edcdae5bda41afb283e673b851458
Unified Split

Showing with 5 additions and 5 deletions.

+4 −4 linalg/commutingAMG.cpp

+1 −1 linalg/commutingAMG.hpp
diff --git a/linalg/commutingAMG.cpp b/linalg/commutingAMG.cpp
@@ -26,7 +26,7 @@ namespace ngla
    cout << "ne = " << ne << ", nv = " << nv << endl;

    jacobi = 0;
-    coarsemat = 0;
+    coarsemat = nullptr;
    inv = 0;

    if (nv < 20 || levels == 0)
@@ -225,7 +225,7 @@ namespace ngla
    delete recAMG;

    // delete jacobi;
-    delete coarsemat;
+    // delete coarsemat;
    // delete inv;
  }
  
@@ -262,7 +262,7 @@ namespace ngla

    if (recAMG)
      {
-	coarsemat = mat.Restrict (*prol);
+	coarsemat = shared_ptr<BaseSparseMatrix>(mat.Restrict (*prol));
 	recAMG -> ComputeMatrices (*coarsemat);
 	inv = 0;
      }
@@ -1100,7 +1100,7 @@ namespace ngla
    cout << "compute HCurl matrices" << endl;

    pmat = &mat;
-    coarsemat = mat.Restrict (*prol);
+    coarsemat = shared_ptr<BaseSparseMatrix>(mat.Restrict (*prol));
    jacobi = mat.CreateJacobiPrecond ();

    h1mat = mat.Restrict (*grad);
diff --git a/linalg/commutingAMG.hpp b/linalg/commutingAMG.hpp
@@ -18,7 +18,7 @@ namespace ngla

    SparseMatrixTM<double> * prol;
  
-    BaseSparseMatrix * coarsemat;
+    shared_ptr<BaseSparseMatrix> coarsemat;
    shared_ptr<BaseJacobiPrecond> jacobi;
    shared_ptr<BaseBlockJacobiPrecond> bjacobi;
    shared_ptr<BaseMatrix> inv;