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

Merge branch 'master' into develop 

Conflicts:
	examples/advection/LaxFridrichs.h
	examples/advection/advection.h
	examples/advection/advectionProblem_impl.h
	examples/inviscid-flow/1d/EulerPressureGetter.h
	examples/inviscid-flow/1d/EulerVelGetter.h
	examples/inviscid-flow/1d/LaxFridrichsContinuity.h
	examples/inviscid-flow/1d/LaxFridrichsEnergy.h
	examples/inviscid-flow/1d/LaxFridrichsMomentum.h
	examples/inviscid-flow/1d/eulerProblem_impl.h
	examples/inviscid-flow/2d/EulerPressureGetter.h
	examples/inviscid-flow/2d/EulerVelGetter.h
	examples/inviscid-flow/2d/EulerVelXGetter.h
	examples/inviscid-flow/2d/EulerVelYGetter.h
	examples/inviscid-flow/2d/LaxFridrichsContinuity.h
	examples/inviscid-flow/2d/LaxFridrichsEnergy.h
	examples/inviscid-flow/2d/LaxFridrichsMomentumX.h
	examples/inviscid-flow/2d/LaxFridrichsMomentumY.h
	examples/inviscid-flow/2d/euler.h
	examples/inviscid-flow/eulerProblem_impl.h
parents 93832a8f 28b18c26

examples/inviscid-flow/CompressibleConservativeVariables.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class CompressibleConservativeVariables 
{

   public:

      typedef Mesh MeshType;

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

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

      typedef typename MeshType::RealType RealType;

      typedef typename MeshType::DeviceType DeviceType;

      typedef typename MeshType::IndexType IndexType;

examples/inviscid-flow/LaxFridrichs.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ class LaxFridrichs 
      typedef typename Mesh::DeviceType DeviceType;

      typedef Index IndexType;

      typedef Functions::MeshFunction< Mesh > MeshFunctionType;

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

      static const int Dimensions = Mesh::getMeshDimension();

      typedef Functions::VectorField< Dimensions, MeshFunctionType > VectorFieldType;

 

      typedef LaxFridrichsContinuity< Mesh, Real, Index > ContinuityOperatorType;

examples/inviscid-flow/LaxFridrichsContinuity.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class LaxFridrichsContinuityBase 
      typedef typename MeshType::DeviceType DeviceType;

      typedef typename MeshType::CoordinatesType CoordinatesType;

      typedef Functions::MeshFunction< MeshType > MeshFunctionType;

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

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

      typedef Functions::VectorField< Dimensions, MeshFunctionType > VelocityFieldType;

      typedef SharedPointer< VelocityFieldType > VelocityFieldPointer;

examples/inviscid-flow/LaxFridrichsEnergy.h

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

      typedef typename MeshType::CoordinatesType CoordinatesType;

      typedef Functions::MeshFunction< MeshType > MeshFunctionType;

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

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

      typedef Functions::VectorField< Dimensions, MeshFunctionType > VelocityFieldType;

      typedef SharedPointer< MeshFunctionType > MeshFunctionPointer;

      typedef SharedPointer< VelocityFieldType > VelocityFieldPointer;

examples/inviscid-flow/LaxFridrichsMomentumBase.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ class LaxFridrichsMomentumBase 
      typedef typename MeshType::DeviceType DeviceType;

      typedef typename MeshType::CoordinatesType CoordinatesType;

      typedef Functions::MeshFunction< MeshType > MeshFunctionType;

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

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

      typedef Functions::VectorField< Dimensions, MeshFunctionType > VelocityFieldType;

      typedef SharedPointer< MeshFunctionType > MeshFunctionPointer;

      typedef SharedPointer< VelocityFieldType > VelocityFieldPointer;