OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-04 13:36:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #359 from dr-robertk/PR/throw-linearsolverproblem

Browse Source 
std::runtime_error --> LinearSolverProblem.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-04-17 09:07:15 +02:00
commit b088caba03
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/autodiff/CPRPreconditioner.hpp
View File

@ -44,6 +44,7 @@
#include <opm/core/utility/platform_dependent/reenable_warnings.h> #include <opm/core/utility/platform_dependent/reenable_warnings.h>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp>
namespace Opm namespace Opm
{ {
@ -498,7 +499,7 @@ createEllipticPreconditionerPointer(const M& Ae, double relax,
} }
if (!result.converged) { if (!result.converged) {
OPM_THROW(std::runtime_error, "CPRPreconditioner failed to solve elliptic subsystem."); OPM_THROW(LinearSolverProblem, "CPRPreconditioner failed to solve elliptic subsystem.");
} }
} }

7
opm/autodiff/ImpesTPFAAD.cpp
View File

@ -25,6 +25,7 @@
#include <opm/core/simulator/BlackoilState.hpp> #include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/simulator/WellState.hpp> #include <opm/core/simulator/WellState.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp>
#include <opm/core/linalg/LinearSolverInterface.hpp> #include <opm/core/linalg/LinearSolverInterface.hpp>
#include <opm/core/wells.h> #include <opm/core/wells.h>
@ -62,12 +63,12 @@ namespace {
std::vector<int> f2hf(2 * numFaces(grid), -1); std::vector<int> f2hf(2 * numFaces(grid), -1);
Eigen::Array<int, Eigen::Dynamic, 2, Eigen::RowMajor> Eigen::Array<int, Eigen::Dynamic, 2, Eigen::RowMajor>
face_cells = faceCellsToEigen(grid); face_cells = faceCellsToEigen(grid);
typedef typename Opm::UgGridHelpers::Cell2FacesTraits<UnstructuredGrid>::Type typedef typename Opm::UgGridHelpers::Cell2FacesTraits<UnstructuredGrid>::Type
Cell2Faces; Cell2Faces;
Cell2Faces c2f=cell2Faces(grid); Cell2Faces c2f=cell2Faces(grid);
for (int c = 0; c < nc; ++c) { for (int c = 0; c < nc; ++c) {
typename Cell2Faces::row_type typename Cell2Faces::row_type
cell_faces = c2f[c]; cell_faces = c2f[c];
typedef typename Cell2Faces::row_type::iterator Iter; typedef typename Cell2Faces::row_type::iterator Iter;
for (Iter f=cell_faces.begin(), end=cell_faces.end(); for (Iter f=cell_faces.begin(), end=cell_faces.end();
@ -445,7 +446,7 @@ namespace {
matr.outerIndexPtr(), matr.innerIndexPtr(), matr.valuePtr(), matr.outerIndexPtr(), matr.innerIndexPtr(), matr.valuePtr(),
total_residual_.value().data(), dx.data()); total_residual_.value().data(), dx.data());
if (!rep.converged) { if (!rep.converged) {
OPM_THROW(std::runtime_error, "ImpesTPFAAD::solve(): Linear solver convergence failure."); OPM_THROW(LinearSolverProblem, "ImpesTPFAAD::solve(): Linear solver convergence failure.");
} }
const V p0 = Eigen::Map<const V>(&state.pressure()[0], nc, 1); const V p0 = Eigen::Map<const V>(&state.pressure()[0], nc, 1);
const V dp = subset(dx, Span(nc)); const V dp = subset(dx, Span(nc));

3
opm/autodiff/NewtonIterationBlackoilCPR.cpp
View File

@ -26,6 +26,7 @@
#include <opm/autodiff/NewtonIterationBlackoilCPR.hpp> #include <opm/autodiff/NewtonIterationBlackoilCPR.hpp>
#include <opm/autodiff/AutoDiffHelpers.hpp> #include <opm/autodiff/AutoDiffHelpers.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>
#include <opm/core/linalg/LinearSolverFactory.hpp> #include <opm/core/linalg/LinearSolverFactory.hpp>
#include <opm/core/linalg/ParallelIstlInformation.hpp> #include <opm/core/linalg/ParallelIstlInformation.hpp>
@ -208,7 +209,7 @@ namespace Opm
// Check for failure of linear solver. // Check for failure of linear solver.
if (!result.converged) { if (!result.converged) {
OPM_THROW(std::runtime_error, "Convergence failure for linear solver."); OPM_THROW(LinearSolverProblem, "Convergence failure for linear solver.");
} }
// Copy solver output to dx. // Copy solver output to dx.

3
opm/autodiff/NewtonIterationBlackoilSimple.cpp
View File

@ -22,6 +22,7 @@
#include <opm/autodiff/NewtonIterationBlackoilSimple.hpp> #include <opm/autodiff/NewtonIterationBlackoilSimple.hpp>
#include <opm/autodiff/AutoDiffHelpers.hpp> #include <opm/autodiff/AutoDiffHelpers.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp>
#include <opm/core/linalg/LinearSolverFactory.hpp> #include <opm/core/linalg/LinearSolverFactory.hpp>
namespace Opm namespace Opm
@ -67,7 +68,7 @@ namespace Opm
iterations_ = rep.iterations; iterations_ = rep.iterations;
if (!rep.converged) { if (!rep.converged) {
OPM_THROW(std::runtime_error, OPM_THROW(LinearSolverProblem,
"FullyImplicitBlackoilSolver::solveJacobianSystem(): " "FullyImplicitBlackoilSolver::solveJacobianSystem(): "
"Linear solver convergence failure."); "Linear solver convergence failure.");
} }

3
opm/autodiff/TransportSolverTwophaseAd.cpp
View File

@ -25,6 +25,7 @@
#include <opm/core/pressure/tpfa/trans_tpfa.h> #include <opm/core/pressure/tpfa/trans_tpfa.h>
#include <opm/core/utility/parameters/ParameterGroup.hpp> #include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp>
#include <iostream> #include <iostream>
@ -236,7 +237,7 @@ namespace Opm
smatr.outerIndexPtr(), smatr.innerIndexPtr(), smatr.valuePtr(), smatr.outerIndexPtr(), smatr.innerIndexPtr(), smatr.valuePtr(),
transport_residual.value().data(), ds.data()); transport_residual.value().data(), ds.data());
if (!rep.converged) { if (!rep.converged) {
OPM_THROW(std::runtime_error, "Linear solver convergence error in TransportSolverTwophaseAd::solve()"); OPM_THROW(LinearSolverProblem, "Linear solver convergence error in TransportSolverTwophaseAd::solve()");
} }
// Update (possible clamp) sw1. // Update (possible clamp) sw1.