mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
DerivedGeology: pass the EclipseState object to its constructor
this is required to implement pore volume and permeability multipliers as discussed with [at]bska and [at]joakim-hove. Note that this implies that the DerivedGeology class can't be instantiated anymore if there is no EclipseState object. Thus all code paths and tests that don't load a deck are removed by this patch. If this is undesireable, there are two options: First, don't require EclipseState for DerivedGeology which would imply to make the about 10 required multiplier functions part of the BlackoilPropertiesAdInterface, or second, one can copy-and-paste the DerivedGeology class as it was before this patch, derive from a newly introduced DerivedGeologyInterface and pass DerivedGeologyInterface objects to the simulator. IMHO, the second solution would be a bit better but it would involve substantial overhead to implement and to maintain it. Anyway, in the mean time simulators cannot be instantiated without decks.
This commit is contained in:
@@ -236,7 +236,7 @@ try
|
||||
// initialize variables
|
||||
simtimer.init(timeMap);
|
||||
|
||||
Opm::DerivedGeology geology(*grid, *new_props);
|
||||
Opm::DerivedGeology geology(*grid, *new_props, eclipseState);
|
||||
|
||||
SimulatorReport fullReport;
|
||||
for (size_t reportStepIdx = 0; reportStepIdx < timeMap->numTimesteps(); ++reportStepIdx) {
|
||||
|
||||
Reference in New Issue
Block a user