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

Merge pull request #4716 from akva2/janitoring

Browse Source 
Some janitoring
This commit is contained in:
Bård Skaflestad 2023-06-21 09:46:57 +02:00 committed by GitHub
commit 6464f5ee4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/linalg/cuistl/PreconditionerAdapter.hpp
View File

@ -97,7 +97,7 @@ public:
//! Category of the preconditioner (see SolverCategory::Category) //! Category of the preconditioner (see SolverCategory::Category)
virtual Dune::SolverCategory::Category category() const Dune::SolverCategory::Category category() const override
{ {
return m_underlyingPreconditioner->category(); return m_underlyingPreconditioner->category();
} }

4
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -1042,7 +1042,7 @@ namespace Opm {
template<typename TypeTag> template<typename TypeTag>
void void
BlackoilWellModel<TypeTag>:: BlackoilWellModel<TypeTag>::
assembleDomain(const int iterationIdx, assembleDomain(const int /*iterationIdx*/,
const double dt, const double dt,
const Domain& domain) const Domain& domain)
{ {
@ -1621,7 +1621,7 @@ namespace Opm {
this->wellState(), this->wellState(),
B_avg, B_avg,
local_deferredLogger, local_deferredLogger,
iterationIdx > param_.strict_outer_iter_wells_); relax_tolerance);
} else { } else {
ConvergenceReport report; ConvergenceReport report;
using CR = ConvergenceReport; using CR = ConvergenceReport;

2
opm/simulators/wells/MultisegmentWellAssemble.cpp
View File

@ -121,7 +121,7 @@ assembleControlEq(const WellState& well_state,
} else if (well_.isInjector() ) { } else if (well_.isInjector() ) {
// Find scaling factor to get injection rate, // Find scaling factor to get injection rate,
const InjectorType injectorType = inj_controls.injector_type; const InjectorType injectorType = inj_controls.injector_type;
double scaling = 1.0; double scaling;
const auto& pu = well_.phaseUsage(); const auto& pu = well_.phaseUsage();
switch (injectorType) { switch (injectorType) {
case InjectorType::WATER: case InjectorType::WATER:

14
tests/test_preconditionerfactory.cpp
View File

@ -110,7 +110,7 @@ testPrec(const Opm::PropertyTree& prm, const std::string& matrix_filename, const
void test1(const Opm::PropertyTree& prm) void test1(const Opm::PropertyTree& prm)
{ {
const int bz = 1; constexpr int bz = 1;
auto sol = testPrec<bz>(prm, "matr33.txt", "rhs3.txt"); auto sol = testPrec<bz>(prm, "matr33.txt", "rhs3.txt");
Dune::BlockVector<Dune::FieldVector<double, bz>> expected {-1.62493, Dune::BlockVector<Dune::FieldVector<double, bz>> expected {-1.62493,
-1.76435e-06, -1.76435e-06,
@ -131,7 +131,7 @@ void test1(const Opm::PropertyTree& prm)
void test3(const Opm::PropertyTree& prm) void test3(const Opm::PropertyTree& prm)
{ {
const int bz = 3; constexpr int bz = 3;
auto sol = testPrec<bz>(prm, "matr33.txt", "rhs3.txt"); auto sol = testPrec<bz>(prm, "matr33.txt", "rhs3.txt");
Dune::BlockVector<Dune::FieldVector<double, bz>> expected {{-1.62493, -1.76435e-06, 1.86991e-10}, Dune::BlockVector<Dune::FieldVector<double, bz>> expected {{-1.62493, -1.76435e-06, 1.86991e-10},
{-458.542, 2.28308e-06, -2.45341e-07}, {-458.542, 2.28308e-06, -2.45341e-07},
@ -176,13 +176,13 @@ BOOST_AUTO_TEST_CASE(TestAddingPreconditioner)
// Test with 1x1 block solvers. // Test with 1x1 block solvers.
{ {
const int bz = 1; constexpr int bz = 1;
BOOST_CHECK_THROW(testPrec<bz>(prm, "matr33.txt", "rhs3.txt"), std::invalid_argument); BOOST_CHECK_THROW(testPrec<bz>(prm, "matr33.txt", "rhs3.txt"), std::invalid_argument);
} }
// Test with 3x3 block solvers. // Test with 3x3 block solvers.
{ {
const int bz = 3; constexpr int bz = 3;
BOOST_CHECK_THROW(testPrec<bz>(prm, "matr33.txt", "rhs3.txt"), std::invalid_argument); BOOST_CHECK_THROW(testPrec<bz>(prm, "matr33.txt", "rhs3.txt"), std::invalid_argument);
} }
@ -199,7 +199,7 @@ BOOST_AUTO_TEST_CASE(TestAddingPreconditioner)
// Test with 3x3 block solvers. // Test with 3x3 block solvers.
{ {
const int bz = 3; constexpr int bz = 3;
BOOST_CHECK_THROW(testPrec<bz>(prm, "matr33.txt", "rhs3.txt"), std::invalid_argument); BOOST_CHECK_THROW(testPrec<bz>(prm, "matr33.txt", "rhs3.txt"), std::invalid_argument);
} }
@ -316,7 +316,7 @@ testPrecRepeating(const Opm::PropertyTree& prm, const std::string& matrix_filena
void test1rep(const Opm::PropertyTree& prm) void test1rep(const Opm::PropertyTree& prm)
{ {
const int bz = 1; constexpr int bz = 1;
auto sol = testPrecRepeating<bz>(prm, "matr33rep.txt", "rhs3rep.txt"); auto sol = testPrecRepeating<bz>(prm, "matr33rep.txt", "rhs3rep.txt");
Dune::BlockVector<Dune::FieldVector<double, bz>> expected {0.285714285714286, Dune::BlockVector<Dune::FieldVector<double, bz>> expected {0.285714285714286,
0.285714285714286, 0.285714285714286,
@ -337,7 +337,7 @@ void test1rep(const Opm::PropertyTree& prm)
void test3rep(const Opm::PropertyTree& prm) void test3rep(const Opm::PropertyTree& prm)
{ {
const int bz = 3; constexpr int bz = 3;
auto sol = testPrecRepeating<bz>(prm, "matr33rep.txt", "rhs3rep.txt"); auto sol = testPrecRepeating<bz>(prm, "matr33rep.txt", "rhs3rep.txt");
Dune::BlockVector<Dune::FieldVector<double, bz>> expected { Dune::BlockVector<Dune::FieldVector<double, bz>> expected {
{0.285714285714286, 0.285714285714286, 0.285714285714286}, {0.285714285714286, 0.285714285714286, 0.285714285714286},