diff --git a/opm/simulators/linalg/ISTLSolverEbosFlexible.hpp b/opm/simulators/linalg/ISTLSolverEbosFlexible.hpp index 26ab2b563..3fb61e2f2 100644 --- a/opm/simulators/linalg/ISTLSolverEbosFlexible.hpp +++ b/opm/simulators/linalg/ISTLSolverEbosFlexible.hpp @@ -192,7 +192,7 @@ public: } rhs_ = b; } else { - solver_->preconditioner().update(weights, prm_.get_child("preconditioner")); + solver_->preconditioner().update(weights); rhs_ = b; } } diff --git a/opm/simulators/linalg/OwningBlockPreconditioner.hpp b/opm/simulators/linalg/OwningBlockPreconditioner.hpp index 23f3b9bf7..7cc1a6593 100644 --- a/opm/simulators/linalg/OwningBlockPreconditioner.hpp +++ b/opm/simulators/linalg/OwningBlockPreconditioner.hpp @@ -63,9 +63,9 @@ public: } // The update() function does nothing for a wrapped preconditioner. - virtual void update(const X& w,const boost::property_tree::ptree& pt) override + virtual void update(const X& w) override { - orig_precond_.update(w, pt); + orig_precond_.update(w); } private: diff --git a/opm/simulators/linalg/OwningTwoLevelPreconditioner.hpp b/opm/simulators/linalg/OwningTwoLevelPreconditioner.hpp index 91cb74498..c998143bc 100644 --- a/opm/simulators/linalg/OwningTwoLevelPreconditioner.hpp +++ b/opm/simulators/linalg/OwningTwoLevelPreconditioner.hpp @@ -161,15 +161,9 @@ public: twolevel_method_.post(x); } - virtual void update(const VectorType& weights, const boost::property_tree::ptree& /*prm*/) override + virtual void update(const VectorType& weights) override { - // if(prm.get("weight_type") == "quasiimpes"){ - // Opm::Amg::getQuasiImpesWeights( - // linear_operator_.getmat(), prm_.get("pressure_var_index"), transpose, weights_); - // weights_ = prm.get("weights"); - // }else{ - weights_ = weights; - //} + weights_ = weights; updateImpl(comm_); } diff --git a/opm/simulators/linalg/ParallelOverlappingILU0.hpp b/opm/simulators/linalg/ParallelOverlappingILU0.hpp index 67e4feb0f..5a3563f29 100644 --- a/opm/simulators/linalg/ParallelOverlappingILU0.hpp +++ b/opm/simulators/linalg/ParallelOverlappingILU0.hpp @@ -921,7 +921,7 @@ public: DUNE_UNUSED_PARAMETER(x); } - virtual void update(const Range& = Range(), const boost::property_tree::ptree& = boost::property_tree::ptree()) override + virtual void update(const Range& = Range()) override { // (For older DUNE versions the communicator might be // invalid if redistribution in AMG happened on the coarset level. diff --git a/opm/simulators/linalg/PreconditionerWithUpdate.hpp b/opm/simulators/linalg/PreconditionerWithUpdate.hpp index 1bbf469b9..01975277e 100644 --- a/opm/simulators/linalg/PreconditionerWithUpdate.hpp +++ b/opm/simulators/linalg/PreconditionerWithUpdate.hpp @@ -31,7 +31,7 @@ template class PreconditionerWithUpdate : public Preconditioner { public: - virtual void update(const X& w, const boost::property_tree::ptree& pt) = 0; + virtual void update(const X& w) = 0; }; template @@ -69,7 +69,7 @@ public: } // The update() function does nothing for a wrapped preconditioner. - virtual void update(const X& /*w*/, const boost::property_tree::ptree& /*pt*/) override + virtual void update(const X& /*w*/) override { } diff --git a/opm/simulators/linalg/PressureSolverPolicy.hpp b/opm/simulators/linalg/PressureSolverPolicy.hpp index dab6ff669..1073193e5 100644 --- a/opm/simulators/linalg/PressureSolverPolicy.hpp +++ b/opm/simulators/linalg/PressureSolverPolicy.hpp @@ -84,9 +84,8 @@ namespace Amg void updatePreconditioner() { - pt::ptree prm; X w; - linsolver_->preconditioner().update(w, prm); + linsolver_->preconditioner().update(w); } private: diff --git a/opm/simulators/linalg/amgcpr.hh b/opm/simulators/linalg/amgcpr.hh index bd054fcec..16b2ca0ea 100644 --- a/opm/simulators/linalg/amgcpr.hh +++ b/opm/simulators/linalg/amgcpr.hh @@ -239,7 +239,7 @@ namespace Dune /** * @brief Update the coarse solver and the hierarchies. */ - virtual void update(const X& w, const boost::property_tree::ptree& prm); + virtual void update(const X& w); virtual void update(); /** @@ -470,7 +470,7 @@ namespace Dune } template - void AMGCPR::update(const X& /*w*/, const boost::property_tree::ptree& /*prm*/) + void AMGCPR::update(const X& /*w*/) { update(); }