removed useless typdefs

src/assemblevelocityrhs.hh

@@ -14,11 +14,11 @@ template<typename DiscreteFunctionType,typename FluidStateType,typename ProblemT
 void assembleVelocityRHS(DiscreteFunctionType& rhs,const FluidStateType& fluidState,ProblemType& problem,
                          const TimeProviderType& timeProvider)
 {
-  typedef typename DiscreteFunctionType::LocalFunctionType::RangeType LocalFunctionRangeType;
   typedef typename DiscreteFunctionType::DiscreteFunctionSpaceType DiscreteSpaceType;
+  typedef typename FluidStateType::VelocityDiscreteFunctionType VelocityDiscreteFunctionType;
   constexpr std::size_t localBlockSize(DiscreteSpaceType::localBlockSize);
   const auto& space(rhs.space());
-  std::vector<LocalFunctionRangeType> phi(space.maxNumDofs());
+  std::vector<typename DiscreteFunctionType::RangeType> phi(space.maxNumDofs());
   problem.velocityRHS().initialize(timeProvider.time(),timeProvider.time());
 
   // perform a grid walkthrough and assemble the RHS
@@ -39,7 +39,7 @@ void assembleVelocityRHS(DiscreteFunctionType& rhs,const FluidStateType& fluidSt
     const CachingQuadrature<typename DiscreteSpaceType::GridPartType,0> quadrature(entity,2*space.order()+1);
     for(const auto& qp:quadrature)
     {
-      typename FluidStateType::VelocityDiscreteFunctionType::RangeType fValue;
+      typename VelocityDiscreteFunctionType::RangeType fValue;
       problem.velocityRHS().evaluate(qp.position(),fValue);
       baseSet.evaluateAll(qp,phi);
       const auto weight(entity.geometry().integrationElement(qp.position())*qp.weight());

src/bulkpressurevelocityoperator.hh

@@ -79,10 +79,8 @@ class BulkPressureVelocityOperator:public Operator<DomainFunctionImp,RangeFuncti
 
     // allocate basis vectors
     constexpr std::size_t rangeLocalBlockSize(RangeSpaceType::localBlockSize);
-    typedef typename DomainFunctionType::LocalFunctionType::RangeType DomainRangeType;
-    std::vector<DomainRangeType> phi(domainspace_.maxNumDofs());
-    typedef typename RangeFunctionType::LocalFunctionType::JacobianRangeType RangeJacobianRangeType;
-    std::vector<RangeJacobianRangeType> gradphi(rangespace_.maxNumDofs());
+    std::vector<typename DomainFunctionType::RangeType> phi(domainspace_.maxNumDofs());
+    std::vector<typename RangeFunctionType::JacobianRangeType> gradphi(rangespace_.maxNumDofs());
 
     // perform a grid walkthrough and assemble the global matrix
     for(const auto& entity:domainspace_)

src/bulkvelocitypressureoperator.hh

@@ -79,10 +79,8 @@ class BulkVelocityPressureOperator:public Operator<DomainFunctionImp,RangeFuncti
 
     // allocate basis vectors
     constexpr std::size_t domainLocalBlockSize(DomainSpaceType::localBlockSize);
-    typedef typename DomainFunctionType::LocalFunctionType::JacobianRangeType DomainJacobianRangeType;
-    std::vector<DomainJacobianRangeType> gradphi(domainspace_.maxNumDofs());
-    typedef typename RangeFunctionType::LocalFunctionType::RangeType RangeRangeType;
-    std::vector<RangeRangeType> phi(rangespace_.maxNumDofs());
+    std::vector<typename DomainFunctionType::JacobianRangeType> gradphi(domainspace_.maxNumDofs());
+    std::vector<typename RangeFunctionType::RangeType> phi(rangespace_.maxNumDofs());
 
     for(const auto& entity:rangespace_)
     {

src/curvaturevelocityoperator.hh

@@ -85,10 +85,8 @@ class CurvatureVelocityOperator:public Operator<DomainFunctionImp,RangeFunctionI
     op_.clear();
 
     // allocate basis vectors
-    typedef typename CurvatureFunctionType::LocalFunctionType::RangeType CurvatureRangeType;
-    std::vector<CurvatureRangeType> phiCurvature(curvaturespace_.maxNumDofs());
-    typedef typename VelocityFunctionType::LocalFunctionType::RangeType VelocityRangeType;
-    std::vector<VelocityRangeType> phiVelocity(velocityspace_.maxNumDofs());
+    std::vector<typename CurvatureFunctionType::RangeType > phiCurvature(curvaturespace_.maxNumDofs());
+    std::vector<typename VelocityFunctionType::RangeType> phiVelocity(velocityspace_.maxNumDofs());
 
     // perform an interface walkthrough and assemble the global matrix
     for(const auto& interfaceEntity:curvaturespace_)

src/interfacedisplacementoperator.hh

@@ -80,10 +80,8 @@ class InterfaceDisplacementOperator:public Operator<DiscreteFunctionImp,Discrete
     op_.reserve(stencil);
     op_.clear();
 
-    typedef typename DiscreteFunctionType::LocalFunctionType::JacobianRangeType LocalFunctionJacobianRangeType;
-    std::vector<LocalFunctionJacobianRangeType> gradphi(space_.maxNumDofs());
-
     constexpr std::size_t rangedim(DiscreteSpaceType::FunctionSpaceType::dimRange);
+    std::vector<typename DiscreteFunctionType::JacobianRangeType> gradphi(space_.maxNumDofs());
 
     for(const auto& entity:space_)
     {

src/interfaceoperator.hh

@@ -72,10 +72,8 @@ class InterfaceOperator:public Operator<DiscreteFunctionImp,DiscreteFunctionImp>
     op_.reserve(stencil);
     op_.clear();
     // allocate local basis
-    typedef typename DiscreteFunctionType::LocalFunctionType::RangeType LocalFunctionRangeType;
-    std::vector<LocalFunctionRangeType> phi(space_.maxNumDofs());
-    typedef typename DiscreteFunctionType::LocalFunctionType::JacobianRangeType LocalFunctionJacobianRangeType;
-    std::vector<LocalFunctionJacobianRangeType> gradphi(space_.maxNumDofs());
+    std::vector<typename DiscreteFunctionType::RangeType> phi(space_.maxNumDofs());
+    std::vector<typename DiscreteFunctionType::JacobianRangeType> gradphi(space_.maxNumDofs());
     // extract dimensions
     constexpr unsigned int worlddim(DiscreteSpaceType::GridType::dimensionworld);
     constexpr unsigned int rangedim(DiscreteSpaceType::FunctionSpaceType::dimRange);

src/massmatrix.hh

@@ -80,8 +80,7 @@ class MassMatrix:public Operator<DomainFunctionImp,RangeFunctionImp>
     op_.clear();
 
     // allocate basis vector
-    typedef typename DiscreteFunctionType::LocalFunctionType::RangeType LocalFunctionRangeType;
-    std::vector<LocalFunctionRangeType> phi(space_.maxNumDofs());
+    std::vector<typename DiscreteFunctionType::RangeType> phi(space_.maxNumDofs());
 
     // perform a grid walkthrough and assemble the global matrix
     for(const auto& entity:space_)

src/smoothingoperator.hh

@@ -74,8 +74,7 @@ class SmoothingOperator:public Operator<DiscreteFunctionImp,DiscreteFunctionImp>
     op_.clear();
 
     constexpr std::size_t localBlockSize(DiscreteSpaceType::localBlockSize);
-    typedef typename DiscreteFunctionType::LocalFunctionType::JacobianRangeType LocalFunctionJacobianRangeType;
-    std::vector<LocalFunctionJacobianRangeType> gradphi(space_.maxNumDofs());
+    std::vector<typename DiscreteFunctionType::JacobianRangeType> gradphi(space_.maxNumDofs());
 
     // perform a grid walkthrough and assemble the global matrix
     for(const auto& entity:space_)

src/velocitycurvatureoperator.hh

@@ -85,10 +85,8 @@ class VelocityCurvatureOperator:public Operator<DomainFunctionImp,RangeFunctionI
     op_.clear();
 
     // allocate basis vectors
-    typedef typename VelocityFunctionType::LocalFunctionType::RangeType VelocityRangeType;
-    std::vector<VelocityRangeType> phiVelocity(velocityspace_.maxNumDofs());
-    typedef typename CurvatureFunctionType::LocalFunctionType::RangeType CurvatureRangeType;
-    std::vector<CurvatureRangeType> phiCurvature(curvaturespace_.maxNumDofs());
+    std::vector<typename VelocityFunctionType::RangeType> phiVelocity(velocityspace_.maxNumDofs());
+    std::vector<typename CurvatureFunctionType::RangeType> phiCurvature(curvaturespace_.maxNumDofs());
 
     // perform an interface walkthrough and assemble the global matrix
     for(const auto& interfaceEntity:curvaturespace_)