OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-25 16:51:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
8f4cf8a952
opm-simulators/opm/simulators/linalg/OwningTwoLevelPreconditioner.hpp

227 lines
9.3 KiB
C++
Raw Normal View History

Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
/*
Copyright 2019 SINTEF Digital, Mathematics and Cybernetics.
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef OPM_OWNINGTWOLEVELPRECONDITIONER_HEADER_INCLUDED
#define OPM_OWNINGTWOLEVELPRECONDITIONER_HEADER_INCLUDED
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
#include <opm/simulators/linalg/PreconditionerWithUpdate.hpp>
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
#include <opm/simulators/linalg/PressureSolverPolicy.hpp>
#include <opm/simulators/linalg/PressureTransferPolicy.hpp>
#include <opm/simulators/linalg/getQuasiImpesWeights.hpp>
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
#include <opm/simulators/linalg/twolevelmethodcpr.hh>
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
Improves exceptions and message and resort to OPM_THROW for flexible solvers.
2020-03-25 15:09:32 -05:00
#include <opm/common/ErrorMacros.hpp>
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
#include <dune/common/fmatrix.hh>
#include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/paamg/amg.hh>
#include <fstream>
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
#include <type_traits>
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
Move PreconditionerFactory into namespace Opm. This fixes name clashes with DUNE's own factory that is introduced in DUNE 2.7. Hence it closes issue #2266. BTW: Dune's factory has more template parameters than ours.
2020-01-07 10:53:54 -06:00
namespace Opm
{
Add and use PreconditionerFactory class. This replaces the makePreconditoner() function. The main advantage is that it is extensible, making it easy to for example add new preconditioners to the factory at runtime. It supports both parallel and serial preconditioners.
2019-05-29 09:21:34 -05:00
// Circular dependency between PreconditionerFactory [which can make an OwningTwoLevelPreconditioner]
// and OwningTwoLevelPreconditioner [which uses PreconditionerFactory to choose the fine-level smoother]
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
// must be broken, accomplished by forward-declaration here.
Add and use PreconditionerFactory class. This replaces the makePreconditoner() function. The main advantage is that it is extensible, making it easy to for example add new preconditioners to the factory at runtime. It supports both parallel and serial preconditioners.
2019-05-29 09:21:34 -05:00
template <class Operator, class Comm = Dune::Amg::SequentialInformation>
class PreconditionerFactory;
Move PreconditionerFactory into namespace Opm. This fixes name clashes with DUNE's own factory that is introduced in DUNE 2.7. Hence it closes issue #2266. BTW: Dune's factory has more template parameters than ours.
2020-01-07 10:53:54 -06:00
}
namespace Dune
{
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
// Must forward-declare FlexibleSolver as we want to use it as solver for the pressure system.
Adding functions for pressure system manipulation to well models. Also add well-aware operator and transfer policy. This will be used for CPR with custom operators.
2021-01-04 08:18:23 -06:00
template <class Operator>
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
class FlexibleSolver;
changes to make true impes work with flexible solver Cherry-picked commit 7da5ce4fec33. Which got cleaned up (deleted trailing whitespace, tabs) and made compilable with recent changes.
2019-08-21 03:50:57 -05:00
template <typename T, typename A, int i>
std::ostream& operator<<(std::ostream& out,
const BlockVector< FieldVector< T, i >, A >& vector)
{
Dune::writeMatrixMarket(vector, out);
return out;
}
template <typename T, typename A, int i>
std::istream& operator>>(std::istream& input,
BlockVector< FieldVector< T, i >, A >& vector)
{
Dune::readMatrixMarket(vector, input);
return input;
}
Add and use PreconditionerFactory class. This replaces the makePreconditoner() function. The main advantage is that it is extensible, making it easy to for example add new preconditioners to the factory at runtime. It supports both parallel and serial preconditioners.
2019-05-29 09:21:34 -05:00
/// A version of the two-level preconditioner that is:
/// - Self-contained, because it owns its policy components.
/// - Flexible, because it uses the runtime-flexible solver
/// and preconditioner factory.
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
template <class OperatorType,
class VectorType,
bool transpose = false,
class Communication = Dune::Amg::SequentialInformation>
class OwningTwoLevelPreconditioner : public Dune::PreconditionerWithUpdate<VectorType, VectorType>
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
{
public:
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
using MatrixType = typename OperatorType::matrix_type;
Move PreconditionerFactory into namespace Opm. This fixes name clashes with DUNE's own factory that is introduced in DUNE 2.7. Hence it closes issue #2266. BTW: Dune's factory has more template parameters than ours.
2020-01-07 10:53:54 -06:00
using PrecFactory = Opm::PreconditionerFactory<OperatorType, Communication>;
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
added: PropertyTree class this is a thin wrapper around boost::property_tree with this we avoid parsing property tree headers in all simulator objects
2021-06-09 03:35:22 -05:00
OwningTwoLevelPreconditioner(const OperatorType& linearoperator, const Opm::PropertyTree& prm,
Determine index of pressure from model used. Previously, the user had to specify it in the json file read from the FlexibleSolver or 1 was used. Unfortunately, the index depends on the model used and it seem rather opaque to a user what that index is. With this commit we determine the pressure index from the model.
2021-06-08 14:51:34 -05:00
const std::function<VectorType()> weightsCalculator,
std::size_t pressureIndex)
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
: linear_operator_(linearoperator)
Add sensible defaults for flexible solver properties... to prevent throwing. The get methods will throw if called without a default value. This quite unfortunate and not very user friendly, as there are many properties and the throwing will happen during the linear solve and result in time step chopping. This commit should prevent such throws and allow users to provide jsdon files omitting some options.
2020-03-25 15:05:01 -05:00
, finesmoother_(PrecFactory::create(linearoperator,
added: PropertyTree class this is a thin wrapper around boost::property_tree with this we avoid parsing property tree headers in all simulator objects
2021-06-09 03:35:22 -05:00
prm.get_child_optional("finesmoother") ?
Determine index of pressure from model used. Previously, the user had to specify it in the json file read from the FlexibleSolver or 1 was used. Unfortunately, the index depends on the model used and it seem rather opaque to a user what that index is. With this commit we determine the pressure index from the model.
2021-06-08 14:51:34 -05:00
prm.get_child("finesmoother") : Opm::PropertyTree(),
std::function<VectorType()>(), pressureIndex))
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
, comm_(nullptr)
Make update method of preconditioners parameter-less again. Previously, it got passed the weights only needed for CPR. Additionally those were passed with the parameter tree to the update method and constructor. Now the CPR constructor gets a function to use for recalculating the weights and the property is not changed. Unfortunately this means that the preconditioner creators of the factory get another parameter.
2020-03-24 08:19:57 -05:00
, weightsCalculator_(weightsCalculator)
, weights_(weightsCalculator())
Determine index of pressure from model used. Previously, the user had to specify it in the json file read from the FlexibleSolver or 1 was used. Unfortunately, the index depends on the model used and it seem rather opaque to a user what that index is. With this commit we determine the pressure index from the model.
2021-06-08 14:51:34 -05:00
, levelTransferPolicy_(dummy_comm_, weights_, pressureIndex)
added: PropertyTree class this is a thin wrapper around boost::property_tree with this we avoid parsing property tree headers in all simulator objects
2021-06-09 03:35:22 -05:00
, coarseSolverPolicy_(prm.get_child_optional("coarsesolver")? prm.get_child("coarsesolver") : Opm::PropertyTree())
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
, twolevel_method_(linearoperator,
finesmoother_,
levelTransferPolicy_,
coarseSolverPolicy_,
Add sensible defaults for flexible solver properties... to prevent throwing. The get methods will throw if called without a default value. This quite unfortunate and not very user friendly, as there are many properties and the throwing will happen during the linear solve and result in time step chopping. This commit should prevent such throws and allow users to provide jsdon files omitting some options.
2020-03-25 15:05:01 -05:00
prm.get<int>("pre_smooth", transpose? 1 : 0),
prm.get<int>("post_smooth", transpose? 0 : 1))
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
, prm_(prm)
{
Add sensible defaults for flexible solver properties... to prevent throwing. The get methods will throw if called without a default value. This quite unfortunate and not very user friendly, as there are many properties and the throwing will happen during the linear solve and result in time step chopping. This commit should prevent such throws and allow users to provide jsdon files omitting some options.
2020-03-25 15:05:01 -05:00
if (prm.get<int>("verbosity", 0) > 10) {
Improves exceptions and message and resort to OPM_THROW for flexible solvers.
2020-03-25 15:09:32 -05:00
std::string filename = prm.get<std::string>("weights_filename", "impes_weights.txt");
std::ofstream outfile(filename);
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
if (!outfile) {
Improves exceptions and message and resort to OPM_THROW for flexible solvers.
2020-03-25 15:09:32 -05:00
OPM_THROW(std::ofstream::failure, "Could not write weights to file " << filename << ".");
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
}
Dune::writeMatrixMarket(weights_, outfile);
}
}
added: PropertyTree class this is a thin wrapper around boost::property_tree with this we avoid parsing property tree headers in all simulator objects
2021-06-09 03:35:22 -05:00
OwningTwoLevelPreconditioner(const OperatorType& linearoperator, const Opm::PropertyTree& prm,
Determine index of pressure from model used. Previously, the user had to specify it in the json file read from the FlexibleSolver or 1 was used. Unfortunately, the index depends on the model used and it seem rather opaque to a user what that index is. With this commit we determine the pressure index from the model.
2021-06-08 14:51:34 -05:00
const std::function<VectorType()> weightsCalculator,
std::size_t pressureIndex, const Communication& comm)
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
: linear_operator_(linearoperator)
Add sensible defaults for flexible solver properties... to prevent throwing. The get methods will throw if called without a default value. This quite unfortunate and not very user friendly, as there are many properties and the throwing will happen during the linear solve and result in time step chopping. This commit should prevent such throws and allow users to provide jsdon files omitting some options.
2020-03-25 15:05:01 -05:00
, finesmoother_(PrecFactory::create(linearoperator,
added: PropertyTree class this is a thin wrapper around boost::property_tree with this we avoid parsing property tree headers in all simulator objects
2021-06-09 03:35:22 -05:00
prm.get_child_optional("finesmoother") ?
Determine index of pressure from model used. Previously, the user had to specify it in the json file read from the FlexibleSolver or 1 was used. Unfortunately, the index depends on the model used and it seem rather opaque to a user what that index is. With this commit we determine the pressure index from the model.
2021-06-08 14:51:34 -05:00
prm.get_child("finesmoother"): Opm::PropertyTree(),
std::function<VectorType()>(),
comm, pressureIndex))
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
, comm_(&comm)
Make update method of preconditioners parameter-less again. Previously, it got passed the weights only needed for CPR. Additionally those were passed with the parameter tree to the update method and constructor. Now the CPR constructor gets a function to use for recalculating the weights and the property is not changed. Unfortunately this means that the preconditioner creators of the factory get another parameter.
2020-03-24 08:19:57 -05:00
, weightsCalculator_(weightsCalculator)
, weights_(weightsCalculator())
Determine index of pressure from model used. Previously, the user had to specify it in the json file read from the FlexibleSolver or 1 was used. Unfortunately, the index depends on the model used and it seem rather opaque to a user what that index is. With this commit we determine the pressure index from the model.
2021-06-08 14:51:34 -05:00
, levelTransferPolicy_(*comm_, weights_, pressureIndex)
added: PropertyTree class this is a thin wrapper around boost::property_tree with this we avoid parsing property tree headers in all simulator objects
2021-06-09 03:35:22 -05:00
, coarseSolverPolicy_(prm.get_child_optional("coarsesolver")? prm.get_child("coarsesolver") : Opm::PropertyTree())
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
, twolevel_method_(linearoperator,
finesmoother_,
levelTransferPolicy_,
coarseSolverPolicy_,
Add sensible defaults for flexible solver properties... to prevent throwing. The get methods will throw if called without a default value. This quite unfortunate and not very user friendly, as there are many properties and the throwing will happen during the linear solve and result in time step chopping. This commit should prevent such throws and allow users to provide jsdon files omitting some options.
2020-03-25 15:05:01 -05:00
prm.get<int>("pre_smooth", transpose? 1 : 0),
prm.get<int>("post_smooth", transpose? 0 : 1))
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
, prm_(prm)
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
{
Improves exceptions and message and resort to OPM_THROW for flexible solvers.
2020-03-25 15:09:32 -05:00
if (prm.get<int>("verbosity", 0) > 10 && comm.communicator().rank() == 0) {
auto filename = prm.get<std::string>("weights_filename", "impes_weights.txt");
std::ofstream outfile(filename);
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
if (!outfile) {
Improves exceptions and message and resort to OPM_THROW for flexible solvers.
2020-03-25 15:09:32 -05:00
OPM_THROW(std::ofstream::failure, "Could not write weights to file " << filename << ".");
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
}
Dune::writeMatrixMarket(weights_, outfile);
}
}
virtual void pre(VectorType& x, VectorType& b) override
{
twolevel_method_.pre(x, b);
}
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
virtual void apply(VectorType& v, const VectorType& d) override
{
twolevel_method_.apply(v, d);
}
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
virtual void post(VectorType& x) override
{
twolevel_method_.post(x);
}
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
Make update method of preconditioners parameter-less again. Previously, it got passed the weights only needed for CPR. Additionally those were passed with the parameter tree to the update method and constructor. Now the CPR constructor gets a function to use for recalculating the weights and the property is not changed. Unfortunately this means that the preconditioner creators of the factory get another parameter.
2020-03-24 08:19:57 -05:00
virtual void update() override
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
{
Make update method of preconditioners parameter-less again. Previously, it got passed the weights only needed for CPR. Additionally those were passed with the parameter tree to the update method and constructor. Now the CPR constructor gets a function to use for recalculating the weights and the property is not changed. Unfortunately this means that the preconditioner creators of the factory get another parameter.
2020-03-24 08:19:57 -05:00
weights_ = weightsCalculator_();
Use overloading instead of template specialization. This seems to be necessary for older compilers.
2019-06-06 03:36:17 -05:00
updateImpl(comm_);
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
}
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
virtual Dune::SolverCategory::Category category() const override
{
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
return linear_operator_.category();
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
}
private:
using PressureMatrixType = Dune::BCRSMatrix<Dune::FieldMatrix<double, 1, 1>>;
using PressureVectorType = Dune::BlockVector<Dune::FieldVector<double, 1>>;
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
using SeqCoarseOperatorType = Dune::MatrixAdapter<PressureMatrixType, PressureVectorType, PressureVectorType>;
using ParCoarseOperatorType
= Dune::OverlappingSchwarzOperator<PressureMatrixType, PressureVectorType, PressureVectorType, Communication>;
using CoarseOperatorType = std::conditional_t<std::is_same<Communication, Dune::Amg::SequentialInformation>::value,
SeqCoarseOperatorType,
ParCoarseOperatorType>;
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
using LevelTransferPolicy = Opm::PressureTransferPolicy<OperatorType, CoarseOperatorType, Communication, transpose>;
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
using CoarseSolverPolicy = Dune::Amg::PressureSolverPolicy<CoarseOperatorType,
Adding functions for pressure system manipulation to well models. Also add well-aware operator and transfer policy. This will be used for CPR with custom operators.
2021-01-04 08:18:23 -06:00
FlexibleSolver<CoarseOperatorType>,
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
LevelTransferPolicy>;
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
using TwoLevelMethod
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
= Dune::Amg::TwoLevelMethodCpr<OperatorType, CoarseSolverPolicy, Dune::Preconditioner<VectorType, VectorType>>;
Add and use PreconditionerFactory class. This replaces the makePreconditoner() function. The main advantage is that it is extensible, making it easy to for example add new preconditioners to the factory at runtime. It supports both parallel and serial preconditioners.
2019-05-29 09:21:34 -05:00
// Handling parallel vs serial instantiation of preconditioner factory.
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
template <class Comm>
Use overloading instead of template specialization. This seems to be necessary for older compilers.
2019-06-06 03:36:17 -05:00
void updateImpl(const Comm*)
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
{
// Parallel case.
Add sensible defaults for flexible solver properties... to prevent throwing. The get methods will throw if called without a default value. This quite unfortunate and not very user friendly, as there are many properties and the throwing will happen during the linear solve and result in time step chopping. This commit should prevent such throws and allow users to provide jsdon files omitting some options.
2020-03-25 15:05:01 -05:00
auto child = prm_.get_child_optional("finesmoother");
added: PropertyTree class this is a thin wrapper around boost::property_tree with this we avoid parsing property tree headers in all simulator objects
2021-06-09 03:35:22 -05:00
finesmoother_ = PrecFactory::create(linear_operator_, child ? *child : Opm::PropertyTree(), *comm_);
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
twolevel_method_.updatePreconditioner(finesmoother_, coarseSolverPolicy_);
}
Use overloading instead of template specialization. This seems to be necessary for older compilers.
2019-06-06 03:36:17 -05:00
void updateImpl(const Dune::Amg::SequentialInformation*)
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
{
// Serial case.
Add sensible defaults for flexible solver properties... to prevent throwing. The get methods will throw if called without a default value. This quite unfortunate and not very user friendly, as there are many properties and the throwing will happen during the linear solve and result in time step chopping. This commit should prevent such throws and allow users to provide jsdon files omitting some options.
2020-03-25 15:05:01 -05:00
auto child = prm_.get_child_optional("finesmoother");
added: PropertyTree class this is a thin wrapper around boost::property_tree with this we avoid parsing property tree headers in all simulator objects
2021-06-09 03:35:22 -05:00
finesmoother_ = PrecFactory::create(linear_operator_, child ? *child : Opm::PropertyTree());
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
twolevel_method_.updatePreconditioner(finesmoother_, coarseSolverPolicy_);
}
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
Improved parameter hierarchy and const-correctness.
2019-05-28 09:22:54 -05:00
const OperatorType& linear_operator_;
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
std::shared_ptr<Dune::Preconditioner<VectorType, VectorType>> finesmoother_;
Make FlexibleSolver feature-complete. In particular: - Add parallel solvers and preconditioners. - Add the update() interface to preconditioners, and use it with CPR.
2019-05-20 07:31:36 -05:00
const Communication* comm_;
Make update method of preconditioners parameter-less again. Previously, it got passed the weights only needed for CPR. Additionally those were passed with the parameter tree to the update method and constructor. Now the CPR constructor gets a function to use for recalculating the weights and the property is not changed. Unfortunately this means that the preconditioner creators of the factory get another parameter.
2020-03-24 08:19:57 -05:00
std::function<VectorType()> weightsCalculator_;
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
VectorType weights_;
LevelTransferPolicy levelTransferPolicy_;
CoarseSolverPolicy coarseSolverPolicy_;
TwoLevelMethod twolevel_method_;
added: PropertyTree class this is a thin wrapper around boost::property_tree with this we avoid parsing property tree headers in all simulator objects
2021-06-09 03:35:22 -05:00
Opm::PropertyTree prm_;
Use a dummy Communication object for the serial case.
2019-08-07 07:17:17 -05:00
Communication dummy_comm_;
Add flexible solver and preconditioner infrastructure. Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter, --linear-solver-configuration-json-file, to read linear solver config from JSON-format file at runtime.
2019-05-20 06:23:57 -05:00
};
} // namespace Dune
#endif // OPM_OWNINGTWOLEVELPRECONDITIONER_HEADER_INCLUDED
Reference in New Issue Copy Permalink