Unverified Commit ce47d15e authored by trilinos-autotester's avatar trilinos-autotester Committed by GitHub
Browse files

Merge Pull Request #5100 from trilinos/Trilinos/csiefer-48785b1d

Automatically Merged using Trilinos Pull Request AutoTester
PR Title: MueLu: More RAPShift fixes
PR Author: csiefer2
parents d62a9ded 45c80d89
...@@ -181,7 +181,7 @@ namespace MueLu { ...@@ -181,7 +181,7 @@ namespace MueLu {
} }
Teuchos::ArrayView<const double> doubleShifts; Teuchos::ArrayView<const double> doubleShifts;
Teuchos::Array<double> myshifts; Teuchos::ArrayRCP<double> myshifts;
if(pL.isParameter("rap: shift array") && pL.get<Teuchos::Array<double> >("rap: shift array").size() > 0 ) { if(pL.isParameter("rap: shift array") && pL.get<Teuchos::Array<double> >("rap: shift array").size() > 0 ) {
// Do we have an array of shifts? If so, we set doubleShifts_ // Do we have an array of shifts? If so, we set doubleShifts_
doubleShifts = pL.get<Teuchos::Array<double> >("rap: shift array")(); doubleShifts = pL.get<Teuchos::Array<double> >("rap: shift array")();
...@@ -225,7 +225,7 @@ namespace MueLu { ...@@ -225,7 +225,7 @@ namespace MueLu {
Set(coarseLevel,"cfl-based shift array",myshifts); Set(coarseLevel,"cfl-based shift array",myshifts);
} }
else { else {
Teuchos::Array<double> myshifs = Get<Teuchos::Array<double> > (fineLevel,"cfl-based shift array"); myshifts = Get<Teuchos::ArrayRCP<double> > (fineLevel,"cfl-based shift array");
doubleShifts = myshifts(); doubleShifts = myshifts();
Set(coarseLevel,"cfl-based shift array",myshifts); Set(coarseLevel,"cfl-based shift array",myshifts);
// NOTE: If we're not on level zero, then we should have a shift array // NOTE: If we're not on level zero, then we should have a shift array
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment