OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

ISTLSolverEbos: rename to ISTLSolver

Browse Source
This commit is contained in:
Arne Morten Kvarving
2024-01-31 14:14:50 +01:00
parent 5bca6c2703
commit b6e47ab1e7
8 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists_files.cmake
View File

@@ -62,7 +62,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/simulators/linalg/FlexibleSolver4.cpp
opm/simulators/linalg/FlexibleSolver5.cpp
opm/simulators/linalg/FlexibleSolver6.cpp
opm/simulators/linalg/ISTLSolverEbos.cpp
opm/simulators/linalg/ISTLSolver.cpp
opm/simulators/linalg/MILU.cpp
opm/simulators/linalg/ParallelIstlInformation.cpp
opm/simulators/linalg/ParallelOverlappingILU0.cpp
@@ -504,7 +504,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/linalg/FlexibleSolver_impl.hpp
opm/simulators/linalg/FlowLinearSolverParameters.hpp
opm/simulators/linalg/GraphColoring.hpp
opm/simulators/linalg/ISTLSolverEbos.hpp
opm/simulators/linalg/ISTLSolver.hpp
opm/simulators/linalg/ISTLSolverBda.hpp
opm/simulators/linalg/MatrixMarketSpecializations.hpp
opm/simulators/linalg/OwningBlockPreconditioner.hpp

4
ebos/ebos.hh
View File

@@ -34,7 +34,7 @@
#include <opm/models/utils/start.hh>
#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
#include <opm/simulators/linalg/ISTLSolver.hpp>
#include <opm/simulators/wells/BlackoilWellModel.hpp>
namespace Opm {
@@ -115,7 +115,7 @@ struct LinearSolverSplice<TypeTag, TTag::EbosTypeTag> {
template<>
struct LinearSolverBackend<TTag::EbosTypeTag, TTag::FlowIstlSolverParams> {
using type = ISTLSolverEbos<TTag::EbosTypeTag>;
using type = ISTLSolver<TTag::EbosTypeTag>;
};
// the default for the allowed volumetric error for oil per second

6
opm/simulators/flow/BlackoilModelNldd.hpp
View File

@@ -40,7 +40,7 @@
#if COMPILE_BDA_BRIDGE
#include <opm/simulators/linalg/ISTLSolverBda.hpp>
#else
#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
#include <opm/simulators/linalg/ISTLSolver.hpp>
#endif
#include <opm/simulators/timestepping/ConvergenceReport.hpp>
@@ -87,7 +87,7 @@ public:
using BVector = typename BlackoilModel<TypeTag>::BVector;
using Domain = SubDomain<Grid>;
using ISTLSolverType = ISTLSolverEbos<TypeTag>;
using ISTLSolverType = ISTLSolver<TypeTag>;
using Mat = typename BlackoilModel<TypeTag>::Mat;
static constexpr int numEq = Indices::numEq;
@@ -154,7 +154,7 @@ public:
// Set up container for the local linear solvers.
for (int index = 0; index < num_domains; ++index) {
// TODO: The ISTLSolverEbos constructor will make
// TODO: The ISTLSolver constructor will make
// parallel structures appropriate for the full grid
// only. This must be addressed before going parallel.
const auto& eclState = model_.ebosSimulator().vanguard().eclState();

4
opm/simulators/linalg/FlowLinearSolverParameters.hpp
View File

@@ -33,7 +33,7 @@ namespace Opm {
template <class TypeTag>
class ISTLSolverBda;
template <class TypeTag>
class ISTLSolverEbos;
class ISTLSolver;
}
@@ -223,7 +223,7 @@ struct LinearSolverBackend<TypeTag, TTag::FlowIstlSolverParams> {
#if COMPILE_BDA_BRIDGE
using type = ISTLSolverBda<TypeTag>;
#else
using type = ISTLSolverEbos<TypeTag>;
using type = ISTLSolver<TypeTag>;
#endif
};
} // namespace Opm::Properties

2
opm/simulators/linalg/ISTLSolverEbos.cpp → opm/simulators/linalg/ISTLSolver.cpp
View File

@@ -21,7 +21,7 @@
#include <config.h>
#include <opm/common/TimingMacros.hpp>
#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
#include <opm/simulators/linalg/ISTLSolver.hpp>
#include <dune/istl/schwarz.hh>

15
opm/simulators/linalg/ISTLSolverEbos.hpp → opm/simulators/linalg/ISTLSolver.hpp
View File

@@ -19,8 +19,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef OPM_ISTLSOLVER_EBOS_HEADER_INCLUDED
#define OPM_ISTLSOLVER_EBOS_HEADER_INCLUDED
#ifndef OPM_ISTLSOLVER_HEADER_INCLUDED
#define OPM_ISTLSOLVER_HEADER_INCLUDED
#include <dune/istl/owneroverlapcopy.hh>
#include <dune/istl/solver.hh>
@@ -140,7 +140,7 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
/// as a block-structured matrix (one block for all cell variables) for a fixed
/// number of cell variables np .
template <class TypeTag>
class ISTLSolverEbos
class ISTLSolver
{
protected:
using GridView = GetPropType<TypeTag, Properties::GridView>;
@@ -181,7 +181,9 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
/// \param[in] forceSerial If true, will set up a serial linear solver only,
/// local to the current rank, instead of creating a
/// parallel (MPI distributed) linear solver.
ISTLSolverEbos(const Simulator& simulator, const FlowLinearSolverParameters& parameters, bool forceSerial = false)
ISTLSolver(const Simulator& simulator,
const FlowLinearSolverParameters& parameters,
bool forceSerial = false)
: simulator_(simulator),
iterations_( 0 ),
converged_(false),
@@ -194,7 +196,7 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
/// Construct a system solver.
/// \param[in] simulator The opm-models simulator object
explicit ISTLSolverEbos(const Simulator& simulator)
explicit ISTLSolver(const Simulator& simulator)
: simulator_(simulator),
iterations_( 0 ),
solveCount_(0),
@@ -627,4 +629,5 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
}; // end ISTLSolver
} // namespace Opm
#endif
#endif // OPM_ISTLSOLVER_HEADER_INCLUDED

6
opm/simulators/linalg/ISTLSolverBda.hpp
View File

@@ -22,7 +22,7 @@
#ifndef OPM_ISTLSOLVER_WITH_BDA_HEADER_INCLUDED
#define OPM_ISTLSOLVER_WITH_BDA_HEADER_INCLUDED
#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
#include <opm/simulators/linalg/ISTLSolver.hpp>
#include <cstddef>
#include <memory>
@@ -98,10 +98,10 @@ private:
/// as a block-structured matrix (one block for all cell variables) for a fixed
/// number of cell variables np .
template <class TypeTag>
class ISTLSolverBda : public ISTLSolverEbos<TypeTag>
class ISTLSolverBda : public ISTLSolver<TypeTag>
{
protected:
using ParentType = ISTLSolverEbos<TypeTag>;
using ParentType = ISTLSolver<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;

2
tests/test_RestartSerialization.cpp
View File

@@ -66,7 +66,7 @@ namespace Opm::Properties {
template<>
struct LinearSolverBackend<TTag::TestRestartTypeTag, TTag::FlowIstlSolverParams> {
using type = ISTLSolverEbos<TTag::TestRestartTypeTag>;
using type = ISTLSolver<TTag::TestRestartTypeTag>;
};
}