This re-adds the bhp reports to the summary output.
It was lost in the shuffling bewteen branches when working on the new parser.
This commit is contained in:
parent
62a0cf16c5
commit
27a396b439
@ -1168,9 +1168,26 @@ struct EclipseWellBhp : public EclipseWellReport {
|
|||||||
"Pascal")
|
"Pascal")
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
|
EclipseWellBhp (const EclipseSummary& summary,
|
||||||
|
Opm::DeckConstPtr newParserDeck,
|
||||||
|
int whichWell,
|
||||||
|
PhaseUsage uses,
|
||||||
|
BlackoilPhases::PhaseIndex phase,
|
||||||
|
WellType type)
|
||||||
|
: EclipseWellReport (summary,
|
||||||
|
newParserDeck,
|
||||||
|
whichWell,
|
||||||
|
uses,
|
||||||
|
phase,
|
||||||
|
type,
|
||||||
|
'B',
|
||||||
|
"Pascal")
|
||||||
|
{ }
|
||||||
|
|
||||||
virtual double update (const SimulatorTimer& /*timer*/,
|
virtual double update (const SimulatorTimer& /*timer*/,
|
||||||
const WellState& wellState)
|
const WellState& wellState)
|
||||||
{
|
{
|
||||||
|
std::cout << "bhp(wellState) = " << bhp(wellState) << std::endl;
|
||||||
return bhp(wellState);
|
return bhp(wellState);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -1296,6 +1313,27 @@ EclipseSummary::addWells (Opm::DeckConstPtr newParserDeck,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add BHP monitors
|
||||||
|
for (int whichWell = 0; whichWell != numWells; ++whichWell) {
|
||||||
|
// In the call below: uses, phase and the well type arguments
|
||||||
|
// are not used, except to set up an index that stores the
|
||||||
|
// well indirectly. For details see the implementation of the
|
||||||
|
// EclipseWellReport constructor, and the method
|
||||||
|
// EclipseWellReport::bhp().
|
||||||
|
BlackoilPhases::PhaseIndex phase = BlackoilPhases::Liquid;
|
||||||
|
if (!uses.phase_used[BlackoilPhases::Liquid]) {
|
||||||
|
phase = BlackoilPhases::Vapour;
|
||||||
|
}
|
||||||
|
add (std::unique_ptr <EclipseWellReport> (
|
||||||
|
new EclipseWellBhp (*this,
|
||||||
|
newParserDeck,
|
||||||
|
whichWell,
|
||||||
|
uses,
|
||||||
|
phase,
|
||||||
|
WELL_TYPES[0])));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Opm {
|
namespace Opm {
|
||||||
|
Loading…
Reference in New Issue
Block a user