Commit 7453b698 authored by Jan Schäfer's avatar Jan Schäfer
Browse files

navier stokes + tenzory 2D fixed

parent 86d5c272

examples/flow/1DBoundaryConditions.h→examples/flow/BoundaryConditionsBoiler.h

+25 −10
Original line number Diff line number Diff line 
#include <TNL/Functions/FunctionAdapter.h>



#include "1DDensityBoundaryCondition.h"

#include "1DMomentumXBoundaryCondition.h"

#include "1DMomentumYBoundaryCondition.h"

#include "1DEnergyBoundaryCondition.h"

#include "DensityBoundaryConditionBoiler.h"

#include "MomentumXBoundaryConditionBoiler.h"

#include "MomentumYBoundaryConditionBoiler.h"

#include "MomentumZBoundaryConditionBoiler.h"

#include "EnergyBoundaryConditionBoiler.h"



namespace TNL {
@@ -11,7 +12,7 @@ template< typename Mesh, 
          typename Function,

          typename Real = typename Mesh::RealType,

          typename Index = typename Mesh::IndexType >

class BoundaryConditions

class BoundaryConditionsBoiler

{

   public:

      typedef Mesh MeshType;
@@ -21,15 +22,17 @@ class BoundaryConditions 
      typedef Functions::MeshFunction< Mesh > MeshFunctionType;

      typedef typename Mesh::DeviceType DeviceType;



      typedef TNL::Operators::DensityBoundaryConditions< MeshType, FunctionType, RealType, IndexType > DensityBoundaryConditionsType;

      typedef TNL::Operators::MomentumXBoundaryConditions< MeshType, FunctionType, RealType, IndexType > MomentumXBoundaryConditionsType;

      typedef TNL::Operators::MomentumYBoundaryConditions< MeshType, FunctionType, RealType, IndexType > MomentumYBoundaryConditionsType;

      typedef TNL::Operators::EnergyBoundaryConditions< MeshType, FunctionType, RealType, IndexType > EnergyBoundaryConditionsType;

      typedef TNL::Operators::DensityBoundaryConditionsBoiler< MeshType, FunctionType, RealType, IndexType > DensityBoundaryConditionsType;

      typedef TNL::Operators::MomentumXBoundaryConditionsBoiler< MeshType, FunctionType, RealType, IndexType > MomentumXBoundaryConditionsType;

      typedef TNL::Operators::MomentumYBoundaryConditionsBoiler< MeshType, FunctionType, RealType, IndexType > MomentumYBoundaryConditionsType;

      typedef TNL::Operators::MomentumZBoundaryConditionsBoiler< MeshType, FunctionType, RealType, IndexType > MomentumZBoundaryConditionsType;

      typedef TNL::Operators::EnergyBoundaryConditionsBoiler< MeshType, FunctionType, RealType, IndexType > EnergyBoundaryConditionsType;

      typedef CompressibleConservativeVariables< MeshType > CompressibleConservativeVariablesType;



      typedef SharedPointer< DensityBoundaryConditionsType > DensityBoundaryConditionsTypePointer;

      typedef SharedPointer< MomentumXBoundaryConditionsType > MomentumXBoundaryConditionsTypePointer;

      typedef SharedPointer< MomentumYBoundaryConditionsType > MomentumYBoundaryConditionsTypePointer;

      typedef SharedPointer< MomentumZBoundaryConditionsType > MomentumZBoundaryConditionsTypePointer;

      typedef SharedPointer< EnergyBoundaryConditionsType > EnergyBoundaryConditionsTypePointer;

      typedef SharedPointer< CompressibleConservativeVariablesType > CompressibleConservativeVariablesPointer;

      typedef SharedPointer< MeshType > MeshPointer;
@@ -47,6 +50,7 @@ class BoundaryConditions 
         this->densityBoundaryConditionsPointer->setup( meshPointer, parameters, prefix);

         this->momentumXBoundaryConditionsPointer->setup( meshPointer, parameters, prefix);

