From daf3fe29847157eb4ed0ffdccc8310eeec65758a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Wed, 6 Jun 2012 16:49:58 +0200 Subject: [PATCH] Apply splint to restore build. Specifically: Change-set f08b1fb48d19 modified the IncompTpfa solver to accept a linear-solver as "reference-to-non-const" in order to facilitate changing its tolerance levels. Permeate that change back through the SimulatorTwophase class. There might be a better way of accomplishing the same task. --- opm/core/simulator/SimulatorTwophase.cpp | 6 +++--- opm/core/simulator/SimulatorTwophase.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opm/core/simulator/SimulatorTwophase.cpp b/opm/core/simulator/SimulatorTwophase.cpp index 1a617a4b..71586468 100644 --- a/opm/core/simulator/SimulatorTwophase.cpp +++ b/opm/core/simulator/SimulatorTwophase.cpp @@ -65,7 +65,7 @@ namespace Opm const Wells* wells, const std::vector& src, const FlowBoundaryConditions* bcs, - const LinearSolverInterface& linsolver, + LinearSolverInterface& linsolver, const double* gravity); void run(SimulatorTimer& timer, @@ -115,7 +115,7 @@ namespace Opm const Wells* wells, const std::vector& src, const FlowBoundaryConditions* bcs, - const LinearSolverInterface& linsolver, + LinearSolverInterface& linsolver, const double* gravity) { pimpl_.reset(new Impl(param, grid, props, rock_comp, wells, src, bcs, linsolver, gravity)); @@ -204,7 +204,7 @@ namespace Opm const Wells* wells, const std::vector& src, const FlowBoundaryConditions* bcs, - const LinearSolverInterface& linsolver, + LinearSolverInterface& linsolver, const double* gravity) : grid_(grid), props_(props), diff --git a/opm/core/simulator/SimulatorTwophase.hpp b/opm/core/simulator/SimulatorTwophase.hpp index 053a3196..7b885a1b 100644 --- a/opm/core/simulator/SimulatorTwophase.hpp +++ b/opm/core/simulator/SimulatorTwophase.hpp @@ -71,7 +71,7 @@ namespace Opm const Wells* wells, const std::vector& src, const FlowBoundaryConditions* bcs, - const LinearSolverInterface& linsolver, + LinearSolverInterface& linsolver, const double* gravity); /// Run the simulation.