Merge pull request #2940 from joakim-hove/pavg-calculators

WIP: Pavg calculators
This commit is contained in:
Joakim Hove 2020-11-30 13:17:23 +01:00 committed by GitHub
commit 1fbc25979f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -47,6 +47,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp>
#include <opm/simulators/utils/ParallelRestart.hpp> #include <opm/simulators/utils/ParallelRestart.hpp>
#include <opm/grid/GridHelpers.hpp> #include <opm/grid/GridHelpers.hpp>
@ -240,6 +241,7 @@ public:
void evalSummaryState(bool isSubStep) void evalSummaryState(bool isSubStep)
{ {
PAvgCalculatorCollection wbp_calculators;
const int reportStepNum = simulator_.episodeIndex() + 1; const int reportStepNum = simulator_.episodeIndex() + 1;
/* /*
The summary data is not evaluated for timestep 0, that is The summary data is not evaluated for timestep 0, that is
@ -324,6 +326,7 @@ public:
miscSummaryData, miscSummaryData,
eclOutputModule_.initialInplace(), eclOutputModule_.initialInplace(),
inplace, inplace,
wbp_calculators,
regionData, regionData,
blockData, blockData,
aquiferData); aquiferData);