Remove unnecessary argument, and minor formatting corrections.

This commit is contained in:
Atgeirr Flø Rasmussen
2014-04-05 00:12:03 +02:00
parent 303bbac943
commit e699f9e135

View File

@@ -787,16 +787,17 @@ namespace {
// check for dead wells
V isNotDeadWells = V::Constant(nw,1.0);
for (int c = 0; c < nw; ++c){
if (wbqt.value()[c] == 0)
isNotDeadWells[c] = 0;
for (int w = 0; w < nw; ++w) {
if (wbqt.value()[w] == 0) {
isNotDeadWells[w] = 0;
}
}
// compute wellbore mixture at std conds
Selector<double> notDeadWells_selector(wbqt.value(),Selector<double>::Zero);
Selector<double> notDeadWells_selector(wbqt.value(), Selector<double>::Zero);
std::vector<ADB> mix_s(np, ADB::null());
for (int phase = 0; phase < np; ++phase) {
const int pos = pu.phase_pos[phase];
mix_s[phase] = notDeadWells_selector.select(ADB::constant(compi.col(pos), state.bhp.blockPattern()),wbq[phase]/wbqt);
mix_s[phase] = notDeadWells_selector.select(ADB::constant(compi.col(pos)), wbq[phase]/wbqt);
}
@@ -834,7 +835,7 @@ namespace {
const int oilpos = pu.phase_pos[Oil];
tmp = tmp - subset(state.rs,well_cells) * cmix_s[oilpos] / d;
}
volRat += tmp / subset(rq_[phase].b,well_cells);
volRat += tmp / subset(rq_[phase].b,well_cells);
}