mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #151 from andlaus/thpress_from_initial
adapt to the threshold pressure related API changes
This commit is contained in:
commit
324cd80cb7
@ -132,7 +132,7 @@ try
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<GridManager> grid;
|
std::shared_ptr<GridManager> grid;
|
||||||
std::shared_ptr<BlackoilPropertiesInterface> props;
|
std::shared_ptr<BlackoilPropertiesFromDeck> props;
|
||||||
std::shared_ptr<BlackoilPropsAdFromDeck> new_props;
|
std::shared_ptr<BlackoilPropsAdFromDeck> new_props;
|
||||||
std::shared_ptr<RockCompressibility> rock_comp;
|
std::shared_ptr<RockCompressibility> rock_comp;
|
||||||
PolymerBlackoilState state;
|
PolymerBlackoilState state;
|
||||||
@ -284,7 +284,9 @@ try
|
|||||||
bool use_local_perm = param.getDefault("use_local_perm", true);
|
bool use_local_perm = param.getDefault("use_local_perm", true);
|
||||||
Opm::DerivedGeology geology(*grid->c_grid(), *new_props, eclipseState, use_local_perm, grav);
|
Opm::DerivedGeology geology(*grid->c_grid(), *new_props, eclipseState, use_local_perm, grav);
|
||||||
|
|
||||||
std::vector<double> threshold_pressures = thresholdPressures(parseMode, eclipseState, *grid->c_grid());
|
std::map<std::pair<int, int>, double> maxDp;
|
||||||
|
computeMaxDp(maxDp, deck, eclipseState, *grid->c_grid(), state, *props, gravity[2]);
|
||||||
|
std::vector<double> threshold_pressures = thresholdPressures(deck, eclipseState, *grid->c_grid(), maxDp);
|
||||||
|
|
||||||
Opm::BlackoilOutputWriter
|
Opm::BlackoilOutputWriter
|
||||||
outputWriter(cGrid, param, eclipseState, pu,
|
outputWriter(cGrid, param, eclipseState, pu,
|
||||||
|
Loading…
Reference in New Issue
Block a user