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

fix the CPR warning

Browse Source 
this was probably a rebase mistake. thanks to [at]blattms for noticing
this.
This commit is contained in:
Andreas Lauser
2018-07-03 14:00:26 +02:00
parent d94be85a9d
commit 076312b28a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opm/autodiff/FlowMainEbos.hpp
View File

@@ -548,12 +548,16 @@ namespace Opm
typedef typename BlackoilModelEbos<TypeTag>::ISTLSolverType ISTLSolverType; typedef typename BlackoilModelEbos<TypeTag>::ISTLSolverType ISTLSolverType;
extractParallelGridInformationToISTL(grid(), parallel_information_); extractParallelGridInformationToISTL(grid(), parallel_information_);
linearSolver_.reset(new ISTLSolverType(parallel_information_)); auto *tmp = new ISTLSolverType(parallel_information_);
linearSolver_.reset(tmp);
// Deactivate selection of CPR via eclipse keyword // Deactivate selection of CPR via eclipse keyword
// as this preconditioner is still considered experimental // as this preconditioner is still considered experimental
// and fails miserably for some models. // and fails miserably for some models.
if (output_cout_) { if (output_cout_
&& eclState().getSimulationConfig().useCPR()
&& !tmp->parameters().use_cpr_)
{
std::ostringstream message; std::ostringstream message;
message << "Ignoring request for CPRPreconditioner " message << "Ignoring request for CPRPreconditioner "
<< "via Eclipse keyword as it is considered " << "via Eclipse keyword as it is considered "
@@ -562,6 +566,7 @@ namespace Opm
<<"line parameter."; <<"line parameter.";
OpmLog::info(message.str()); OpmLog::info(message.str());
} }
} }
/// This is the main function of Flow. /// This is the main function of Flow.

3
opm/autodiff/ISTLSolverEbos.hpp
View File

@@ -386,6 +386,9 @@ namespace Detail
parameters_.template init<TypeTag>(); parameters_.template init<TypeTag>();
} }
const NewtonIterationBlackoilInterleavedParameters& parameters() const
{ return parameters_; }
// dummy method that is not implemented for this class // dummy method that is not implemented for this class
SolutionVector computeNewtonIncrement(const LinearisedBlackoilResidual&) const SolutionVector computeNewtonIncrement(const LinearisedBlackoilResidual&) const
{ {