making StandardWells non-templated

we will focus on template functions instead.
This commit is contained in:
Kai Bao
2016-04-08 10:20:11 +02:00
parent 266f6f2df5
commit bca23d34c1
3 changed files with 17 additions and 43 deletions

View File

@@ -276,7 +276,7 @@ namespace Opm {
const BlackoilPropsAdInterface& fluid_;
const DerivedGeology& geo_;
const RockCompressibility* rock_comp_props_;
StandardWells<SolutionState, WellState> std_wells_;
StandardWells std_wells_;
VFPProperties vfp_properties_;
const NewtonIterationBlackoilInterface& linsolver_;
// For each canonical phase -> true if active
@@ -329,8 +329,8 @@ namespace Opm {
}
/// return the StandardWells object
StandardWells<SolutionState, WellState>& stdWells() { return std_wells_; }
const StandardWells<SolutionState, WellState>& stdWells() const { return std_wells_; }
StandardWells& stdWells() { return std_wells_; }
const StandardWells& stdWells() const { return std_wells_; }
/// return the Well struct in the StandardWells
const Wells& wells() const { return std_wells_.wells(); }