         this->momentumYBoundaryConditionsPointer->setup( meshPointer, parameters, prefix);

         this->momentumZBoundaryConditionsPointer->setup( meshPointer, parameters, prefix);

         this->energyBoundaryConditionsPointer->setup( meshPointer, parameters, prefix);

         return true;

      }
@@ -56,6 +60,7 @@ class BoundaryConditions 
         this->densityBoundaryConditionsPointer->setCompressibleConservativeVariables(compressibleConservativeVariables);

         this->momentumXBoundaryConditionsPointer->setCompressibleConservativeVariables(compressibleConservativeVariables);

         this->momentumYBoundaryConditionsPointer->setCompressibleConservativeVariables(compressibleConservativeVariables);

         this->momentumZBoundaryConditionsPointer->setCompressibleConservativeVariables(compressibleConservativeVariables);

         this->energyBoundaryConditionsPointer->setCompressibleConservativeVariables(compressibleConservativeVariables);

      }
@@ -64,6 +69,7 @@ class BoundaryConditions 
         this->densityBoundaryConditionsPointer->setTimestep(timestep);

         this->momentumXBoundaryConditionsPointer->setTimestep(timestep);

         this->momentumYBoundaryConditionsPointer->setTimestep(timestep);

         this->momentumZBoundaryConditionsPointer->setTimestep(timestep);

         this->energyBoundaryConditionsPointer->setTimestep(timestep);   

      }
@@ -72,6 +78,7 @@ class BoundaryConditions 
         this->densityBoundaryConditionsPointer->setGamma(gamma);

         this->momentumXBoundaryConditionsPointer->setGamma(gamma);

         this->momentumYBoundaryConditionsPointer->setGamma(gamma);

         this->momentumZBoundaryConditionsPointer->setGamma(gamma);

         this->energyBoundaryConditionsPointer->setGamma(gamma);

      }
@@ -80,13 +87,15 @@ class BoundaryConditions 
         this->densityBoundaryConditionsPointer->setPressure(pressure);

         this->momentumXBoundaryConditionsPointer->setPressure(pressure);

         this->momentumYBoundaryConditionsPointer->setPressure(pressure);

         this->momentumZBoundaryConditionsPointer->setPressure(pressure);

         this->energyBoundaryConditionsPointer->setPressure(pressure);

      }



      void setCavitySpeed(const RealType cavitySpeed)

      void setSpeed(const RealType cavitySpeed)

      {

         this->momentumXBoundaryConditionsPointer->setCavitySpeed(cavitySpeed);

         this->momentumYBoundaryConditionsPointer->setCavitySpeed(cavitySpeed);

         this->momentumZBoundaryConditionsPointer->setCavitySpeed(cavitySpeed);

         this->energyBoundaryConditionsPointer->setCavitySpeed(cavitySpeed);

      }
@@ -105,6 +114,11 @@ class BoundaryConditions 
         return this->momentumYBoundaryConditionsPointer;

      }



      MomentumZBoundaryConditionsTypePointer& getMomentumZBoundaryCondition()

      {

         return this->momentumZBoundaryConditionsPointer;

      }



      EnergyBoundaryConditionsTypePointer& getEnergyBoundaryCondition()

      {

         return this->energyBoundaryConditionsPointer;
@@ -115,6 +129,7 @@ class BoundaryConditions 
      DensityBoundaryConditionsTypePointer densityBoundaryConditionsPointer;

      MomentumXBoundaryConditionsTypePointer momentumXBoundaryConditionsPointer;

      MomentumYBoundaryConditionsTypePointer momentumYBoundaryConditionsPointer;

      MomentumZBoundaryConditionsTypePointer momentumZBoundaryConditionsPointer;

      EnergyBoundaryConditionsTypePointer energyBoundaryConditionsPointer;



};

examples/flow/BoundaryConditionsCavity.h

0 → 100644
+137 −0
Original line number Diff line number Diff line 
#include <TNL/Functions/FunctionAdapter.h>



