Commit 55c6d947 authored by Jan Schäfer's avatar Jan Schäfer
Browse files

AUSM+ misc bc fixes

parent 9bbc8924

src/Examples/flows/BoundaryConditions/BoilerModel/AUSMPlusEnergyBoundaryConditionBoilerModel.h

+7 −10
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ class AUSMPlusEnergyBoundaryConditionsBoilerModel< Meshes::Grid< 2, MeshReal, De 
               }

            return (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0 >() ]
@@ -449,7 +449,7 @@ class AUSMPlusEnergyBoundaryConditionsBoilerModel< Meshes::Grid< 2, MeshReal, De 
                        );

            return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1 >() ]
@@ -688,7 +688,7 @@ const RealType operator()( const MeshFunction& u, 
                         );

               return (  (

                         (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]

                         +

                         -

                         (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0, 0 >()]

                         *

                         std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]
@@ -698,7 +698,7 @@ const RealType operator()( const MeshFunction& u, 
               }

            return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0, 0 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]
@@ -770,9 +770,6 @@ const RealType operator()( const MeshFunction& u, 
                            * 

                            this->horizontalThrottleSpeed

                            );

               

               return (  (* this->pressure)[ neighborEntities.template getEntityIndex< -1, 0, 0 >() ]

                            / ( this->gamma - 1 ) );

// if for chimney exit

             }

             if( entity.getCoordinates().z() > 0.835 * ( entity.getMesh().getDimensions().z() - 1 ) )
@@ -868,7 +865,7 @@ const RealType operator()( const MeshFunction& u, 
               

               return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1, 0 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]
@@ -878,7 +875,7 @@ const RealType operator()( const MeshFunction& u, 
               }

            return (  (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1, 0 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]
@@ -986,7 +983,7 @@ const RealType operator()( const MeshFunction& u, 
                        );

            return (  (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 0, 1 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 2 ] )[neighborEntities.template getEntityIndex< 0, 0, 1 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 0, 1 >() ]

src/Examples/flows/BoundaryConditions/Cavity/AUSMPlusEnergyBoundaryConditionCavity.h

+5 −5
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ class AUSMPlusEnergyBoundaryConditionsCavity< Meshes::Grid< 2, MeshReal, Device, 
         {

            return (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0 >() ]
@@ -296,7 +296,7 @@ class AUSMPlusEnergyBoundaryConditionsCavity< Meshes::Grid< 2, MeshReal, Device, 
         {

            return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1 >() ]
@@ -462,7 +462,7 @@ class AUSMPlusEnergyBoundaryConditionsCavity< Meshes::Grid< 3, MeshReal, Device, 
         {

            return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0, 0 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]
@@ -487,7 +487,7 @@ class AUSMPlusEnergyBoundaryConditionsCavity< Meshes::Grid< 3, MeshReal, Device, 
            

            return (  (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1, 0 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]
@@ -512,7 +512,7 @@ class AUSMPlusEnergyBoundaryConditionsCavity< Meshes::Grid< 3, MeshReal, Device, 
         {     

            return (  (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 0, 1 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 2 ] )[neighborEntities.template getEntityIndex< 0, 0, 1 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 0, 1 >() ]

src/Examples/turbulent-flows/one-equation-model/BoundaryConditions/BoilerModel/AUSMPlusEnergyBoundaryConditionBoilerModel.h

+7 −10
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ class AUSMPlusEnergyBoundaryConditionsBoilerModel< Meshes::Grid< 2, MeshReal, De 
               }

            return (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0 >() ]
@@ -449,7 +449,7 @@ class AUSMPlusEnergyBoundaryConditionsBoilerModel< Meshes::Grid< 2, MeshReal, De 
                        );

            return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1 >() ]
@@ -688,7 +688,7 @@ const RealType operator()( const MeshFunction& u, 
                         );

               return (  (

                         (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]

                         +

                         -

                         (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0, 0 >()]

                         *

                         std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]
@@ -698,7 +698,7 @@ const RealType operator()( const MeshFunction& u, 
               }

            return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0, 0 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]
@@ -770,9 +770,6 @@ const RealType operator()( const MeshFunction& u, 
                            * 

                            this->horizontalThrottleSpeed

                            );

               

               return (  (* this->pressure)[ neighborEntities.template getEntityIndex< -1, 0, 0 >() ]

                            / ( this->gamma - 1 ) );

// if for chimney exit

             }

             if( entity.getCoordinates().z() > 0.835 * ( entity.getMesh().getDimensions().z() - 1 ) )
