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

ImpesTPFAAD is no longer a template class.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2013-05-22 15:27:16 +02:00
parent e86aa3324c
commit abc23b8009
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/test_impestpfa_ad.cpp
View File

@ -58,10 +58,6 @@ main(int argc, char* argv[])
const Opm::BlackoilPropsAd props(oldprops); const Opm::BlackoilPropsAd props(oldprops);
typedef AutoDiff::ForwardBlock<double> ADB; typedef AutoDiff::ForwardBlock<double> ADB;
typedef Opm::BlackoilPropertiesInterface Geology;
typedef Opm::DerivedGeology GeoProps;
typedef Opm::BlackoilPropsAd BOFluid;
typedef Opm::ImpesTPFAAD<GeoProps> PSolver;
Wells* wells = create_wells(2, 2, 5); Wells* wells = create_wells(2, 2, 5);
const double inj_frac[] = { 1.0, 0.0 }; const double inj_frac[] = { 1.0, 0.0 };
@ -84,9 +80,9 @@ main(int argc, char* argv[])
set_current_control(1, 0, wells); set_current_control(1, 0, wells);
double grav[] = { /*1.0*/ 0.0, 0.0 }; double grav[] = { /*1.0*/ 0.0, 0.0 };
GeoProps geo(*g, oldprops, grav); Opm::DerivedGeology geo(*g, props, grav);
Opm::LinearSolverFactory linsolver(param); Opm::LinearSolverFactory linsolver(param);
PSolver ps (*g, props, geo, *wells, linsolver); Opm::ImpesTPFAAD ps(*g, props, geo, *wells, linsolver);
Opm::BlackoilState state; Opm::BlackoilState state;
initStateBasic(*g, oldprops, param, 0.0, state); initStateBasic(*g, oldprops, param, 0.0, state);

13
opm/autodiff/ImpesTPFAAD.hpp
View File

@ -103,14 +103,13 @@ namespace {
namespace Opm { namespace Opm {
template <class GeoProps>
class ImpesTPFAAD { class ImpesTPFAAD {
public: public:
ImpesTPFAAD(const UnstructuredGrid& grid , ImpesTPFAAD(const UnstructuredGrid& grid,
const BlackoilPropsAdInterface& fluid, const BlackoilPropsAdInterface& fluid,
const GeoProps& geo , const DerivedGeology& geo,
const Wells& wells, const Wells& wells,
const LinearSolverInterface& linsolver) const LinearSolverInterface& linsolver)
: grid_ (grid) : grid_ (grid)
, fluid_ (fluid) , fluid_ (fluid)
, geo_ (geo) , geo_ (geo)
@ -198,7 +197,7 @@ namespace Opm {
const UnstructuredGrid& grid_; const UnstructuredGrid& grid_;
const BlackoilPropsAdInterface& fluid_; const BlackoilPropsAdInterface& fluid_;
const GeoProps& geo_ ; const DerivedGeology& geo_ ;
const Wells& wells_; const Wells& wells_;
const LinearSolverInterface& linsolver_; const LinearSolverInterface& linsolver_;
HelperOps ops_; HelperOps ops_;