#include "DensityBoundaryConditionCavity.h"

#include "MomentumXBoundaryConditionCavity.h"

#include "MomentumYBoundaryConditionCavity.h"

#include "MomentumZBoundaryConditionCavity.h"

#include "EnergyBoundaryConditionCavity.h"



namespace TNL {



template< typename Mesh,

          typename Function,

          typename Real = typename Mesh::RealType,

          typename Index = typename Mesh::IndexType >

class BoundaryConditionsCavity

{

   public:

      typedef Mesh MeshType;

      typedef Real RealType;

      typedef Index IndexType;

      typedef Function FunctionType;

      typedef Functions::MeshFunction< Mesh > MeshFunctionType;

      typedef typename Mesh::DeviceType DeviceType;



      typedef TNL::Operators::DensityBoundaryConditionsCavity< MeshType, FunctionType, RealType, IndexType > DensityBoundaryConditionsType;

      typedef TNL::Operators::MomentumXBoundaryConditionsCavity< MeshType, FunctionType, RealType, IndexType > MomentumXBoundaryConditionsType;

      typedef TNL::Operators::MomentumYBoundaryConditionsCavity< MeshType, FunctionType, RealType, IndexType > MomentumYBoundaryConditionsType;

      typedef TNL::Operators::MomentumZBoundaryConditionsCavity< MeshType, FunctionType, RealType, IndexType > MomentumZBoundaryConditionsType;

      typedef TNL::Operators::EnergyBoundaryConditionsCavity< MeshType, FunctionType, RealType, IndexType > EnergyBoundaryConditionsType;

      typedef CompressibleConservativeVariables< MeshType > CompressibleConservativeVariablesType;



      typedef SharedPointer< DensityBoundaryConditionsType > DensityBoundaryConditionsTypePointer;

      typedef SharedPointer< MomentumXBoundaryConditionsType > MomentumXBoundaryConditionsTypePointer;

      typedef SharedPointer< MomentumYBoundaryConditionsType > MomentumYBoundaryConditionsTypePointer;

      typedef SharedPointer< MomentumZBoundaryConditionsType > MomentumZBoundaryConditionsTypePointer;

      typedef SharedPointer< EnergyBoundaryConditionsType > EnergyBoundaryConditionsTypePointer;

      typedef SharedPointer< CompressibleConservativeVariablesType > CompressibleConservativeVariablesPointer;

      typedef SharedPointer< MeshType > MeshPointer;

      typedef SharedPointer< MeshFunctionType, DeviceType > MeshFunctionPointer;



      static void configSetup( Config::ConfigDescription& config,

                               const String& prefix = "" )

      {

      }



      bool setup( const MeshPointer& meshPointer,

                  const Config::ParameterContainer& parameters,

                  const String& prefix = "" )

      {

         this->densityBoundaryConditionsPointer->setup( meshPointer, parameters, prefix);

         this->momentumXBoundaryConditionsPointer->setup( meshPointer, parameters, prefix);

         this->momentumYBoundaryConditionsPointer->setup( meshPointer, parameters, prefix);

         this->momentumZBoundaryConditionsPointer->setup( meshPointer, parameters, prefix);

         this->energyBoundaryConditionsPointer->setup( meshPointer, parameters, prefix);

         return true;

      }



      void setCompressibleConservativeVariables(const CompressibleConservativeVariablesPointer& compressibleConservativeVariables)

      {

         this->densityBoundaryConditionsPointer->setCompressibleConservativeVariables(compressibleConservativeVariables);

         this->momentumXBoundaryConditionsPointer->setCompressibleConservativeVariables(compressibleConservativeVariables);

         this->momentumYBoundaryConditionsPointer->setCompressibleConservativeVariables(compressibleConservativeVariables);

         this->momentumZBoundaryConditionsPointer->setCompressibleConservativeVariables(compressibleConservativeVariables);

         this->energyBoundaryConditionsPointer->setCompressibleConservativeVariables(compressibleConservativeVariables);

      }



