Commit e60319fe authored by Jan Schäfer's avatar Jan Schäfer Committed by Jakub Klinkovský
Browse files

minor repairs

parent 45714ea3

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

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ class MomentumXBoundaryConditionsBoilerModel< Meshes::Grid< 2, MeshReal, Device, 
         // The following line is commented to avoid compiler warning

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

         {

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

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

            /*return (* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, 0 >()] 

              * ( 

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

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

+4 −4
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ class MomentumZBoundaryConditionsBoilerModel< Meshes::Grid< 3, MeshReal, Device, 
               if( entity.getCoordinates().y() < 0.08 * std::cos( this->xYAngle ) * ( entity.getMesh().getDimensions().y() - 1 ) )

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

                         * ( 

                              this->horizontalThrottleSpeed

                              this->horizontalThrottleSpeed * ( -1.0 )

                              * std::sin( this->zAngle )

                            );

               if ( entity.getCoordinates().y() > ( 1 - 0.08 * std::sin( this->xYAngle ) ) * ( entity.getMesh().getDimensions().y() - 1 ) )
@@ -550,7 +550,7 @@ class MomentumZBoundaryConditionsBoilerModel< Meshes::Grid< 3, MeshReal, Device, 
               if( entity.getCoordinates().y() < 0.08 * std::sin( this->xYAngle ) * ( entity.getMesh().getDimensions().y() - 1 ) )

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

                         * ( 

                              this->horizontalThrottleSpeed

                              this->horizontalThrottleSpeed * ( -1.0 )

                              * std::sin( this->zAngle )

                            );

               if ( entity.getCoordinates().y() > ( 1 - 0.08 * std::cos( this->xYAngle ) ) * ( entity.getMesh().getDimensions().y() - 1 ) )
@@ -611,13 +611,13 @@ class MomentumZBoundaryConditionsBoilerModel< Meshes::Grid< 3, MeshReal, Device, 
               if( entity.getCoordinates().x() < 0.08 * std::sin( this->xYAngle ) * ( entity.getMesh().getDimensions().x() - 1 ) )

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

                         * ( 

                              this->horizontalThrottleSpeed

                              this->horizontalThrottleSpeed * ( -1.0 )

                              * std::sin( this->zAngle )

                            );

               if ( entity.getCoordinates().x() > ( 1 - 0.08 * std::cos( this->xYAngle ) ) * ( entity.getMesh().getDimensions().x() - 1 ) )

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

                         * ( 

                              this->horizontalThrottleSpeed

                              this->horizontalThrottleSpeed * ( -1.0 )

                              * std::sin( this->zAngle )

                            );

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

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

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ class MomentumXBoundaryConditionsBoilerModel< Meshes::Grid< 2, MeshReal, Device, 
         // The following line is commented to avoid compiler warning

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

         {

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

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

            /*return (* this->compressibleConservativeVariables->getDensity())[neighborEntities.template getEntityIndex< 0, 0 >()] 

              * ( 

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

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

+4 −4
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ class MomentumZBoundaryConditionsBoilerModel< Meshes::Grid< 3, MeshReal, Device, 
               if( entity.getCoordinates().y() < 0.08 * std::cos( this->xYAngle ) * ( entity.getMesh().getDimensions().y() - 1 ) )

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

                         * ( 

                              this->horizontalThrottleSpeed

                              this->horizontalThrottleSpeed * ( -1.0 )

                              * std::sin( this->zAngle )

                            );

               if ( entity.getCoordinates().y() > ( 1 - 0.08 * std::sin( this->xYAngle ) ) * ( entity.getMesh().getDimensions().y() - 1 ) )
@@ -550,7 +550,7 @@ class MomentumZBoundaryConditionsBoilerModel< Meshes::Grid< 3, MeshReal, Device, 
               if( entity.getCoordinates().y() < 0.08 * std::sin( this->xYAngle ) * ( entity.getMesh().getDimensions().y() - 1 ) )

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

                         * ( 

                              this->horizontalThrottleSpeed

                              this->horizontalThrottleSpeed * ( -1.0 )

                              * std::sin( this->zAngle )

                            );

               if ( entity.getCoordinates().y() > ( 1 - 0.08 * std::cos( this->xYAngle ) ) * ( entity.getMesh().getDimensions().y() - 1 ) )
@@ -611,13 +611,13 @@ class MomentumZBoundaryConditionsBoilerModel< Meshes::Grid< 3, MeshReal, Device, 
               if( entity.getCoordinates().x() < 0.08 * std::sin( this->xYAngle ) * ( entity.getMesh().getDimensions().x() - 1 ) )

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

                         * ( 

                              this->horizontalThrottleSpeed

                              this->horizontalThrottleSpeed * ( -1.0 )

                              * std::sin( this->zAngle )

                            );

               if ( entity.getCoordinates().x() > ( 1 - 0.08 * std::cos( this->xYAngle ) ) * ( entity.getMesh().getDimensions().x() - 1 ) )

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

                         * ( 

                              this->horizontalThrottleSpeed

                              this->horizontalThrottleSpeed * ( -1.0 )

                              * std::sin( this->zAngle )

                            );

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

src/Examples/turbulent-flows/one-equation-model/DifferentialOperatorsRightHandSide/PrandtlKolmogorovRightHandSide/PrandtlKolmogorovMomentumXOperatorRightHandSide.h

+5 −5
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ class PrandtlKolmogorovMomentumXRightHandSide< Meshes::Grid< 2, MeshReal, Device 
// t_11_x

                + ( 4.0 / 3.0 * ( turbulentViscosity_east * velocity_x_east - ( turbulentViscosity_east + turbulentViscosity_center) * velocity_x_center + turbulentViscosity_center * velocity_x_west 

                                ) * hxSquareInverse

                  - 2.0 / 3.0 * ( turbulentViscosity_east * ( velocity_y_northEast - velocity_y_southEast ) - turbulentViscosity_west * ( velocity_y_northWest + velocity_y_southWest ) 

                  - 2.0 / 3.0 * ( turbulentViscosity_east * ( velocity_y_northEast - velocity_y_southEast ) - turbulentViscosity_west * ( velocity_y_northWest - velocity_y_southWest ) 

                                ) * hxInverse * hyInverse / 4

                +

                  2.0 / 3.0 * ( density_east * turbulentEnergy_east
@@ -231,7 +231,7 @@ class PrandtlKolmogorovMomentumXRightHandSide< Meshes::Grid< 2, MeshReal, Device 
                              ) * hxInverse / 2

                  )

// t_21_y

                + ( ( turbulentViscosity_north * ( velocity_y_northEast - velocity_y_northWest ) - turbulentViscosity_south * ( velocity_y_southEast + velocity_y_southWest )

                + ( ( turbulentViscosity_north * ( velocity_y_northEast - velocity_y_northWest ) - turbulentViscosity_south * ( velocity_y_southEast - velocity_y_southWest )

                    ) * hxInverse * hyInverse / 4

                  + ( turbulentViscosity_north * velocity_x_north - ( turbulentViscosity_north + turbulentViscosity_center ) * velocity_x_center + turbulentViscosity_center * velocity_x_south

                    ) * hySquareInverse
@@ -403,9 +403,9 @@ class PrandtlKolmogorovMomentumXRightHandSide< Meshes::Grid< 3,MeshReal, Device, 
                +

                  ( 4.0 / 3.0 * ( turbulentViscosity_east * velocity_x_east - ( turbulentViscosity_east + turbulentViscosity_center ) * velocity_x_center + turbulentViscosity_center * velocity_x_west

                                ) * hxSquareInverse

                  - 2.0 / 3.0 * ( turbulentViscosity_east * ( velocity_y_northEast - velocity_y_southEast ) - turbulentViscosity_west * ( velocity_y_northWest + velocity_y_southWest )

                  - 2.0 / 3.0 * ( turbulentViscosity_east * ( velocity_y_northEast - velocity_y_southEast ) - turbulentViscosity_west * ( velocity_y_northWest - velocity_y_southWest )

                                ) * hxInverse * hyInverse / 4

                  - 2.0 / 3.0 * ( turbulentViscosity_east * (velocity_z_upEast - velocity_z_downEast ) - turbulentViscosity_west * ( velocity_z_upWest + velocity_z_downWest )

                  - 2.0 / 3.0 * ( turbulentViscosity_east * (velocity_z_upEast - velocity_z_downEast ) - turbulentViscosity_west * ( velocity_z_upWest - velocity_z_downWest )

                                ) * hxInverse * hzInverse / 4

                +

                  2.0 / 3.0 * ( density_east * turbulentEnergy_east
@@ -415,7 +415,7 @@ class PrandtlKolmogorovMomentumXRightHandSide< Meshes::Grid< 3,MeshReal, Device, 
// t_21_y

                + ( ( turbulentViscosity_north * ( velocity_y_northEast - velocity_y_northWest ) - turbulentViscosity_south * ( velocity_y_southEast - velocity_y_southWest )

                    ) * hxInverse * hyInverse / 4

                  + ( turbulentViscosity_north * velocity_x_north - ( turbulentViscosity_north - turbulentViscosity_center ) * velocity_x_center + turbulentViscosity_center * velocity_x_south

                  + ( turbulentViscosity_north * velocity_x_north - ( turbulentViscosity_north + turbulentViscosity_center ) * velocity_x_center + turbulentViscosity_center * velocity_x_south

                    ) * hySquareInverse

                  )

// t_31_z