Commit dcec050e authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'master' into develop 

Conflicts:
	examples/advection/advection.h
	examples/advection/advectionRhs.h
	examples/inviscid-flow/2d/euler.h
	examples/inviscid-flow/2d/eulerRhs.h
	src/TNL/Functions/Analytic/SinBumps.h
	src/TNL/Functions/TestFunction.h
	src/TNL/Functions/TestFunction_impl.h
	src/TNL/Meshes/GridDetails/Grid1D.h
	src/TNL/Meshes/GridDetails/Grid1D_impl.h
	src/TNL/Meshes/GridDetails/Grid2D.h
	src/TNL/Meshes/GridDetails/Grid2D_impl.h
	src/TNL/Meshes/GridDetails/Grid3D.h
	src/TNL/Meshes/GridDetails/Grid3D_impl.h
	tests/benchmarks/heat-equation-benchmark/tnlTestGrid2D.h
parents 87d2d81d e1c81072

examples/heat-equation/tnl-heat-equation-eoc.h

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ class heatEquationSetter 
   typedef Device DeviceType;

   typedef Index IndexType;



   typedef Containers::StaticVector< MeshType::meshDimension, Real > Vertex;

   typedef Containers::StaticVector< MeshType::meshDimension, Real > Point;



   static bool run( const Config::ParameterContainer& parameters )

   {
@@ -62,7 +62,7 @@ class heatEquationSetter 
      typedef Operators::ExactLinearDiffusion< Dimension > ExactOperator;

      typedef Functions::TestFunction< MeshType::meshDimension, Real, Device > TestFunction;

      typedef HeatEquationEocRhs< ExactOperator, TestFunction > RightHandSide;

      typedef Containers::StaticVector < MeshType::meshDimension, Real > Vertex;

      typedef Containers::StaticVector < MeshType::meshDimension, Real > Point;

      typedef Operators::DirichletBoundaryConditions< MeshType, TestFunction, Dimension, Real, Index > BoundaryConditions;

      typedef HeatEquationEocProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Solver;

      SolverStarter solverStarter;

examples/inviscid-flow/RiemannProblemInitialCondition.h

+9 −9
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class RiemannProblemInitialCondition 
      typedef typename MeshType::DeviceType DeviceType;

      typedef typename MeshType::IndexType IndexType;

      static const int Dimensions = MeshType::getDimension();

      typedef Containers::StaticVector< Dimensions, RealType > VertexType;

      typedef Containers::StaticVector< Dimensions, RealType > PointType;

      typedef Functions::MeshFunction< MeshType > MeshFunctionType;

      typedef SharedPointer< MeshFunctionType > MeshFunctionPointer;

      typedef Functions::VectorField< Dimensions, MeshType > VectorFieldType;
@@ -73,12 +73,12 @@ class RiemannProblemInitialCondition 
         return true;

      };

      

      void setDiscontinuityPlacement( const VertexType& v )

      void setDiscontinuityPlacement( const PointType& v )

      {

         this->discontinuityPlacement = v;

      }

      

      const VertexType& getDiscontinuityPlasement() const

      const PointType& getDiscontinuityPlasement() const

      {

         return this->discontinuityPlacement;

      }
@@ -103,12 +103,12 @@ class RiemannProblemInitialCondition 
         return this->rightDensity;

      }



      void setLeftVelocity( const VertexType& leftVelocity )

      void setLeftVelocity( const PointType& leftVelocity )

      {

         this->leftVelocity = leftVelocity;

      }

      

      const VertexType& getLeftVelocity() const

      const PointType& getLeftVelocity() const

      {

         return this->leftVelocity;

      }
@@ -118,7 +118,7 @@ class RiemannProblemInitialCondition 
         this->rightVelocity = rightVelocity;

      }

      

      const VertexType& getRightVelocity() const

      const PointType& getRightVelocity() const

      {

         return this->rightVelocity;

      }
@@ -144,7 +144,7 @@ class RiemannProblemInitialCondition 
      }

      

      void setInitialCondition( CompressibleConservativeVariables< MeshType >& conservativeVariables,

                                const VertexType& center = VertexType( 0.0 ) )

                                const PointType& center = PointType( 0.0 ) )

      {

         typedef Functions::Analytic::VectorNorm< Dimensions, RealType > VectorNormType;

         typedef Operators::Analytic::Sign< Dimensions, RealType > SignType;
@@ -197,10 +197,10 @@ class RiemannProblemInitialCondition 
      

   protected:

      

      VertexType discontinuityPlacement;

      PointType discontinuityPlacement;

      

      RealType leftDensity, rightDensity;

      VertexType leftVelocity, rightVelocity;

      PointType leftVelocity, rightVelocity;

      RealType leftPressure, rightPressure;

      

      RealType gamma; // gamma in the ideal gas state equation

examples/inviscid-flow/euler.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class eulerSetter 
          enum { Dimension = MeshType::getDimension() };

          typedef LaxFridrichs< MeshType, Real, Index > ApproximateOperator;

          typedef eulerRhs< MeshType, Real > RightHandSide;

          typedef Containers::StaticVector < MeshType::getDimension(), Real > Vertex;

          typedef Containers::StaticVector < MeshType::getDimension(), Real > Point;



         /****

          * Resolve the template arguments of your solver here.

examples/inviscid-flow/eulerRhs.h

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ template< typename Mesh, typename Real >class eulerRhs 
      Real operator()( const MeshEntity& entity,

                       const Real& time = 0.0 ) const

      {

         typedef typename MeshEntity::MeshType::VertexType VertexType;

         VertexType v = entity.getCenter();

         typedef typename MeshEntity::MeshType::PointType PointType;

         PointType v = entity.getCenter();

         return 0.0;

      }

};

examples/mean-curvature-flow/tnl-mean-curvature-flow-eoc.h

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class meanCurvatureFlowEocSetter 
   typedef Device DeviceType;

   typedef Index IndexType;



   typedef typename MeshType::VertexType Vertex;

   typedef typename MeshType::PointType Point;

   enum { Dimension = MeshType::meshDimension };



   static bool run( const Config::ParameterContainer& parameters )
@@ -81,7 +81,7 @@ class meanCurvatureFlowEocSetter 
      typedef ExactNonlinearDiffusion< ExactGradientNorm< Dimension >, Dimension > ExactOperator;

      typedef TestFunction< MeshType::meshDimension, Real, Device > TestFunction;

      typedef MeanCurvatureFlowEocRhs< ExactOperator, TestFunction, Dimension > RightHandSide;

      typedef StaticVector < MeshType::meshDimension, Real > Vertex;

      typedef StaticVector < MeshType::meshDimension, Real > Point;

      typedef DirichletBoundaryConditions< MeshType, TestFunction, Dimension, Real, Index > BoundaryConditions;

      typedef MeanCurvatureFlowEocProblem< MeshType, BoundaryConditions, RightHandSide, ApproximateOperator > Solver;

      SolverStarter solverStarter;