[FluidState] Using FluidState property

Replace direct declaration with FluidState property.

dumux/porousmediumflow/2pnc/implicit/localresidual.hh

@@ -62,7 +62,6 @@ protected:
     typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
     typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
 
-    typedef CompositionalFluidState<Scalar, FluidSystem> FluidState;
     typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
 
     enum

dumux/porousmediumflow/2pnc/implicit/model.hh

@@ -138,8 +138,6 @@ class TwoPNCModel: public GET_PROP_TYPE(TypeTag, BaseModel)
             formulation = GET_PROP_VALUE(TypeTag, Formulation)
     };
 
-    typedef CompositionalFluidState<Scalar, FluidSystem> FluidState;
-
     typedef typename GridView::template Codim<dim>::Entity Vertex;
     typedef typename GridView::template Codim<0>::Entity Element;
 

dumux/porousmediumflow/3p/implicit/volumevariables.hh

@@ -78,7 +78,7 @@ class ThreePVolumeVariables : public ImplicitVolumeVariables<TypeTag>
 
 public:
     //! The type of the object returned by the fluidState() method
-    typedef Dumux::ImmiscibleFluidState<Scalar, FluidSystem> FluidState;
+    typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
 
 
     /*!

dumux/porousmediumflow/co2/implicit/volumevariables.hh

@@ -97,7 +97,7 @@ class CO2VolumeVariables: public TwoPTwoCVolumeVariables<TypeTag>
 
 public:
     //! The type of the object returned by the fluidState() method
-    typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> FluidState;
+    typedef typename ParentType::FluidState FluidState;
 
 
     /*!