From 4ba1490310a73e48fe3b696a954ae510a2fbcaa0 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Tue, 28 Jul 2015 17:24:05 +0200
Subject: [PATCH] remove the unused 'Evaluation' template parameter from the
 MaterialTraits

the evaluation is actually more dynamic because it is a template
argument for the individual methods of the fluid-matrixinteractions.
---
 .../fluidmatrixinteractions/MaterialTraits.hpp    | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/opm/material/fluidmatrixinteractions/MaterialTraits.hpp b/opm/material/fluidmatrixinteractions/MaterialTraits.hpp
index e2b88e2bf..03321344b 100644
--- a/opm/material/fluidmatrixinteractions/MaterialTraits.hpp
+++ b/opm/material/fluidmatrixinteractions/MaterialTraits.hpp
@@ -37,16 +37,13 @@ namespace Opm {
  *
  * 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
 {
 public:
     //! The type used for scalar floating point values
     typedef ScalarT Scalar;
 
-    //! Representation of a function evaluation and all its relevant derivatives
-    typedef EvaluationT Evaluation;
-
     //! The number of fluid phases
     static const int numPhases = numPhasesV;
 };
@@ -56,16 +53,13 @@ public:
  *
  * \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
 {
 public:
     //! The type used for scalar floating point values
     typedef ScalarT Scalar;
 
-    //! Representation of a function evaluation and all its relevant derivatives
-    typedef EvaluationT Evaluation;
-
     //! The number of fluid phases
     static const int numPhases = 2;
 
@@ -85,16 +79,13 @@ public:
  *
  * \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
 {
 public:
     //! The type used for scalar floating point values
     typedef ScalarT Scalar;
 
-    //! Representation of a function evaluation and all its relevant derivatives
-    typedef EvaluationT Evaluation;
-
     //! The number of fluid phases
     static const int numPhases = 3;