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

found and resolved problem with 3D riemann initial condition setter

parent 35861927

src/Examples/flows/DifferentialOperators/Navier-Stokes/AUSM+/AUSMPlusEnergy.h

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ class AUSMPlusEnergy< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, OperatorRi 
                                   this->EnergyFlux( density_south , density_center, velocity_y_south , velocity_y_center, pressure_south , pressure_center, u[ south  ], u[ center ] )

                                -  this->EnergyFlux( density_center, density_north , velocity_y_center, velocity_y_north , pressure_center, pressure_north , u[ center ], u[ north  ] )

                             ) 

               + hyInverse * (

               + hzInverse * (

                                   this->EnergyFlux( density_down  , density_center, velocity_z_down  , velocity_z_center, pressure_down  , pressure_center, u[ down   ], u[ center ] )

                                -  this->EnergyFlux( density_center, density_up    , velocity_z_center, velocity_z_up    , pressure_center, pressure_up    , u[ center ], u[ up     ] )

                             )

src/Examples/flows/DifferentialOperators/Navier-Stokes/Lax-Friedrichs/LaxFridrichs.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ class LaxFridrichs 
                  const Config::ParameterContainer& parameters,

                  const String& prefix = "" )

      {

         std::cout << "Lax-Friedrich" << std::endl;

         std::cout << "Lax-Friedrichs" << std::endl;

         this->dynamicalViscosity = parameters.getParameter< double >( prefix + "dynamical-viscosity" );

         this->momentumXOperatorPointer->setDynamicalViscosity( dynamicalViscosity );

         this->momentumYOperatorPointer->setDynamicalViscosity( dynamicalViscosity );

src/Examples/flows/DifferentialOperators/Navier-Stokes/Steger-Warming/StegerWarmingEnergy.h

+5 −5
Original line number Diff line number Diff line
@@ -519,11 +519,11 @@ class StegerWarmingEnergy< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, Opera 
                                 - this->negativeEnergyFlux( density_center, velocity_y_center, velocity_x_center, velocity_z_center, pressure_center)

                                 + this->negativeEnergyFlux( density_north , velocity_y_north , velocity_x_north , velocity_z_north , pressure_north ) 

                             ) 

                -hyInverse * ( 

                                   this->positiveEnergyFlux( density_center, velocity_y_center, velocity_x_center, velocity_z_center, pressure_center)

                                 - this->positiveEnergyFlux( density_down  , velocity_y_down  , velocity_x_down  , velocity_z_down  , pressure_down  )

                                 - this->negativeEnergyFlux( density_center, velocity_y_center, velocity_x_center, velocity_z_center, pressure_center)

                                 + this->negativeEnergyFlux( density_up    , velocity_y_up    , velocity_x_up    , velocity_z_up    , pressure_up    ) 

                -hzInverse * ( 

                                   this->positiveEnergyFlux( density_center, velocity_z_center, velocity_x_center, velocity_y_center, pressure_center)

                                 - this->positiveEnergyFlux( density_down  , velocity_z_down  , velocity_x_down  , velocity_y_down  , pressure_down  )

                                 - this->negativeEnergyFlux( density_center, velocity_z_center, velocity_x_center, velocity_y_center, pressure_center)

                                 + this->negativeEnergyFlux( density_up    , velocity_z_up    , velocity_x_up    , velocity_y_up    , pressure_up    ) 

                             )

               +

                 this->rightHandSide(u, entity, time);

src/Examples/flows/DifferentialOperators/Navier-Stokes/VanLeer/VanLeerEnergy.h

+5 −5
Original line number Diff line number Diff line
@@ -551,11 +551,11 @@ class VanLeerEnergy< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, OperatorRig 
                                 - this->negativeEnergyFlux( density_center, velocity_y_center, velocity_x_center, velocity_z_center, pressure_center)

                                 + this->negativeEnergyFlux( density_north , velocity_y_north , velocity_x_north , velocity_z_north , pressure_north ) 

                             ) 

                -hyInverse * ( 

                                   this->positiveEnergyFlux( density_center, velocity_y_center, velocity_x_center, velocity_z_center, pressure_center)

                                 - this->positiveEnergyFlux( density_down  , velocity_y_down  , velocity_x_down  , velocity_z_down  , pressure_down  )

                                 - this->negativeEnergyFlux( density_center, velocity_y_center, velocity_x_center, velocity_z_center, pressure_center)

                                 + this->negativeEnergyFlux( density_up    , velocity_y_up    , velocity_x_up    , velocity_z_up    , pressure_up    ) 

                -hzInverse * ( 

                                   this->positiveEnergyFlux( density_center, velocity_z_center, velocity_x_center, velocity_y_center, pressure_center)

                                 - this->positiveEnergyFlux( density_down  , velocity_z_down  , velocity_x_down  , velocity_y_down  , pressure_down  )

                                 - this->negativeEnergyFlux( density_center, velocity_z_center, velocity_x_center, velocity_y_center, pressure_center)

                                 + this->negativeEnergyFlux( density_up    , velocity_z_up    , velocity_x_up    , velocity_y_up    , pressure_up    ) 

                             )

               +

                 this->rightHandSide(u, entity, time);

src/Examples/flows/RiemannProblemInitialCondition.h

+1 −5
Original line number Diff line number Diff line
@@ -919,7 +919,6 @@ class RiemannProblemInitialCondition 
               this->SEDPressure = parameters.getParameter< RealType >( prefix + "SED-pressure" );

               this->SEDEnergy = Energy( SEDDensity, SEDPressure, gamma, SEDVelocity);

               this->SEDMomentum = SEDVelocity * SEDDensity;

 

           }

         if(initial == prefix + "1D_2")

           predefinedInitialCondition( 1.4, 0.5, 0.0, 0.0, // double preGamma,       double preDiscX,       double preDiscY,       double preDiscZ,
@@ -1259,9 +1258,6 @@ class RiemannProblemInitialCondition 
         this->SEDEnergy = Energy( SEDDensity, SEDPressure, gamma, SEDVelocity); 

         this->SEDMomentum = SEDVelocity * SEDDensity;

 

         std::cout << this->SEDEnergy;

         std::cout << this->SWDEnergy;

 

      }



      PointType PointLoad( RealType ValueX, RealType ValueY, RealType ValueZ)
@@ -1291,7 +1287,7 @@ class RiemannProblemInitialCondition 
                    break;

            case 2: energy = (Pressure / (gamma -1.0) + 0.5 * Density * (std::pow(Velocity[ 0 ], 2 ) + std::pow(Velocity[ 1 ], 2 )));

                    break;

            case 3: energy = (Pressure / (gamma -1.0) + 0.5 * Density * (std::pow(Velocity[ 0 ], 2 ) + std::pow(Velocity[ 1 ], 2 ) + std::pow(Velocity[ 3 ], 2 )));

            case 3: energy = (Pressure / (gamma -1.0) + 0.5 * Density * (std::pow(Velocity[ 0 ], 2 ) + std::pow(Velocity[ 1 ], 2 ) + std::pow(Velocity[ 2 ], 2 )));

                    break; // druhou mocninu ps8t jako sou4in

         }

         return energy;