Commit 6b4d1c19 authored by Jan Schäfer's avatar Jan Schäfer
Browse files

Begin state

parent 92db5d55
Loading
Loading
Loading
Loading
+32 −32
Original line number Diff line number Diff line
@@ -268,6 +268,36 @@ class EnergyBoundaryConditionsCavity< Meshes::Grid< 2, MeshReal, Device, MeshInd
         const MeshType& mesh = entity.getMesh();
         const auto& neighborEntities = entity.getNeighborEntities();
         const IndexType& index = entity.getIndex();
         if( entity.getCoordinates().y() == entity.getMesh().getDimensions().y() - 1 )
         {
            return ( (* this->pressure)[ neighborEntities.template getEntityIndex< 0, -1 >() ]
                / ( this->gamma - 1 )
                )
                + 0.5
                * (* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, -1 >()]
                * (
                  this->cavitySpeed/*
                    * (
                        entity.getMesh().getDimensions().x() / 2 - std::abs( (entity.getCoordinates().x() - entity.getMesh().getDimensions().x() / 2 ) )
                      ) 
                   / ( entity.getMesh().getDimensions().x() / 2 )*/
                * 
                  this->cavitySpeed/*
                    * (
                        entity.getMesh().getDimensions().x() / 2 - std::abs( (entity.getCoordinates().x() - entity.getMesh().getDimensions().x() / 2 ) )
                      ) 
                   / ( entity.getMesh().getDimensions().x() / 2 )*/
                +
                  ( (* (* this->compressibleConservativeVariables->getMomentum())[ 1 ])[neighborEntities.template getEntityIndex< 0, 0 >()]
                  / (* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, 0 >()]
                  + 0
                  )
                * ( (* (* this->compressibleConservativeVariables->getMomentum())[ 1 ])[neighborEntities.template getEntityIndex< 0, 0 >()]
                  / (* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, 0 >()]
                  + 0
                  )
                );
         }
         if( entity.getCoordinates().x() == 0 )
         {
            return //u[ neighborEntities.template getEntityIndex< 0, 0 >() ];
@@ -307,7 +337,7 @@ class EnergyBoundaryConditionsCavity< Meshes::Grid< 2, MeshReal, Device, MeshInd
                  )
                );
         }
         if( entity.getCoordinates().y() == 0 )
         //if( entity.getCoordinates().y() == 0 )
         {
            return //u[ neighborEntities.template getEntityIndex< 0, 0 >() ];
                ( (* this->pressure)[ neighborEntities.template getEntityIndex< 0, 1 >() ]
@@ -327,36 +357,6 @@ class EnergyBoundaryConditionsCavity< Meshes::Grid< 2, MeshReal, Device, MeshInd
                );
         }
         // The following line is commented to avoid compiler warning         
         //if( entity.getCoordinates().y() == entity.getMesh().getDimensions().y() - 1 )
         {
            return ( (* this->pressure)[ neighborEntities.template getEntityIndex< 0, -1 >() ]
                / ( this->gamma - 1 )
                )
                + 0.5
                * (* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, -1 >()]
                * (
                  this->cavitySpeed/*
                    * (
                        entity.getMesh().getDimensions().x() / 2 - std::abs( (entity.getCoordinates().x() - entity.getMesh().getDimensions().x() / 2 ) )
                      ) 
                   / ( entity.getMesh().getDimensions().x() / 2 )*/
                * 
                  this->cavitySpeed/*
                    * (
                        entity.getMesh().getDimensions().x() / 2 - std::abs( (entity.getCoordinates().x() - entity.getMesh().getDimensions().x() / 2 ) )
                      ) 
                   / ( entity.getMesh().getDimensions().x() / 2 )*/
                +
                  ( (* (* this->compressibleConservativeVariables->getMomentum())[ 1 ])[neighborEntities.template getEntityIndex< 0, 0 >()]
                  / (* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, 0 >()]
                  + 0
                  )
                * ( (* (* this->compressibleConservativeVariables->getMomentum())[ 1 ])[neighborEntities.template getEntityIndex< 0, 0 >()]
                  / (* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, 0 >()]
                  + 0
                  )
                );
         }         
      }

      template< typename EntityType >
