Merge pull request #1890 from akva2/janitoring

remove unused variables
This commit is contained in:
Atgeirr Flø Rasmussen
2019-06-21 08:33:03 +02:00
committed by GitHub
4 changed files with 2 additions and 9 deletions

View File

@@ -606,10 +606,8 @@ namespace Opm
// change temperature for injecting fluids
if (well_type_ == INJECTOR && cq_s[activeCompIdx] > 0.0){
auto injectorType = this->well_ecl_.injectorType();
// only handles single phase injection now
assert(injectorType != WellInjector::MULTI);
assert(this->well_ecl_.injectorType() != WellInjector::MULTI);
fs.setTemperature(this->well_ecl_.temperature());
typedef typename std::decay<decltype(fs)>::type::Scalar FsScalar;
typename FluidSystem::template ParameterCache<FsScalar> paramCache;
@@ -2005,7 +2003,6 @@ namespace Opm
}
const unsigned canonicalCompIdx = FluidSystem::solventComponentIndex(phaseIdx);
const std::string& compName = FluidSystem::componentName(canonicalCompIdx);
const int compIdx = Indices::canonicalToActiveComponentIndex(canonicalCompIdx);
if (std::isnan(well_flux_residual[compIdx])) {