      void setTimestep(const RealType timestep)

      {

         this->densityBoundaryConditionsPointer->setTimestep(timestep);

         this->momentumXBoundaryConditionsPointer->setTimestep(timestep);

         this->momentumYBoundaryConditionsPointer->setTimestep(timestep);

         this->momentumZBoundaryConditionsPointer->setTimestep(timestep);

         this->energyBoundaryConditionsPointer->setTimestep(timestep);   

      }



      void setGamma(const RealType gamma)

      {

         this->densityBoundaryConditionsPointer->setGamma(gamma);

         this->momentumXBoundaryConditionsPointer->setGamma(gamma);

         this->momentumYBoundaryConditionsPointer->setGamma(gamma);

         this->momentumZBoundaryConditionsPointer->setGamma(gamma);

         this->energyBoundaryConditionsPointer->setGamma(gamma);

      }



      void setPressure(const MeshFunctionPointer& pressure)

      {

         this->densityBoundaryConditionsPointer->setPressure(pressure);

         this->momentumXBoundaryConditionsPointer->setPressure(pressure);

         this->momentumYBoundaryConditionsPointer->setPressure(pressure);

         this->momentumZBoundaryConditionsPointer->setPressure(pressure);

         this->energyBoundaryConditionsPointer->setPressure(pressure);

      }



      void setSpeed(const RealType cavitySpeed)

      {

         this->momentumXBoundaryConditionsPointer->setCavitySpeed(cavitySpeed);

         this->momentumYBoundaryConditionsPointer->setCavitySpeed(cavitySpeed);

         this->momentumZBoundaryConditionsPointer->setCavitySpeed(cavitySpeed);

         this->energyBoundaryConditionsPointer->setCavitySpeed(cavitySpeed);

      }



      DensityBoundaryConditionsTypePointer& getDensityBoundaryCondition()

      {

         return this->densityBoundaryConditionsPointer;

      }



      MomentumXBoundaryConditionsTypePointer& getMomentumXBoundaryCondition()

      {

         return this->momentumXBoundaryConditionsPointer;

      }



      MomentumYBoundaryConditionsTypePointer& getMomentumYBoundaryCondition()

      {

         return this->momentumYBoundaryConditionsPointer;

      }



      MomentumZBoundaryConditionsTypePointer& getMomentumZBoundaryCondition()

      {

         return this->momentumZBoundaryConditionsPointer;

      }



      EnergyBoundaryConditionsTypePointer& getEnergyBoundaryCondition()

      {

         return this->energyBoundaryConditionsPointer;

      }





   protected:

      DensityBoundaryConditionsTypePointer densityBoundaryConditionsPointer;

      MomentumXBoundaryConditionsTypePointer momentumXBoundaryConditionsPointer;

      MomentumYBoundaryConditionsTypePointer momentumYBoundaryConditionsPointer;

      MomentumZBoundaryConditionsTypePointer momentumZBoundaryConditionsPointer;

      EnergyBoundaryConditionsTypePointer energyBoundaryConditionsPointer;



};



} //namespace TNL

examples/flow/DensityBoundaryConditionBoiler.h

0 → 100644
+542 −0

File added.

Preview size limit exceeded, changes collapsed.

examples/flow/1DDensityBoundaryCondition.h→examples/flow/DensityBoundaryConditionCavity.h

+22 −28
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ template< typename Mesh, 
          typename Function,

          typename Real = typename Mesh::RealType,

          typename Index = typename Mesh::GlobalIndexType >

class DensityBoundaryConditions

class DensityBoundaryConditionsCavity

{



};
@@ -29,7 +29,7 @@ class DensityBoundaryConditions 
 * Base

 */

template< typename Function >

class DensityBoundaryConditionsBase

class DensityBoundaryConditionsCavityBase

{

   public:
@@ -91,8 +91,8 @@ template< typename MeshReal, 
          typename Function,

