OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

flow: avoid wrangling around with dummy state objects

Browse Source 
these objects are only used by flow_legacy, so not having to deal with
them anymore lets non-legacy flow avoid to jump through a lot of hoops
for the sake of having a common API.

this required a fork of the NonlinearSolver and AdaptiveTimeStepping
classes. this is not a problem because the original classes would get
pruned to look like the new ones once flow_legacy gets moved out of
the opm-simulators module.
This commit is contained in:
Andreas Lauser
2018-06-06 10:59:41 +02:00
parent 2672f38375
commit dfbc24b35f
13 changed files with 1091 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opm/autodiff/ParallelDebugOutput.hpp
View File

@@ -596,8 +596,9 @@ namespace Opm
};
// gather solution to rank 0 for EclipseWriter
template <class WellState>
bool collectToIORank( const SimulationDataContainer& /*localReservoirState*/,
const WellStateFullyImplicitBlackoil& localWellState,
const WellState& localWellState,
const data::Solution& localCellData,
const int wellStateStepNumber )
{
@@ -627,7 +628,7 @@ namespace Opm
std::unordered_set<std::string>());
const Wells* wells = wells_manager.c_wells();
globalWellState_.init(wells, *globalReservoirState_, globalWellState_, phaseUsage_ );
globalWellState_.initLegacy(wells, *globalReservoirState_, globalWellState_, phaseUsage_ );
globalCellData_->clear();
}