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

Merge pull request #654 from andlaus/nested_ad

Browse Source 
Fix build
This commit is contained in:
Andreas Lauser 2016-04-18 11:01:39 +02:00
commit 4baf0f6acf
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
opm/autodiff/BlackoilPropsAdFromDeck.cpp
View File

@ -301,8 +301,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V mu(n); V mu(n);
V dmudp(n); V dmudp(n);
enum PressureEvalTag {}; typedef Opm::LocalAd::Evaluation<double, /*size=*/1> LadEval;
typedef Opm::LocalAd::Evaluation<double, PressureEvalTag, /*size=*/1> LadEval;
LadEval pLad = 0.0; LadEval pLad = 0.0;
LadEval TLad = 0.0; LadEval TLad = 0.0;
@ -355,8 +354,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V dmudp(n); V dmudp(n);
V dmudr(n); V dmudr(n);
enum PressureRsEvalTag {}; typedef Opm::LocalAd::Evaluation<double, /*size=*/2> LadEval;
typedef Opm::LocalAd::Evaluation<double, PressureRsEvalTag, /*size=*/2> LadEval;
LadEval pLad = 0.0; LadEval pLad = 0.0;
LadEval TLad = 0.0; LadEval TLad = 0.0;
@ -419,8 +417,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V dmudp(n); V dmudp(n);
V dmudr(n); V dmudr(n);
enum PressureRvEvalTag {}; typedef Opm::LocalAd::Evaluation<double, /*size=*/2> LadEval;
typedef Opm::LocalAd::Evaluation<double, PressureRvEvalTag, /*size=*/2> LadEval;
LadEval pLad = 0.0; LadEval pLad = 0.0;
LadEval TLad = 0.0; LadEval TLad = 0.0;
@ -484,8 +481,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V dbdp(n); V dbdp(n);
V dbdr(n); V dbdr(n);
enum PressureEvalTag {}; typedef Opm::LocalAd::Evaluation<double, /*size=*/1> LadEval;
typedef Opm::LocalAd::Evaluation<double, PressureEvalTag, /*size=*/1> LadEval;
LadEval pLad = 0.0; LadEval pLad = 0.0;
LadEval TLad = 0.0; LadEval TLad = 0.0;
@ -534,8 +530,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V dbdp(n); V dbdp(n);
V dbdr(n); V dbdr(n);
enum PressureRsEvalTag {}; typedef Opm::LocalAd::Evaluation<double, /*size=*/2> LadEval;
typedef Opm::LocalAd::Evaluation<double, PressureRsEvalTag, /*size=*/2> LadEval;
LadEval pLad = 0.0; LadEval pLad = 0.0;
LadEval TLad = 0.0; LadEval TLad = 0.0;
@ -599,8 +594,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V dbdp(n); V dbdp(n);
V dbdr(n); V dbdr(n);
enum PressureRvEvalTag {}; typedef Opm::LocalAd::Evaluation<double, /*size=*/2> LadEval;
typedef Opm::LocalAd::Evaluation<double, PressureRvEvalTag, /*size=*/2> LadEval;
LadEval pLad = 0.0; LadEval pLad = 0.0;
LadEval TLad = 0.0; LadEval TLad = 0.0;
@ -660,8 +654,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V rbub(n); V rbub(n);
V drbubdp(n); V drbubdp(n);
enum PressureEvalTag {}; typedef Opm::LocalAd::Evaluation<double, /*size=*/1> LadEval;
typedef Opm::LocalAd::Evaluation<double, PressureEvalTag, /*size=*/1> LadEval;
LadEval pLad = 0.0; LadEval pLad = 0.0;
LadEval TLad = 293.15; // temperature is not supported by this API! LadEval TLad = 293.15; // temperature is not supported by this API!
@ -718,8 +711,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V rv(n); V rv(n);
V drvdp(n); V drvdp(n);
enum PressureEvalTag {}; typedef Opm::LocalAd::Evaluation<double, /*size=*/1> LadEval;
typedef Opm::LocalAd::Evaluation<double, PressureEvalTag, /*size=*/1> LadEval;
LadEval pLad = 0.0; LadEval pLad = 0.0;
LadEval TLad = 293.15; // temperature is not supported by this API! LadEval TLad = 293.15; // temperature is not supported by this API!