          typename Real,

          typename Index >

class DensityBoundaryConditions< Meshes::Grid< 1, MeshReal, Device, MeshIndex >, Function, Real, Index >

   : public DensityBoundaryConditionsBase< Function >,

class DensityBoundaryConditionsCavity< Meshes::Grid< 1, MeshReal, Device, MeshIndex >, Function, Real, Index >

   : public DensityBoundaryConditionsCavityBase< Function >,

     public Operator< Meshes::Grid< 1, MeshReal, Device, MeshIndex >,

                         Functions::MeshBoundaryDomain,

                         1, 1,
@@ -111,8 +111,8 @@ class DensityBoundaryConditions< Meshes::Grid< 1, MeshReal, Device, MeshIndex >, 
   typedef Containers::Vector< RealType, DeviceType, IndexType> DofVectorType;

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

   typedef typename MeshType::CoordinatesType CoordinatesType;

   typedef DensityBoundaryConditions< MeshType, Function, Real, Index > ThisType;

   typedef DensityBoundaryConditionsBase< Function > BaseType;

   typedef DensityBoundaryConditionsCavity< MeshType, Function, Real, Index > ThisType;

   typedef DensityBoundaryConditionsCavityBase< Function > BaseType;

   typedef CompressibleConservativeVariables< MeshType > CompressibleConservativeVariablesType;

   typedef SharedPointer< CompressibleConservativeVariablesType > CompressibleConservativeVariablesPointer;

   typedef SharedPointer< MeshFunctionType, DeviceType > MeshFunctionPointer;
@@ -213,8 +213,8 @@ template< typename MeshReal, 
          typename Function,

          typename Real,

          typename Index >

class DensityBoundaryConditions< Meshes::Grid< 2, MeshReal, Device, MeshIndex >, Function, Real, Index >

   : public DensityBoundaryConditionsBase< Function >,

class DensityBoundaryConditionsCavity< Meshes::Grid< 2, MeshReal, Device, MeshIndex >, Function, Real, Index >

   : public DensityBoundaryConditionsCavityBase< Function >,

     public Operator< Meshes::Grid< 2, MeshReal, Device, MeshIndex >,

                         Functions::MeshBoundaryDomain,

                         2, 2,
@@ -234,8 +234,8 @@ class DensityBoundaryConditions< Meshes::Grid< 2, MeshReal, Device, MeshIndex >, 
      typedef Containers::Vector< RealType, DeviceType, IndexType> DofVectorType;

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

      typedef typename MeshType::CoordinatesType CoordinatesType;

      typedef DensityBoundaryConditions< MeshType, Function, Real, Index > ThisType;

      typedef DensityBoundaryConditionsBase< Function > BaseType;

      typedef DensityBoundaryConditionsCavity< MeshType, Function, Real, Index > ThisType;

      typedef DensityBoundaryConditionsCavityBase< Function > BaseType;

      typedef CompressibleConservativeVariables< MeshType > CompressibleConservativeVariablesType;

      typedef SharedPointer< CompressibleConservativeVariablesType > CompressibleConservativeVariablesPointer;

      typedef SharedPointer< MeshFunctionType, DeviceType > MeshFunctionPointer;
@@ -361,8 +361,8 @@ template< typename MeshReal, 
          typename Function,

          typename Real,

          typename Index >

class DensityBoundaryConditions< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, Function, Real, Index >

   : public DensityBoundaryConditionsBase< Function >,

class DensityBoundaryConditionsCavity< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, Function, Real, Index >

   : public DensityBoundaryConditionsCavityBase< Function >,

     public Operator< Meshes::Grid< 3, MeshReal, Device, MeshIndex >,

                         Functions::MeshBoundaryDomain,

                         3, 3,
@@ -381,8 +381,8 @@ class DensityBoundaryConditions< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, 
      typedef Containers::Vector< RealType, DeviceType, IndexType> DofVectorType;

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

      typedef typename MeshType::CoordinatesType CoordinatesType;