+15 −15
Original line number Diff line number Diff line
@@ -259,6 +259,18 @@ class MomentumXBoundaryConditionsCavity< Meshes::Grid< 2, MeshReal, Device, Mesh
         const MeshType& mesh = entity.getMesh();
         const auto& neighborEntities = entity.getNeighborEntities();
         const IndexType& index = entity.getIndex();
         if( entity.getCoordinates().y() == entity.getMesh().getDimensions().y() - 1 )
         {
            return (* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, -1 >()] 
              * ( 
                   ( this->cavitySpeed/* 
                    * (
                        entity.getMesh().getDimensions().x() / 2 - std::abs( (entity.getCoordinates().x() - entity.getMesh().getDimensions().x() / 2 ) )
                      ) 
                   / ( entity.getMesh().getDimensions().x() / 2 )*/
                 )
                );
         }
         if( entity.getCoordinates().x() == 0 )
         {
            return u[ neighborEntities.template getEntityIndex< 0, 0 >() ];
@@ -267,7 +279,7 @@ class MomentumXBoundaryConditionsCavity< Meshes::Grid< 2, MeshReal, Device, Mesh
         {
            return u[ neighborEntities.template getEntityIndex< 0, 0 >() ];
         }
         if( entity.getCoordinates().y() == 0 )
         //if( entity.getCoordinates().y() == 0 )
         {
            return u[ neighborEntities.template getEntityIndex< 0, 0 >() ];
                 /*(* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, 0 >()] 
@@ -277,18 +289,6 @@ class MomentumXBoundaryConditionsCavity< Meshes::Grid< 2, MeshReal, Device, Mesh
                );*/
         }
         // The following line is commented to avoid compiler warning         
         //if( entity.getCoordinates().y() == entity.getMesh().getDimensions().y() - 1 )
         {
            return (* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, -1 >()] 
              * ( 
                   ( this->cavitySpeed/* 
                    * (
                        entity.getMesh().getDimensions().x() / 2 - std::abs( (entity.getCoordinates().x() - entity.getMesh().getDimensions().x() / 2 ) )
                      ) 
                   / ( entity.getMesh().getDimensions().x() / 2 )*/
                 )
                );
         }         
      }

      template< typename EntityType >
@@ -444,7 +444,7 @@ class MomentumXBoundaryConditionsCavity< Meshes::Grid< 3, MeshReal, Device, Mesh
            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 )
         if( entity.getCoordinates().z() == entity.getMesh().getDimensions().z() - 1 )
         {
            return (* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, 0, 0 >()] 
              * ( 
+6 −6
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ class AUSMPlusMomentumX< Meshes::Grid< 2, MeshReal, Device, MeshIndex >, Operato
                               - this->MainMomentumFlux( density_center, density_east  , velocity_x_center, velocity_x_east  , pressure_center, pressure_east   )
                             )
               + hyInverse * ( 
                                 this->OtherMomentumFlux( density_south , density_center, velocity_x_south , velocity_x_center, velocity_y_south , velocity_y_center, pressure_south , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_north , velocity_x_center, velocity_x_north , velocity_y_center, velocity_y_north , pressure_center, pressure_north  )
                                 this->OtherMomentumFlux( density_south , density_center, velocity_y_south , velocity_y_center, velocity_x_south , velocity_x_center, pressure_south , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_north , velocity_y_center, velocity_y_north , velocity_x_center, velocity_x_north , pressure_center, pressure_north  )
                             )
               +
                 this->rightHandSide(u, entity, time);
@@ -364,12 +364,12 @@ class AUSMPlusMomentumX< Meshes::Grid< 3,MeshReal, Device, MeshIndex >, Operator
                               - this->MainMomentumFlux( density_center, density_east  , velocity_x_center, velocity_x_east  , pressure_center, pressure_east   )
                             )
               + hyInverse * ( 
                                 this->OtherMomentumFlux( density_south , density_center, velocity_x_south , velocity_x_center, velocity_y_south , velocity_y_center, pressure_south , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_north , velocity_x_center, velocity_x_north , velocity_y_center, velocity_y_north , pressure_center, pressure_north  )
                                 this->OtherMomentumFlux( density_south , density_center, velocity_y_south , velocity_y_center, velocity_x_south , velocity_x_center, pressure_south , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_north , velocity_y_center, velocity_y_north , velocity_x_center, velocity_x_north , pressure_center, pressure_north  )
                             )
               + hzInverse * ( 
                                 this->OtherMomentumFlux( density_down  , density_center, velocity_x_down  , velocity_x_center, velocity_z_down  , velocity_z_center, pressure_down  , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_up    , velocity_x_center, velocity_x_up    , velocity_z_center, velocity_z_up    , pressure_center, pressure_up     )
                                 this->OtherMomentumFlux( density_down  , density_center, velocity_z_down  , velocity_z_center, velocity_x_down  , velocity_x_center, pressure_down  , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_up    , velocity_z_center, velocity_z_up    , velocity_x_center, velocity_x_up    , pressure_center, pressure_up     )
                             )
               +
                 this->rightHandSide(u, entity, time);
