code refactoring (5eb0ce30) · Commits · TNL / tnl-dev

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -74,8 +74,8 @@ class AUSMPlusContinuityBase
		const RealType& LeftPressure,
		const RealType& RightPressure ) const
		{
		const RealType& LeftSpeedOfSound = std::sqrt( this->gamma * LeftPressure / LeftDensity );
		const RealType& RightSpeedOfSound = std::sqrt( this->gamma * RightPressure / RightDensity );
		const RealType& LeftSpeedOfSound = std::sqrt( std::abs( this->gamma * LeftPressure / LeftDensity ) );
		const RealType& RightSpeedOfSound = std::sqrt( std::abs( this->gamma * RightPressure / RightDensity ) );
		const RealType& BorderSpeedOfSound = 0.5 * ( LeftSpeedOfSound + RightSpeedOfSound );
		const RealType& LeftMachNumber = LeftVelocity / BorderSpeedOfSound;
		const RealType& RightMachNumber = RightVelocity / BorderSpeedOfSound;
		@@ -89,7 +89,7 @@ class AUSMPlusContinuityBase
		}
		else if ( LeftMachNumber <= 1.0 )
		{
		MachSplitingPlus = 1.0 / 2.0 * ( LeftMachNumber + 1.0 ) * ( LeftMachNumber + 1.0 )
		MachSplitingPlus = 1.0 / 4.0 * ( LeftMachNumber + 1.0 ) * ( LeftMachNumber + 1.0 )
		+ 1.0 / 8.0 * ( LeftMachNumber * LeftMachNumber - 1.0 ) * ( LeftMachNumber * LeftMachNumber - 1.0 );
		}
		else
		@@ -102,7 +102,7 @@ class AUSMPlusContinuityBase
		}
		else if ( RightMachNumber <= 1.0 )
		{
		MachSplitingMinus = - 1.0 / 2.0 * ( RightMachNumber - 1.0 ) * ( RightMachNumber - 1.0 )
		MachSplitingMinus = - 1.0 / 4.0 * ( RightMachNumber - 1.0 ) * ( RightMachNumber - 1.0 )
		- 1.0 / 8.0 * ( RightMachNumber * RightMachNumber - 1.0 ) * ( RightMachNumber * RightMachNumber - 1.0 );
		}
		else
		@@ -272,8 +272,8 @@ class AUSMPlusContinuity< Meshes::Grid< 2, MeshReal, Device, MeshIndex >, Operat
		- this->DensityFlux( u[ center ], u[ east ] , velocity_x_center, velocity_x_east , pressure_center, pressure_east )
		)
		+ hyInverse * (
		this->DensityFlux( u[ north ], u[ center ], velocity_y_north , velocity_y_center, pressure_north , pressure_center )
		- this->DensityFlux( u[ center ], u[ south ] , velocity_y_center, velocity_y_south , pressure_center, pressure_south )
		this->DensityFlux( u[ south ] , u[ center ], velocity_y_south , velocity_y_center, pressure_south , pressure_center )
		- this->DensityFlux( u[ center ], u[ north ] , velocity_y_center, velocity_y_north , pressure_center, pressure_north )
		)
		+
		this->rightHandSide(u, entity, time);
		@@ -367,12 +367,12 @@ class AUSMPlusContinuity< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, Operat
		- this->DensityFlux( u[ center ], u[ east ] , velocity_x_center, velocity_x_east , pressure_center, pressure_east )
		)
		+ hyInverse * (
		this->DensityFlux( u[ north ] , u[ center ], velocity_y_north , velocity_y_center, pressure_north , pressure_center )
		- this->DensityFlux( u[ center ], u[ south ] , velocity_y_center, velocity_y_south , pressure_center, pressure_south )
		this->DensityFlux( u[ south ] , u[ center ], velocity_y_south , velocity_y_center, pressure_south , pressure_center )
		- this->DensityFlux( u[ center ], u[ north ] , velocity_y_center, velocity_y_north , pressure_center, pressure_north )
		)
		+ hzInverse * (
		this->DensityFlux( u[ up ] , u[ center ], velocity_z_up , velocity_z_center, pressure_up , pressure_center )
		- this->DensityFlux( u[ center ], u[ down ] , velocity_z_center, velocity_z_down , pressure_center, pressure_down )
		this->DensityFlux( u[ down ] , u[ center ], velocity_z_down , velocity_z_center, pressure_down , pressure_center )
		- this->DensityFlux( u[ center ], u[ up ] , velocity_z_center, velocity_z_up , pressure_center, pressure_up )
		)
		+
		this->rightHandSide(u, entity, time);

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -92,8 +92,8 @@ class AUSMPlusEnergyBase
		const RealType& LeftEnergy,
		const RealType& RightEnergy ) const
		{
		const RealType& LeftSpeedOfSound = std::sqrt( this->gamma * LeftPressure / LeftDensity );
		const RealType& RightSpeedOfSound = std::sqrt( this->gamma * RightPressure / RightDensity );
		const RealType& LeftSpeedOfSound = std::sqrt( std::abs( this->gamma * LeftPressure / LeftDensity ) );
		const RealType& RightSpeedOfSound = std::sqrt( std::abs( this->gamma * RightPressure / RightDensity ) );
		const RealType& BorderSpeedOfSound = 0.5 * ( LeftSpeedOfSound + RightSpeedOfSound );
		const RealType& LeftMachNumber = LeftVelocity / BorderSpeedOfSound;
		const RealType& RightMachNumber = RightVelocity / BorderSpeedOfSound;
		@@ -107,7 +107,7 @@ class AUSMPlusEnergyBase
		}
		else if ( LeftMachNumber <= 1.0 )
		{
		MachSplitingPlus = 1.0 / 2.0 * ( LeftMachNumber + 1.0 ) * ( LeftMachNumber + 1.0 )
		MachSplitingPlus = 1.0 / 4.0 * ( LeftMachNumber + 1.0 ) * ( LeftMachNumber + 1.0 )
		+ 1.0 / 8.0 * ( LeftMachNumber * LeftMachNumber - 1.0 ) * ( LeftMachNumber * LeftMachNumber - 1.0 );
		}
		else
		@@ -120,7 +120,7 @@ class AUSMPlusEnergyBase
		}
		else if ( RightMachNumber <= 1.0 )
		{
		MachSplitingMinus = - 1.0 / 2.0 * ( RightMachNumber - 1.0 ) * ( RightMachNumber - 1.0 )
		MachSplitingMinus = - 1.0 / 4.0 * ( RightMachNumber - 1.0 ) * ( RightMachNumber - 1.0 )
		- 1.0 / 8.0 * ( RightMachNumber * RightMachNumber - 1.0 ) * ( RightMachNumber * RightMachNumber - 1.0 );
		}
		else

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -73,8 +73,8 @@ class AUSMPlusMomentumBase
		const RealType& LeftPressure,
		const RealType& RightPressure ) const
		{
		const RealType& LeftSpeedOfSound = std::sqrt( this->gamma * LeftPressure / LeftDensity );
		const RealType& RightSpeedOfSound = std::sqrt( this->gamma * RightPressure / RightDensity );
		const RealType& LeftSpeedOfSound = std::sqrt( std::abs( this->gamma * LeftPressure / LeftDensity ) );
		const RealType& RightSpeedOfSound = std::sqrt( std::abs( this->gamma * RightPressure / RightDensity ) );
		const RealType& BorderSpeedOfSound = 0.5 * ( LeftSpeedOfSound + RightSpeedOfSound );
		const RealType& LeftMachNumber = LeftVelocity / BorderSpeedOfSound;
		const RealType& RightMachNumber = RightVelocity / BorderSpeedOfSound;
		@@ -92,7 +92,7 @@ class AUSMPlusMomentumBase
		}
		else if ( LeftMachNumber <= 1.0 )
		{
		MachSplitingPlus = 1.0 / 2.0 * ( LeftMachNumber + 1.0 ) * ( LeftMachNumber + 1.0 )
		MachSplitingPlus = 1.0 / 4.0 * ( LeftMachNumber + 1.0 ) * ( LeftMachNumber + 1.0 )
		+ 1.0 / 8.0 * ( LeftMachNumber * LeftMachNumber - 1.0 ) * ( LeftMachNumber * LeftMachNumber - 1.0 );
		PressureSplitingPlus = 1.0 / 4.0 * ( LeftMachNumber + 1.0 ) * ( LeftMachNumber + 1.0 ) * (2.0 - LeftMachNumber )
		+ 3.0 / 16.0 * ( LeftMachNumber * LeftMachNumber - 1.0 ) * ( LeftMachNumber * LeftMachNumber - 1.0 );
		@@ -109,7 +109,7 @@ class AUSMPlusMomentumBase
		}
		else if ( RightMachNumber <= 1.0 )
		{
		MachSplitingMinus = - 1.0 / 2.0 * ( RightMachNumber - 1.0 ) * ( RightMachNumber - 1.0 )
		MachSplitingMinus = - 1.0 / 4.0 * ( RightMachNumber - 1.0 ) * ( RightMachNumber - 1.0 )
		- 1.0 / 8.0 * ( RightMachNumber * RightMachNumber - 1.0 ) * ( RightMachNumber * RightMachNumber - 1.0 );
		PressureSplitingMinus = 1.0 / 4.0 * ( RightMachNumber - 1.0 ) * ( RightMachNumber - 1.0 ) * (2.0 + RightMachNumber )
		- 3.0 / 16.0 * ( RightMachNumber * RightMachNumber - 1.0 ) * ( RightMachNumber * RightMachNumber - 1.0 );
		@@ -134,8 +134,8 @@ class AUSMPlusMomentumBase
		const RealType& LeftPressure,
		const RealType& RightPressure ) const
		{
		const RealType& LeftSpeedOfSound = std::sqrt( this->gamma * LeftPressure / LeftDensity );
		const RealType& RightSpeedOfSound = std::sqrt( this->gamma * RightPressure / RightDensity );
		const RealType& LeftSpeedOfSound = std::sqrt( std::abs( this->gamma * LeftPressure / LeftDensity ) );
		const RealType& RightSpeedOfSound = std::sqrt( std::abs( this->gamma * RightPressure / RightDensity ) );
		const RealType& BorderSpeedOfSound = 0.5 * ( LeftSpeedOfSound + RightSpeedOfSound );
		const RealType& LeftMachNumber = LeftVelocity / BorderSpeedOfSound;
		const RealType& RightMachNumber = RightVelocity / BorderSpeedOfSound;
		@@ -149,7 +149,7 @@ class AUSMPlusMomentumBase
		}
		else if ( LeftMachNumber <= 1.0 )
		{
		MachSplitingPlus = 1.0 / 2.0 * ( LeftMachNumber + 1.0 ) * ( LeftMachNumber + 1.0 )
		MachSplitingPlus = 1.0 / 4.0 * ( LeftMachNumber + 1.0 ) * ( LeftMachNumber + 1.0 )
		+ 1.0 / 8.0 * ( LeftMachNumber * LeftMachNumber - 1.0 ) * ( LeftMachNumber * LeftMachNumber - 1.0 );
		}
		else
		@@ -162,7 +162,7 @@ class AUSMPlusMomentumBase
		}
		else if ( RightMachNumber <= 1.0 )
		{
		MachSplitingMinus = - 1.0 / 2.0 * ( RightMachNumber - 1.0 ) * ( RightMachNumber - 1.0 )
		MachSplitingMinus = - 1.0 / 4.0 * ( RightMachNumber - 1.0 ) * ( RightMachNumber - 1.0 )
		- 1.0 / 8.0 * ( RightMachNumber * RightMachNumber - 1.0 ) * ( RightMachNumber * RightMachNumber - 1.0 );
		}
		else

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -208,7 +208,7 @@ class AUSMPlusMomentumX< Meshes::Grid< 2, MeshReal, Device, MeshIndex >, Operato
		)
		+ 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_south , pressure_center, pressure_north )
		- this->OtherMomentumFlux( density_center, density_north , velocity_x_center, velocity_x_north , velocity_y_center, velocity_y_north , pressure_center, pressure_north )
		)
		+
		this->rightHandSide(u, entity, time);
		@@ -365,7 +365,7 @@ class AUSMPlusMomentumX< Meshes::Grid< 3,MeshReal, Device, MeshIndex >, Operator
		)
		+ 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_south , pressure_center, pressure_north )
		- this->OtherMomentumFlux( density_center, density_north , velocity_x_center, velocity_x_north , velocity_y_center, velocity_y_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 )

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ class AUSMPlusMomentumZ< Meshes::Grid< 3,MeshReal, Device, MeshIndex >, Operator
		)
		+ 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_south , pressure_center, pressure_north )
		- this->OtherMomentumFlux( density_center, density_north , velocity_z_center, velocity_z_north , velocity_y_center, velocity_y_north , pressure_center, pressure_north )
		)
		+ hzInverse * (
		this->MainMomentumFlux( density_down , density_center, velocity_z_down , velocity_z_center, pressure_down , pressure_center )