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

Refactoring the inviscid flow solver.

parent f9b8c7a9

examples/inviscid-flow/1d/CMakeLists.txt

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
set( tnl_heat_equation_SOURCES     

     euler.cpp

     euler.cu )

               

IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE(tnl-euler-1d${debugExt} euler.cu)

   target_link_libraries (tnl-euler-1d${debugExt} tnl${debugExt}-${tnlVersion}  ${CUSPARSE_LIBRARY} )

ELSE(  BUILD_CUDA )               

   ADD_EXECUTABLE(tnl-euler-1d${debugExt} euler.cpp)     

   target_link_libraries (tnl-euler-1d${debugExt} tnl${debugExt}-${tnlVersion} )

ENDIF( BUILD_CUDA )





INSTALL( TARGETS tnl-euler-1d${debugExt}

         RUNTIME DESTINATION bin

         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

        

INSTALL( FILES tnl-run-euler-1d

               ${tnl_heat_equation_SOURCES}

         DESTINATION share/tnl-${tnlVersion}/examples/inviscid-flow-1d )

examples/inviscid-flow/1d/EulerPressureGetter.h

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
#ifndef EulerPressureGetter_H

#define EulerPressureGetter_H



#include <TNL/Containers/Vector.h>

#include <TNL/Meshes/Grid.h>

#include <TNL/Functions/Domain.h>



namespace TNL {



template< typename Mesh,

          typename Real = typename Mesh::RealType,

          typename Index = typename Mesh::IndexType >

class EulerPressureGetter

: public Functions::Domain< Mesh::getMeshDimensions(), Functions::MeshDomain >

{

   public:

      

      typedef Mesh MeshType;

      typedef typename MeshType::DeviceType DeviceType;

      typedef Real RealType;

      typedef Index IndexType;

      typedef Functions::MeshFunction< MeshType > MeshFunctionType;

      enum { Dimensions = MeshType::getMeshDimensions() };



      static String getType();

      

      EulerPressureGetter( const MeshFunctionType& velocity,

                           const MeshFunctionType& rhoVel,

                           const MeshFunctionType& energy,

                           const RealType& gamma )

      : rho( rho ), rhoVel( rhoVel ), energy( energy ), gamma( gamma )

      {}



      template< typename MeshEntity >

      __cuda_callable__

      Real operator()( const MeshEntity& entity,

                       const RealType& time = 0.0 ) const

      {

         return this->operator[]( entity.getIndex() );

      }

      

      __cuda_callable__

      Real operator[]( const IndexType& idx ) const

      {

         return ( this->gamma - 1.0 ) * ( this->energy[ idx ] - 0.5 * this->rhoVel[ idx ] * this->rhoVel[ idx ] / this->rho[ idx ]);

      }



      

   protected:

      

      Real gamma;

      

      const MeshFunctionType& rho;

      

      const MeshFunctionType& rhoVel;

      

      const MeshFunctionType& energy;



};



} //namespace TNL



#endif	/* EulerPressureGetter_H */

examples/inviscid-flow/1d/EulerVelGetter.h

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
#ifndef EulerVelGetter_H

#define EulerVelGetter_H



#include <TNL/Containers/Vector.h>

#include <TNL/Meshes/Grid.h>



namespace TNL {



template< typename Mesh,

          typename Real = typename Mesh::RealType,

          typename Index = typename Mesh::IndexType >

class EulerVelGetter

: public Functions::Domain< Mesh::getMeshDimensions(), Functions::MeshDomain >

{

   public:

      

      typedef Mesh MeshType;

      typedef typename MeshType::DeviceType DeviceType;

      typedef Real RealType;

      typedef Index IndexType;

      typedef Functions::MeshFunction< MeshType > MeshFunctionType;

      enum { Dimensions = MeshType::getMeshDimensions() };



      static String getType();

      

      EulerVelGetter( const MeshFunctionType& rho,

                      const MeshFunctionType& rhoVel)

      : rho( rho ), rhoVel( rhoVel )

      {}



      template< typename MeshEntity >

      __cuda_callable__

      Real operator()( const MeshEntity& entity,

                       const RealType& time = 0.0 ) const

      {

         return this->operator[]( entity.getIndex() );

      }

      

      __cuda_callable__

      Real operator[]( const IndexType& idx ) const

      {

         return this->rho[ idx ] / this->rhoVel[ idx ];

      }



      

   protected:

      

      const MeshFunctionType& rho;

      

      const MeshFunctionType& rhoVel;



};



} // namespace TNL



#endif	/* EulerVelGetter_H */

examples/inviscid-flow/1d/LaxFridrichs.h

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
#ifndef LaxFridrichs_H

#define LaxFridrichs_H



#include <TNL/Containers/Vector.h>

#include <TNL/Meshes/Grid.h>



#include "LaxFridrichsContinuity.h"

#include "LaxFridrichsMomentum.h"

#include "LaxFridrichsEnergy.h"

#include "EulerVelGetter.h"

#include "EulerPressureGetter.h"



namespace TNL {



template< typename Mesh,

          typename Real = typename Mesh::RealType,

          typename Index = typename Mesh::IndexType >

class LaxFridrichs

{

   public:

      typedef Real RealType;

      typedef typename Mesh::DeviceType DeviceType;

      typedef Index IndexType;

      typedef Functions::MeshFunction< Mesh > MeshFunctionType;

 

      typedef LaxFridrichsContinuity< Mesh, Real, Index > Continuity;

      typedef LaxFridrichsMomentum< Mesh, Real, Index > Momentum;

      typedef LaxFridrichsEnergy< Mesh, Real, Index > Energy;

      typedef EulerVelGetter< Mesh, Real, Index > Velocity;

      typedef EulerPressureGetter< Mesh, Real, Index > Pressure;

   

};



} // namespace TNL



#endif	/* LaxFridrichs_H */

examples/inviscid-flow/1d/LaxFridrichsContinuity_impl.h

deleted100644 → 0
+0 −345
Original line number Diff line number Diff line 
#ifndef LaxFridrichsContinuity_IMPL_H

#define LaxFridrichsContinuity_IMPL_H



namespace TNL {



/****

 * 1D problem

 */

template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

String

LaxFridrichsContinuity< Meshes::Grid< 1, MeshReal, Device, MeshIndex >, Real, Index >::

getType()

{

   return String( "LaxFridrichsContinuity< " ) +

          MeshType::getType() + ", " +

         TNL::getType< Real >() + ", " +

         TNL::getType< Index >() + " >";

}



template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

template< typename MeshFunction, typename MeshEntity >

__cuda_callable__

Real

LaxFridrichsContinuity< Meshes::Grid< 1, MeshReal, Device, MeshIndex >, Real, Index >::

operator()( const MeshFunction& u,

            const MeshEntity& entity,

            const Real& time ) const

{

    static_assert( MeshEntity::entityDimensions == 1, "Wrong mesh entity dimensions." ); 

    static_assert( MeshFunction::getEntitiesDimensions() == 1, "Wrong preimage function" ); 

    const typename MeshEntity::template NeighbourEntities< 1 >& neighbourEntities = entity.getNeighbourEntities(); 



    //rho

    const RealType& hxInverse = entity.getMesh().template getSpaceStepsProducts< -1 >(); 

    const IndexType& center = entity.getIndex(); 

    const IndexType& east = neighbourEntities.template getEntityIndex< 1 >(); 

    const IndexType& west = neighbourEntities.template getEntityIndex< -1 >();

    return (0.5 * this->tau) * ( u[ west ] - 2.0 * u[ center ]  + u[ east ] ) 

          - 0.5 * hxInverse * ( u[ west ] * this->velocity[ west ] - u[ east ] * this->velocity[ east ] );

}



template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

template< typename MeshEntity >

__cuda_callable__

Index

LaxFridrichsContinuity< Meshes::Grid< 1, MeshReal, Device, MeshIndex >, Real, Index >::

getLinearSystemRowLength( const MeshType& mesh,

                          const IndexType& index,

                          const MeshEntity& entity ) const

{

   /****

    * Return a number of non-zero elements in a line (associated with given grid element) of

    * the linear system.

    * The following example is the Laplace operator approximated 

    * by the Finite difference method.

    */



   return 2*Dimensions + 1;

}



template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

   template< typename MeshEntity, typename Vector, typename MatrixRow >

__cuda_callable__

void

LaxFridrichsContinuity< Meshes::Grid< 1, MeshReal, Device, MeshIndex >, Real, Index >::

updateLinearSystem( const RealType& time,

                    const RealType& tau,

                    const MeshType& mesh,

                    const IndexType& index,

                    const MeshEntity& entity,

                    const MeshFunctionType& u,

                    Vector& b,

                    MatrixRow& matrixRow ) const

{

   /****

    * Setup the non-zero elements of the linear system here.

    * The following example is the Laplace operator appriximated 

    * by the Finite difference method.

    */



    const typename MeshEntity::template NeighbourEntities< 1 >& neighbourEntities = entity.getNeighbourEntities(); 

   const RealType& lambdaX = tau * entity.getMesh().template getSpaceStepsProducts< -2 >(); 

   const IndexType& center = entity.getIndex(); 

   const IndexType& east = neighbourEntities.template getEntityIndex< 1 >(); 

   const IndexType& west = neighbourEntities.template getEntityIndex< -1 >(); 

   matrixRow.setElement( 0, west,   - lambdaX );

   matrixRow.setElement( 1, center, 2.0 * lambdaX );

   matrixRow.setElement( 2, east,   - lambdaX );

}



/****

 * 2D problem

 */

template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

String

LaxFridrichsContinuity< Meshes::Grid< 2, MeshReal, Device, MeshIndex >, Real, Index >::

getType()

{

   return String( "LaxFridrichsContinuity< " ) +

          MeshType::getType() + ", " +

         TNL::getType< Real >() + ", " +

         TNL::getType< Index >() + " >";

}



template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

template< typename MeshFunction, typename MeshEntity >

__cuda_callable__

Real

LaxFridrichsContinuity< Meshes::Grid< 2, MeshReal, Device, MeshIndex >, Real, Index >::

operator()( const MeshFunction& u,

            const MeshEntity& entity,

            const Real& time ) const

{

   /****

    * Implement your explicit form of the differential operator here.

    * The following example is the Laplace operator approximated 

    * by the Finite difference method.

    */

    static_assert( MeshEntity::entityDimensions == 2, "Wrong mesh entity dimensions." ); 

    static_assert( MeshFunction::getEntitiesDimensions() == 2, "Wrong preimage function" ); 

    const typename MeshEntity::template NeighbourEntities< 2 >& neighbourEntities = entity.getNeighbourEntities(); 



   const RealType& hxSquareInverse = entity.getMesh().template getSpaceStepsProducts< -2, 0 >(); 

   const RealType& hySquareInverse = entity.getMesh().template getSpaceStepsProducts< 0, -2 >(); 

   const IndexType& center = entity.getIndex(); 

   const IndexType& east  = neighbourEntities.template getEntityIndex<  1,  0 >(); 

   const IndexType& west  = neighbourEntities.template getEntityIndex< -1,  0 >(); 

   const IndexType& north = neighbourEntities.template getEntityIndex<  0,  1 >(); 

   const IndexType& south = neighbourEntities.template getEntityIndex<  0, -1 >(); 

   return ( u[ west ] - 2.0 * u[ center ] + u[ east ]  ) * hxSquareInverse +

          ( u[ south ] - 2.0 * u[ center ] + u[ north ] ) * hySquareInverse;

}



template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

template< typename MeshEntity >

__cuda_callable__

Index

LaxFridrichsContinuity< Meshes::Grid< 2, MeshReal, Device, MeshIndex >, Real, Index >::

getLinearSystemRowLength( const MeshType& mesh,

                          const IndexType& index,

                          const MeshEntity& entity ) const

{

   /****

    * Return a number of non-zero elements in a line (associated with given grid element) of

    * the linear system.

    * The following example is the Laplace operator approximated 

    * by the Finite difference method.

    */



   return 2*Dimensions + 1;

}



template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

   template< typename MeshEntity, typename Vector, typename MatrixRow >

__cuda_callable__

void

LaxFridrichsContinuity< Meshes::Grid< 2, MeshReal, Device, MeshIndex >, Real, Index >::

updateLinearSystem( const RealType& time,

                    const RealType& tau,

                    const MeshType& mesh,

                    const IndexType& index,

                    const MeshEntity& entity,

                    const MeshFunctionType& u,

                    Vector& b,

                    MatrixRow& matrixRow ) const

{

   /****

    * Setup the non-zero elements of the linear system here.

    * The following example is the Laplace operator appriximated 

    * by the Finite difference method.

    */



    const typename MeshEntity::template NeighbourEntities< 2 >& neighbourEntities = entity.getNeighbourEntities(); 

   const RealType& lambdaX = tau * entity.getMesh().template getSpaceStepsProducts< -2, 0 >(); 

   const RealType& lambdaY = tau * entity.getMesh().template getSpaceStepsProducts< 0, -2 >(); 

   const IndexType& center = entity.getIndex(); 

   const IndexType& east  = neighbourEntities.template getEntityIndex<  1,  0 >(); 

   const IndexType& west  = neighbourEntities.template getEntityIndex< -1,  0 >(); 

   const IndexType& north = neighbourEntities.template getEntityIndex<  0,  1 >(); 

   const IndexType& south = neighbourEntities.template getEntityIndex<  0, -1 >(); 

   matrixRow.setElement( 0, south,  -lambdaY );

   matrixRow.setElement( 1, west,   -lambdaX );

   matrixRow.setElement( 2, center, 2.0 * ( lambdaX + lambdaY ) );

   matrixRow.setElement( 3, east,   -lambdaX );

   matrixRow.setElement( 4, north,  -lambdaY );

}



/****

 * 3D problem

 */

template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

String

LaxFridrichsContinuity< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, Real, Index >::

getType()

{

   return String( "LaxFridrichsContinuity< " ) +

          MeshType::getType() + ", " +

         TNL::getType< Real >() + ", " +

         TNL::getType< Index >() + " >";

}



template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

template< typename MeshFunction, typename MeshEntity >

__cuda_callable__

Real

LaxFridrichsContinuity< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, Real, Index >::

operator()( const MeshFunction& u,

            const MeshEntity& entity,

            const Real& time ) const

{

   /****

    * Implement your explicit form of the differential operator here.

    * The following example is the Laplace operator approximated 

    * by the Finite difference method.

    */

    static_assert( MeshEntity::entityDimensions == 3, "Wrong mesh entity dimensions." ); 

    static_assert( MeshFunction::getEntitiesDimensions() == 3, "Wrong preimage function" ); 

    const typename MeshEntity::template NeighbourEntities< 3 >& neighbourEntities = entity.getNeighbourEntities(); 



   const RealType& hxSquareInverse = entity.getMesh().template getSpaceStepsProducts< -2,  0,  0 >(); 

   const RealType& hySquareInverse = entity.getMesh().template getSpaceStepsProducts<  0, -2,  0 >(); 

   const RealType& hzSquareInverse = entity.getMesh().template getSpaceStepsProducts<  0,  0, -2 >(); 

   const IndexType& center = entity.getIndex(); 

   const IndexType& east  = neighbourEntities.template getEntityIndex<  1,  0,  0 >(); 

   const IndexType& west  = neighbourEntities.template getEntityIndex< -1,  0,  0 >(); 

   const IndexType& north = neighbourEntities.template getEntityIndex<  0,  1,  0 >(); 

   const IndexType& south = neighbourEntities.template getEntityIndex<  0, -1,  0 >(); 

   const IndexType& up    = neighbourEntities.template getEntityIndex<  0,  0,  1 >(); 

   const IndexType& down  = neighbourEntities.template getEntityIndex<  0,  0, -1 >(); 

   return ( u[ west ] - 2.0 * u[ center ] + u[ east ]  ) * hxSquareInverse +

          ( u[ south ] - 2.0 * u[ center ] + u[ north ] ) * hySquareInverse +

          ( u[ up ] - 2.0 * u[ center ] + u[ down ] ) * hzSquareInverse;

}



template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

template< typename MeshEntity >

__cuda_callable__

Index

LaxFridrichsContinuity< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, Real, Index >::

getLinearSystemRowLength( const MeshType& mesh,

                          const IndexType& index,

                          const MeshEntity& entity ) const

{

   /****

    * Return a number of non-zero elements in a line (associated with given grid element) of

    * the linear system.

    * The following example is the Laplace operator approximated 

    * by the Finite difference method.

    */



   return 2*Dimensions + 1;

}



template< typename MeshReal,

          typename Device,

          typename MeshIndex,

          typename Real,

          typename Index >

   template< typename MeshEntity, typename Vector, typename MatrixRow >

__cuda_callable__

void

LaxFridrichsContinuity< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, Real, Index >::

updateLinearSystem( const RealType& time,

                    const RealType& tau,

                    const MeshType& mesh,

                    const IndexType& index,

                    const MeshEntity& entity,

                    const MeshFunctionType& u,

                    Vector& b,

                    MatrixRow& matrixRow ) const

{

   /****

    * Setup the non-zero elements of the linear system here.

    * The following example is the Laplace operator appriximated 

    * by the Finite difference method.

    */



    const typename MeshEntity::template NeighbourEntities< 3 >& neighbourEntities = entity.getNeighbourEntities(); 

   const RealType& lambdaX = tau * entity.getMesh().template getSpaceStepsProducts< -2,  0,  0 >(); 

   const RealType& lambdaY = tau * entity.getMesh().template getSpaceStepsProducts<  0, -2,  0 >(); 

   const RealType& lambdaZ = tau * entity.getMesh().template getSpaceStepsProducts<  0,  0, -2 >(); 

   const IndexType& center = entity.getIndex(); 

   const IndexType& east  = neighbourEntities.template getEntityIndex<  1,  0,  0 >(); 

   const IndexType& west  = neighbourEntities.template getEntityIndex< -1,  0,  0 >(); 

   const IndexType& north = neighbourEntities.template getEntityIndex<  0,  1,  0 >(); 

   const IndexType& south = neighbourEntities.template getEntityIndex<  0, -1,  0 >(); 

   const IndexType& up    = neighbourEntities.template getEntityIndex<  0,  0,  1 >(); 

   const IndexType& down  = neighbourEntities.template getEntityIndex<  0,  0, -1 >(); 

   matrixRow.setElement( 0, down,   -lambdaZ );

   matrixRow.setElement( 1, south,  -lambdaY );

   matrixRow.setElement( 2, west,   -lambdaX );

   matrixRow.setElement( 3, center, 2.0 * ( lambdaX + lambdaY + lambdaZ ) );

   matrixRow.setElement( 4, east,   -lambdaX );

   matrixRow.setElement( 5, north,  -lambdaY );

   matrixRow.setElement( 6, up,     -lambdaZ );

}



} // namespace TNL



#endif	/* LaxFridrichsContinuityIMPL_H */