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

remove the BlackoilPropsAdInterface abstraction layer

Browse Source 
instead, directly use BlackoilPropsAdFromDeck.
This commit is contained in:
Andreas Lauser
2016-12-29 16:35:24 +01:00
parent edf883e747
commit ef731672c9
43 changed files with 69 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/autodiff/StandardWellsDense.hpp
View File

@@ -36,12 +36,12 @@
#include <opm/core/wells.h>
#include <opm/core/wells/DynamicListEconLimited.hpp>
#include <opm/autodiff/VFPProperties.hpp>
#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
#include <opm/autodiff/VFPInjProperties.hpp>
#include <opm/autodiff/VFPProdProperties.hpp>
#include <opm/autodiff/WellHelpers.hpp>
#include <opm/autodiff/BlackoilModelEnums.hpp>
#include <opm/autodiff/WellDensitySegmented.hpp>
#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
#include <opm/autodiff/BlackoilDetails.hpp>
#include <opm/autodiff/BlackoilModelParameters.hpp>
#include <opm/autodiff/LinearisedBlackoilResidual.hpp>
@@ -104,7 +104,7 @@ enum WellVariablePositions {
}
}
void init(const BlackoilPropsAdInterface* fluid_arg,
void init(const BlackoilPropsAdFromDeck* fluid_arg,
const std::vector<bool>* active_arg,
const VFPProperties* vfp_properties_arg,
const double gravity_arg,
@@ -1483,7 +1483,7 @@ enum WellVariablePositions {
ModelParameters param_;
bool terminal_output_;
const BlackoilPropsAdInterface* fluid_;
const BlackoilPropsAdFromDeck* fluid_;
const std::vector<bool>* active_;
const VFPProperties* vfp_properties_;
double gravity_;