+6 −6
Original line number Diff line number Diff line
@@ -178,8 +178,8 @@ class AUSMPlusMomentumY< Meshes::Grid< 2, MeshReal, Device, MeshIndex >, Operato
         const RealType& velocity_y_northWest = this->velocity.template getData< TNL::Devices::Host >()[ 1 ].template getData< DeviceType >()[ northWest ];         
         
         return  hxInverse * ( 
                                 this->OtherMomentumFlux( density_west  , density_center, velocity_y_west  , velocity_y_center, velocity_x_west  , velocity_x_center, pressure_west  , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_east  , velocity_y_center, velocity_y_east  , velocity_x_center, velocity_x_east  , pressure_center, pressure_east   )
                                 this->OtherMomentumFlux( density_west  , density_center, velocity_x_west  , velocity_x_center, velocity_y_west  , velocity_y_center, pressure_west  , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_east  , velocity_x_center, velocity_x_east  , velocity_y_center, velocity_y_east  , pressure_center, pressure_east   )
                             )
               + hyInverse * ( 
                                 this->MainMomentumFlux( density_south , density_center, velocity_y_south , velocity_y_center, pressure_south , pressure_center )
@@ -333,16 +333,16 @@ class AUSMPlusMomentumY< Meshes::Grid< 3,MeshReal, Device, MeshIndex >, Operator
         const RealType& velocity_z_downSouth = this->velocity.template getData< TNL::Devices::Host >()[ 2 ].template getData< DeviceType >()[ downSouth ];         

         return  hxInverse * ( 
                                 this->OtherMomentumFlux( density_west  , density_center, velocity_y_west  , velocity_y_center, velocity_x_west  , velocity_x_center, pressure_west  , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_east  , velocity_y_center, velocity_y_east  , velocity_x_center, velocity_x_east  , pressure_center, pressure_east   )
                                 this->OtherMomentumFlux( density_west  , density_center, velocity_x_west  , velocity_x_center, velocity_y_west  , velocity_y_center, pressure_west  , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_east  , velocity_x_center, velocity_x_east  , velocity_y_center, velocity_y_east  , pressure_center, pressure_east   )
                             )
               + hyInverse * ( 
                                 this->MainMomentumFlux( density_south , density_center, velocity_y_south , velocity_y_center, pressure_south , pressure_center )
                               - this->MainMomentumFlux( density_center, density_north , velocity_y_center, velocity_y_north , pressure_center, pressure_north  )
                             )
               + hzInverse * ( 
                                 this->OtherMomentumFlux( density_down  , density_center, velocity_y_down  , velocity_y_center, velocity_z_down  , velocity_z_center, pressure_down  , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_up    , velocity_y_center, velocity_y_up    , velocity_z_center, velocity_z_up    , pressure_center, pressure_up     )
                                 this->OtherMomentumFlux( density_down  , density_center, velocity_z_down  , velocity_z_center, velocity_y_down  , velocity_y_center, pressure_down  , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_up    , velocity_z_center, velocity_z_up    , velocity_y_center, velocity_y_up    , pressure_center, pressure_up     )
                             )
               +
                 this->rightHandSide(u, entity, time);
+4 −4
Original line number Diff line number Diff line
@@ -277,12 +277,12 @@ class AUSMPlusMomentumZ< Meshes::Grid< 3,MeshReal, Device, MeshIndex >, Operator
         const RealType& velocity_z_downSouth = this->velocity.template getData< TNL::Devices::Host >()[ 2 ].template getData< DeviceType >()[ downSouth ];         

         return  hxInverse * ( 
                                 this->OtherMomentumFlux( density_west  , density_center, velocity_z_west  , velocity_z_center, velocity_x_west  , velocity_x_center, pressure_west  , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_east  , velocity_z_center, velocity_z_east  , velocity_x_center, velocity_x_east  , pressure_center, pressure_east   )
                                 this->OtherMomentumFlux( density_west  , density_center, velocity_x_west  , velocity_x_center, velocity_z_west  , velocity_z_center, pressure_west  , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_east  , velocity_x_center, velocity_x_east  , velocity_z_center, velocity_z_east  , pressure_center, pressure_east   )
                             )
               + hyInverse * ( 
                                 this->OtherMomentumFlux( density_south , density_center, velocity_z_south , velocity_z_center, velocity_y_south , velocity_y_center, pressure_south , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_north , velocity_z_center, velocity_z_north , velocity_y_center, velocity_y_north , pressure_center, pressure_north  )
                                 this->OtherMomentumFlux( density_south , density_center, velocity_y_south , velocity_y_center, velocity_z_south , velocity_z_center, pressure_south , pressure_center )
                               - this->OtherMomentumFlux( density_center, density_north , velocity_y_center, velocity_y_north , velocity_z_center, velocity_z_north , pressure_center, pressure_north  )
                             )
               + hzInverse * ( 
                                 this->MainMomentumFlux( density_down  , density_center, velocity_z_down  , velocity_z_center, pressure_down  , pressure_center )
Loading