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
commit a598734e71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 9 deletions

View File

@ -294,9 +294,8 @@ public:
}
if (collectToIORank_.isParallel()) {
unsigned long buffer_size = buffer.size();
#ifdef HAVE_MPI
unsigned long buffer_size = buffer.size();
MPI_Bcast(&buffer_size, 1, MPI_UNSIGNED_LONG, collectToIORank_.ioRank, MPI_COMM_WORLD);
if (!collectToIORank_.isIORank())
buffer.resize( buffer_size );

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])) {

View File

@ -60,7 +60,6 @@ public:
cartesianToCompressed[ *cell ] = cell - begin;
}
int last_time_step = schedule.getTimeMap().size() - 1;
const auto& schedule_wells = schedule.getWells2atEnd();
wells_.reserve(schedule_wells.size());

View File

@ -83,8 +83,6 @@ SET_BOOL_PROP(TestEclOutputTypeTag, EnableAsyncEclOutput, false);
END_PROPERTIES
static const int day = 24 * 60 * 60;
template <class TypeTag>
std::unique_ptr<typename GET_PROP_TYPE(TypeTag, Simulator)>
initSimulator(const char *filename)