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

remove the unused 'Evaluation' template parameter from the MaterialTraits

Browse Source 
the evaluation is actually more dynamic because it is a template
argument for the individual methods of the fluid-matrixinteractions.
This commit is contained in:
Andreas Lauser 2015-07-28 17:24:05 +02:00
parent 18531103a6
commit 4ba1490310
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
opm/material/fluidmatrixinteractions/MaterialTraits.hpp
View File

@ -37,16 +37,13 @@ namespace Opm {
* *
* This traits class is intended to be used by the NullMaterial * This traits class is intended to be used by the NullMaterial
*/ */
template <class ScalarT, int numPhasesV, class EvaluationT = ScalarT> template <class ScalarT, int numPhasesV>
class NullMaterialTraits class NullMaterialTraits
{ {
public: public:
//! The type used for scalar floating point values //! The type used for scalar floating point values
typedef ScalarT Scalar; typedef ScalarT Scalar;
//! Representation of a function evaluation and all its relevant derivatives
typedef EvaluationT Evaluation;
//! The number of fluid phases //! The number of fluid phases
static const int numPhases = numPhasesV; static const int numPhases = numPhasesV;
}; };
@ -56,16 +53,13 @@ public:
* *
* \brief A generic traits class for two-phase material laws. * \brief A generic traits class for two-phase material laws.
*/ */
template <class ScalarT, int wettingPhaseIdxV, int nonWettingPhaseIdxV, class EvaluationT = ScalarT> template <class ScalarT, int wettingPhaseIdxV, int nonWettingPhaseIdxV>
class TwoPhaseMaterialTraits class TwoPhaseMaterialTraits
{ {
public: public:
//! The type used for scalar floating point values //! The type used for scalar floating point values
typedef ScalarT Scalar; typedef ScalarT Scalar;
//! Representation of a function evaluation and all its relevant derivatives
typedef EvaluationT Evaluation;
//! The number of fluid phases //! The number of fluid phases
static const int numPhases = 2; static const int numPhases = 2;
@ -85,16 +79,13 @@ public:
* *
* \brief A generic traits class for three-phase material laws. * \brief A generic traits class for three-phase material laws.
*/ */
template <class ScalarT, int wettingPhaseIdxV, int nonWettingasPhaseIdxV, int gasPhaseIdxV, class EvaluationT = ScalarT> template <class ScalarT, int wettingPhaseIdxV, int nonWettingasPhaseIdxV, int gasPhaseIdxV>
class ThreePhaseMaterialTraits class ThreePhaseMaterialTraits
{ {
public: public:
//! The type used for scalar floating point values //! The type used for scalar floating point values
typedef ScalarT Scalar; typedef ScalarT Scalar;
//! Representation of a function evaluation and all its relevant derivatives
typedef EvaluationT Evaluation;
//! The number of fluid phases //! The number of fluid phases
static const int numPhases = 3; static const int numPhases = 3;