OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-22 15:33:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed: always calculate initial FIP

Browse Source 
this can be used by various Schedule keywords even if FIP is not in RPTSOL
This commit is contained in:
Arne Morten Kvarving 2024-12-05 11:57:50 +01:00
parent 5d4f578319
commit d8a7875f9b
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
opm/simulators/flow/EclWriter.hpp
View File

@ -350,12 +350,6 @@ public:
//! \brief Writes the initial FIP report as configured in RPTSOL.
void writeInitialFIPReport()
{
const auto& fip = simulator_.vanguard().eclState().getEclipseConfig().fip();
if (!fip.output(FIPConfig::OutputField::FIELD) &&
!fip.output(FIPConfig::OutputField::RESV)) {
return;
}
const auto& gridView = simulator_.vanguard().gridView();
const int num_interior = detail::
countLocalInteriorCellsGridView(gridView);
@ -373,17 +367,20 @@ public:
this->outputModule_->updateFluidInPlace(dofIdx, intQuants, totVolume);
}
std::map<std::string, double> miscSummaryData;
std::map<std::string, std::vector<double>> regionData;
Inplace inplace;
// We always calculate the initial fip values as it may be used by various
// keywords in the Schedule, e.g. FIP=2 in RPTSCHED but no FIP in RPTSOL
const Inplace inplace = outputModule_->calc_initial_inplace(simulator_.gridView().comm());
// check if RPTSOL entry has FIP output
const auto& fip = simulator_.vanguard().eclState().getEclipseConfig().fip();
if (fip.output(FIPConfig::OutputField::FIELD) ||
fip.output(FIPConfig::OutputField::RESV))
{
OPM_TIMEBLOCK(outputFipLogAndFipresvLog);
boost::posix_time::ptime start_time = boost::posix_time::from_time_t(simulator_.vanguard().schedule().getStartTime());
boost::posix_time::ptime start_time =
boost::posix_time::from_time_t(simulator_.vanguard().schedule().getStartTime());
inplace = outputModule_->calc_inplace(miscSummaryData, regionData, simulator_.gridView().comm());
if (this->collectOnIORank_.isIORank()){
if (this->collectOnIORank_.isIORank()) {
inplace_ = inplace;
outputModule_->outputFipAndResvLog(inplace_, 0, 0.0, start_time,

8
opm/simulators/flow/GenericOutputBlackoilModule.cpp
View File

@ -325,6 +325,14 @@ outputInjLog(std::size_t reportStepNum)
this->logOutput_.injection(reportStepNum);
}
template<class FluidSystem>
Inplace GenericOutputBlackoilModule<FluidSystem>::
calc_initial_inplace(const Parallel::Communication& comm)
{
// calling accumulateRegionSums() updates InitialInplace_ as a side effect
return this->accumulateRegionSums(comm);
}
template<class FluidSystem>
Inplace GenericOutputBlackoilModule<FluidSystem>::
calc_inplace(std::map<std::string, double>& miscSummaryData,

3
opm/simulators/flow/GenericOutputBlackoilModule.hpp
View File

@ -95,6 +95,9 @@ public:
// write injection report to output
void outputInjLog(std::size_t reportStepNum);
// calculate Initial Fluid In Place
Inplace calc_initial_inplace(const Parallel::Communication& comm);
// calculate Fluid In Place
Inplace calc_inplace(std::map<std::string, double>& miscSummaryData,
std::map<std::string, std::vector<double>>& regionData,