From e52cae02ac81168a8da56909c3798db60c61aa4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Tue, 21 Feb 2012 21:36:09 +0100 Subject: [PATCH] Made the solve() methods const. --- opm/core/linalg/LinearSolverInterface.cpp | 2 +- opm/core/linalg/LinearSolverInterface.hpp | 4 ++-- opm/core/linalg/LinearSolverIstl.cpp | 2 +- opm/core/linalg/LinearSolverIstl.hpp | 2 +- opm/core/linalg/LinearSolverUmfpack.cpp | 2 +- opm/core/linalg/LinearSolverUmfpack.hpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/opm/core/linalg/LinearSolverInterface.cpp b/opm/core/linalg/LinearSolverInterface.cpp index 9e2d0bbfd..87d3bafac 100644 --- a/opm/core/linalg/LinearSolverInterface.cpp +++ b/opm/core/linalg/LinearSolverInterface.cpp @@ -35,7 +35,7 @@ namespace Opm LinearSolverInterface::LinearSolverReport LinearSolverInterface::solve(const CSRMatrix* A, const double* rhs, - double* solution) + double* solution) const { return solve(A->m, A->nnz, A->ia, A->ja, A->sa, rhs, solution); } diff --git a/opm/core/linalg/LinearSolverInterface.hpp b/opm/core/linalg/LinearSolverInterface.hpp index 5835f11e3..46e4cc5ff 100644 --- a/opm/core/linalg/LinearSolverInterface.hpp +++ b/opm/core/linalg/LinearSolverInterface.hpp @@ -52,7 +52,7 @@ namespace Opm /// Note: this method is a convenience method that calls the virtual solve() method. LinearSolverReport solve(const CSRMatrix* A, const double* rhs, - double* solution); + double* solution) const; /// Solve a linear system, with a matrix given in compressed sparse row format. /// \param[in] size # of rows in matrix @@ -69,7 +69,7 @@ namespace Opm const int* ja, const double* sa, const double* rhs, - double* solution) = 0; + double* solution) const = 0; }; diff --git a/opm/core/linalg/LinearSolverIstl.cpp b/opm/core/linalg/LinearSolverIstl.cpp index d8ac9c229..969d83c78 100644 --- a/opm/core/linalg/LinearSolverIstl.cpp +++ b/opm/core/linalg/LinearSolverIstl.cpp @@ -109,7 +109,7 @@ namespace Opm const int* ja, const double* sa, const double* rhs, - double* solution) + double* solution) const { // Build Istl structures from input. // System matrix diff --git a/opm/core/linalg/LinearSolverIstl.hpp b/opm/core/linalg/LinearSolverIstl.hpp index 1e883c285..abdb3fe08 100644 --- a/opm/core/linalg/LinearSolverIstl.hpp +++ b/opm/core/linalg/LinearSolverIstl.hpp @@ -70,7 +70,7 @@ namespace Opm const int* ja, const double* sa, const double* rhs, - double* solution); + double* solution) const; private: double linsolver_residual_tolerance_; int linsolver_verbosity_; diff --git a/opm/core/linalg/LinearSolverUmfpack.cpp b/opm/core/linalg/LinearSolverUmfpack.cpp index fd3d63bea..36ac045ca 100644 --- a/opm/core/linalg/LinearSolverUmfpack.cpp +++ b/opm/core/linalg/LinearSolverUmfpack.cpp @@ -45,7 +45,7 @@ namespace Opm const int* ja, const double* sa, const double* rhs, - double* solution) + double* solution) const { CSRMatrix A = { size, diff --git a/opm/core/linalg/LinearSolverUmfpack.hpp b/opm/core/linalg/LinearSolverUmfpack.hpp index 3de9efbc9..89cb295b9 100644 --- a/opm/core/linalg/LinearSolverUmfpack.hpp +++ b/opm/core/linalg/LinearSolverUmfpack.hpp @@ -76,7 +76,7 @@ namespace Opm const int* ja, const double* sa, const double* rhs, - double* solution); + double* solution) const; };