      typedef DensityBoundaryConditions< MeshType, Function, Real, Index > ThisType;

      typedef DensityBoundaryConditionsBase< Function > BaseType;   

      typedef DensityBoundaryConditionsCavity< MeshType, Function, Real, Index > ThisType;

      typedef DensityBoundaryConditionsCavityBase< Function > BaseType;   

      typedef CompressibleConservativeVariables< MeshType > CompressibleConservativeVariablesType;

      typedef SharedPointer< CompressibleConservativeVariablesType > CompressibleConservativeVariablesPointer;

      typedef SharedPointer< MeshFunctionType, DeviceType > MeshFunctionPointer;
@@ -399,34 +399,28 @@ class DensityBoundaryConditions< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, 
         const IndexType& index = entity.getIndex();

         if( entity.getCoordinates().x() == 0 )

         {

            return u[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ] + entity.getMesh().getSpaceSteps().x() *

               Functions::FunctionAdapter< MeshType, FunctionType >::getValue( this->function, entity, time );

            return u[ neighborEntities.template getEntityIndex< 0, 0, 0 >() ];

         }

         if( entity.getCoordinates().x() == entity.getMesh().getDimensions().x() - 1 )

         {

            return u[ neighborEntities.template getEntityIndex< -1, 0, 0 >() ] + entity.getMesh().getSpaceSteps().x() *

               Functions::FunctionAdapter< MeshType, FunctionType >::getValue( this->function, entity, time );

            return u[ neighborEntities.template getEntityIndex< 0, 0, 0 >() ];

         }

         if( entity.getCoordinates().y() == 0 )

         {

            return u[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ] + entity.getMesh().getSpaceSteps().y() *

               Functions::FunctionAdapter< MeshType, FunctionType >::getValue( this->function, entity, time );

            return u[ neighborEntities.template getEntityIndex< 0, 0, 0 >() ];

         }

         if( entity.getCoordinates().y() == entity.getMesh().getDimensions().y() - 1 )

         {

            return u[ neighborEntities.template getEntityIndex< 0, -1, 0 >() ] + entity.getMesh().getSpaceSteps().y() *

               Functions::FunctionAdapter< MeshType, FunctionType >::getValue( this->function, entity, time );

            return u[ neighborEntities.template getEntityIndex< 0, 0, 0 >() ];

         }

         if( entity.getCoordinates().z() == 0 )

         {

            return u[ neighborEntities.template getEntityIndex< 0, 0, 1 >() ] + entity.getMesh().getSpaceSteps().z() *

               Functions::FunctionAdapter< MeshType, FunctionType >::getValue( this->function, entity, time );

            return u[ neighborEntities.template getEntityIndex< 0, 0, 0 >() ];

         }

         // The following line is commented to avoid compiler warning

         //if( entity.getCoordinates().z() == entity.getMesh().getDimensions().z() - 1 )

         {

            return u[ neighborEntities.template getEntityIndex< 0, 0, -1 >() ] + entity.getMesh().getSpaceSteps().z() *

               Functions::FunctionAdapter< MeshType, FunctionType >::getValue( this->function, entity, time );

            return u[ neighborEntities.template getEntityIndex< 0, 0, 0 >() ];

         }   

      }
@@ -531,9 +525,9 @@ template< typename Mesh, 
          typename Function,

          typename Real,

          typename Index >

std::ostream& operator << ( std::ostream& str, const DensityBoundaryConditions< Mesh, Function, Real, Index >& bc )

std::ostream& operator << ( std::ostream& str, const DensityBoundaryConditionsCavity< Mesh, Function, Real, Index >& bc )

{

   str << "Neumann boundary conditions: function = " << bc.getFunction();

   str << "Neumann boundary ConditionsCavity: function = " << bc.getFunction();

   return str;

}

examples/flow/EnergyBoundaryConditionBoiler.h

0 → 100644
+854 −0

File added.

Preview size limit exceeded, changes collapsed.