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

Merged.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-06-12 11:17:02 +02:00
commit cc1038bcdc
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
opm/core/linalg/LinearSolverFactory.cpp
View File

@ -55,20 +55,29 @@ namespace Opm
LinearSolverFactory::LinearSolverFactory(const parameter::ParameterGroup& param)
{
const std::string ls = param.getDefault<std::string>("linsolver", "umfpack");
const std::string ls =
param.getDefault<std::string>("linsolver", "umfpack");
if (ls == "umfpack") {
#if HAVE_SUITESPARSE_UMFPACK_H
solver_.reset(new LinearSolverUmfpack);
#else
THROW("Linear solver " << ls <<" is not available.");
#endif
} else if (ls == "istl") {
}
else if (ls == "istl") {
#if HAVE_DUNE_ISTL
solver_.reset(new LinearSolverIstl(param));
#else
THROW("Linear solver " << ls <<" is not available.");
#endif
}
else {
THROW("Linear solver " << ls << " is unknown.");
}
if (! solver_) {
THROW("Linear solver " << ls << " is not enabled in "
"this configuration.");
}
}

1
opm/core/wells/WellsGroup.cpp
View File

@ -941,7 +941,6 @@ namespace Opm
double WellNode::productionGuideRate(bool only_group)
{
if (!only_group || prodSpec().control_mode_ == ProductionSpecification::GRUP) {
std::cout << prodSpec().guide_rate_ << std::endl;
return prodSpec().guide_rate_;
}
return 0.0;