@@ -868,7 +865,7 @@ const RealType operator()( const MeshFunction& u, 
               

               return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1, 0 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]
@@ -878,7 +875,7 @@ const RealType operator()( const MeshFunction& u, 
               }

            return (  (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1, 0 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]
@@ -986,7 +983,7 @@ const RealType operator()( const MeshFunction& u, 
                        );

            return (  (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 0, 1 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 2 ] )[neighborEntities.template getEntityIndex< 0, 0, 1 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 0, 1 >() ]

src/Examples/turbulent-flows/one-equation-model/BoundaryConditions/Cavity/AUSMPlusEnergyBoundaryConditionCavity.h

+5 −5
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ class AUSMPlusEnergyBoundaryConditionsCavity< Meshes::Grid< 2, MeshReal, Device, 
         {

            return (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0 >() ]
@@ -296,7 +296,7 @@ class AUSMPlusEnergyBoundaryConditionsCavity< Meshes::Grid< 2, MeshReal, Device, 
         {

            return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1 >() ]
@@ -462,7 +462,7 @@ class AUSMPlusEnergyBoundaryConditionsCavity< Meshes::Grid< 3, MeshReal, Device, 
         {

            return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0, 0 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]
@@ -487,7 +487,7 @@ class AUSMPlusEnergyBoundaryConditionsCavity< Meshes::Grid< 3, MeshReal, Device, 
            

            return (  (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1, 0 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]
@@ -512,7 +512,7 @@ class AUSMPlusEnergyBoundaryConditionsCavity< Meshes::Grid< 3, MeshReal, Device, 
         {     

            return (  (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 0, 1 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 2 ] )[neighborEntities.template getEntityIndex< 0, 0, 1 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 0, 1 >() ]

src/Examples/turbulent-flows/two-equation-model/KEPsilon-model/BoundaryConditions/BoilerModel/AUSMPlusEnergyBoundaryConditionBoilerModel.h

+7 −10
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ class AUSMPlusEnergyBoundaryConditionsBoilerModel< Meshes::Grid< 2, MeshReal, De 
               }

            return (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0 >() ]
@@ -449,7 +449,7 @@ class AUSMPlusEnergyBoundaryConditionsBoilerModel< Meshes::Grid< 2, MeshReal, De 
                        );

            return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1 >() ]
@@ -688,7 +688,7 @@ const RealType operator()( const MeshFunction& u, 
                         );

               return (  (

                         (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]

                         +

                         -

                         (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0, 0 >()]

                         *

                         std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]
@@ -698,7 +698,7 @@ const RealType operator()( const MeshFunction& u, 
               }

            return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 0 ] )[neighborEntities.template getEntityIndex< 1, 0, 0 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 1, 0, 0 >() ]
@@ -770,9 +770,6 @@ const RealType operator()( const MeshFunction& u, 
                            * 

                            this->horizontalThrottleSpeed

                            );

               

               return (  (* this->pressure)[ neighborEntities.template getEntityIndex< -1, 0, 0 >() ]

                            / ( this->gamma - 1 ) );

// if for chimney exit

             }

             if( entity.getCoordinates().z() > 0.835 * ( entity.getMesh().getDimensions().z() - 1 ) )
@@ -868,7 +865,7 @@ const RealType operator()( const MeshFunction& u, 
               

               return (  (

                      (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]

                      +

                      -

                      (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1, 0 >()]

                      *

                      std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]
@@ -878,7 +875,7 @@ const RealType operator()( const MeshFunction& u, 
               }

            return (  (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 1 ] )[neighborEntities.template getEntityIndex< 0, 1, 0 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1, 0 >() ]
@@ -986,7 +983,7 @@ const RealType operator()( const MeshFunction& u, 
                        );

            return (  (

                   (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 0, 1 >() ]

                   +

                   -

                   (* ( *this->compressibleConservativeVariables->getMomentum() )[ 2 ] )[neighborEntities.template getEntityIndex< 0, 0, 1 >()]

                   *

                   std::sqrt( std::abs( this->gamma * (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 0, 1 >() ]