OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt code w.r.t. the removal of the tags for Opm::Evaluation

Browse Source
This commit is contained in:
Andreas Lauser
2016-04-15 18:46:15 +02:00
parent b6e381d627
commit 145d61d751
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opm/core/props/BlackoilPropertiesFromDeck.cpp
View File

@@ -244,8 +244,7 @@ namespace Opm
const auto& pu = phaseUsage();
const int np = numPhases();
enum PressureEvalTag {};
typedef Opm::LocalAd::Evaluation<double, PressureEvalTag, /*size=*/1> LadEval;
typedef Opm::LocalAd::Evaluation<double, /*size=*/1> LadEval;
LadEval pLad = 0.0;
LadEval TLad = 0.0;
@@ -470,8 +469,7 @@ namespace Opm
{
const auto& pu = phaseUsage();
enum PressureEvalTag {};
typedef Opm::LocalAd::Evaluation<double, PressureEvalTag, /*size=*/1> LadEval;
typedef Opm::LocalAd::Evaluation<double, /*size=*/1> LadEval;
LadEval pLad = 0.0;
LadEval TLad = 0.0;
@@ -605,8 +603,7 @@ namespace Opm
{
const auto& pu = phaseUsage();
enum PressureEvalTag {};
typedef Opm::LocalAd::Evaluation<double, PressureEvalTag, /*size=*/1> LadEval;
typedef Opm::LocalAd::Evaluation<double, /*size=*/1> LadEval;
typedef Opm::MathToolbox<LadEval> Toolbox;
LadEval pLad = 0.0;

8
opm/core/simulator/ExplicitArraysSatDerivativesFluidState.hpp
View File

@@ -30,12 +30,6 @@
namespace Opm
{
// this class does not need to be implemented. its only purpose is to make compiler
// messages for local-AD framework more explicit (because the class name of the
// Evaluation will include a tag name so that it is clear which derivatives are handled).
class SaturationDerivativesTag
{};
/*!
* \brief This is a fluid state which translates global arrays and translates them to a
* subset of the fluid state API.
@@ -50,7 +44,7 @@ public:
enum { numPhases = BlackoilPhases::MaxNumPhases };
enum { numComponents = 3 };
typedef Opm::LocalAd::Evaluation<double, SaturationDerivativesTag, numPhases> Evaluation;
typedef Opm::LocalAd::Evaluation<double, numPhases> Evaluation;
typedef Evaluation Scalar;
ExplicitArraysSatDerivativesFluidState(const PhaseUsage& phaseUsage)