removing a few blank lines.

and adding a assertion that bhp != 0 when calculating well potentials.
This commit is contained in:
Kai Bao 2017-01-17 15:29:03 +01:00
parent 9e93ebcc64
commit 31e7dec018

View File

@ -1197,7 +1197,6 @@ enum WellVariablePositions {
well_controls_set_current( wc, current);
// Updating well state and primary variables if constraint is broken
// Target values are used as initial conditions for BHP, THP, and SURFACE_RATE
@ -1294,13 +1293,10 @@ enum WellVariablePositions {
OPM_THROW(std::logic_error, "Expected PRODUCER or INJECTOR type of well");
}
break;
}
std::vector<double> g = {1,1,0.01};
if (well_controls_iget_type(wc, current) == RESERVOIR_RATE) {
for (int phase = 0; phase < np; ++phase) {
@ -1598,6 +1594,8 @@ enum WellVariablePositions {
}
}
assert(bhp != 0.0);
// Should we consider crossflow when calculating well potentionals?
const bool allow_cf = allow_cross_flow(w, ebosSimulator);
for (int perf = wells().well_connpos[w]; perf < wells().well_connpos[w+1]; ++perf) {