Skip to content

Commit 013b62a

Browse files
author
Cristopher-Morales
committed
freestream values
1 parent e7df8fc commit 013b62a

File tree

7 files changed

+59
-10
lines changed

7 files changed

+59
-10
lines changed

Common/include/CConfig.hpp

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,7 @@ class CConfig {
900900
Density_FreeStream, /*!< \brief Free-stream density of the fluid. */
901901
Viscosity_FreeStream, /*!< \brief Free-stream viscosity of the fluid. */
902902
ThermalConductivity_FreeStream, /*!< \brief Free-stream thermal conductivity of the fluid. */
903+
SpecificHeatCp_FreeStream, /*!< \brief Free-stream specific heat capacity at constant pressure of the fluid. */
903904
Tke_FreeStream, /*!< \brief Total turbulent kinetic energy of the fluid. */
904905
Intermittency_FreeStream, /*!< \brief Freestream intermittency (for sagt transition model) of the fluid. */
905906
ReThetaT_FreeStream, /*!< \brief Freestream Transition Momentum Thickness Reynolds Number (for LM transition model) of the fluid. */
@@ -942,6 +943,7 @@ class CConfig {
942943
Energy_FreeStreamND, /*!< \brief Farfield energy value (external flow). */
943944
Viscosity_FreeStreamND, /*!< \brief Farfield viscosity value (external flow). */
944945
ThermalConductivity_FreeStreamND, /*!< \brief Farfield thermal conductivity value (external flow). */
946+
SpecificHeatCp_FreeStreamND, /*!< \brief Farfield specific heat capacity at constant pressure value (external flow). */
945947
Tke_FreeStreamND, /*!< \brief Farfield kinetic energy (external flow). */
946948
Omega_FreeStreamND, /*!< \brief Specific dissipation (external flow). */
947949
Omega_FreeStream; /*!< \brief Specific dissipation (external flow). */
@@ -1759,7 +1761,13 @@ class CConfig {
17591761
* \brief Get the value of the freestream thermal conductivity.
17601762
* \return Freestream thermal conductivity.
17611763
*/
1762-
su2double GetThermalConductivity_FreeStream(void) const { return Viscosity_FreeStream; }
1764+
su2double GetThermalConductivity_FreeStream(void) const { return ThermalConductivity_FreeStream; }
1765+
1766+
/*!
1767+
* \brief Get the value of the freestream heat capacity at constant pressure.
1768+
* \return Freestream heat capacity at constant pressure.
1769+
*/
1770+
su2double GetSpecificHeatCp_FreeStream(void) const { return SpecificHeatCp_FreeStream; }
17631771

17641772
/*!
17651773
* \brief Get the value of the freestream density.
@@ -1998,6 +2006,12 @@ class CConfig {
19982006
*/
19992007
su2double GetThermalConductivity_FreeStreamND(void) const { return ThermalConductivity_FreeStreamND; }
20002008

2009+
/*!
2010+
* \brief Get the value of the non-dimensionalized freestream heat capacity at constant pressure.
2011+
* \return Non-dimensionalized freestream heat capacity at constant pressure.
2012+
*/
2013+
su2double GetSpecificHeatCp_FreeStreamND(void) const { return SpecificHeatCp_FreeStreamND; }
2014+
20012015
/*!
20022016
* \brief Get the value of the non-dimensionalized freestream viscosity.
20032017
* \return Non-dimensionalized freestream viscosity.
@@ -2608,6 +2622,12 @@ class CConfig {
26082622
*/
26092623
void SetThermalConductivity_FreeStream(su2double val_thermalconductivity_freestream) { ThermalConductivity_FreeStream = val_thermalconductivity_freestream; }
26102624

2625+
/*!
2626+
* \brief Set the freestream specific heat capacity at constant pressure.
2627+
* \param[in] val_specificheatCp_freestream - Value of the freestream specific heat capacity at constant pressure.
2628+
*/
2629+
void SetSpecificHeatCp_FreeStream(su2double val_specificheatCp_freestream) { SpecificHeatCp_FreeStream = val_specificheatCp_freestream; }
2630+
26112631
/*!
26122632
* \brief Set the magnitude of the free-stream velocity.
26132633
* \param[in] val_modvel_freestream - Magnitude of the free-stream velocity.
@@ -2676,6 +2696,12 @@ class CConfig {
26762696
*/
26772697
void SetThermalConductivity_FreeStreamND(su2double val_thermalconductivity_freestreamnd) { ThermalConductivity_FreeStreamND = val_thermalconductivity_freestreamnd; }
26782698

2699+
/*!
2700+
* \brief Set the non-dimensional free-stream specific heat capacity at constant pressure.
2701+
* \param[in] val_specificheatCp_freestreamnd - Value of the non-dimensional free-stream specific heat capacity at constant pressure.
2702+
*/
2703+
void SetSpecificHeatCp_FreeStreamND(su2double val_specificheatCp_freestreamnd) { SpecificHeatCp_FreeStreamND = val_specificheatCp_freestreamnd; }
2704+
26792705
/*!
26802706
* \brief Set the non-dimensional freestream turbulent kinetic energy.
26812707
* \param[in] val_tke_freestreamnd - Value of the non-dimensional freestream turbulent kinetic energy.

Common/src/geometry/CPhysicalGeometryFEM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2233,7 +2233,7 @@ void CPhysicalGeometry::DetermineTimeLevelElements(CConfig* config, const vector
22332233
const su2double* Vel = config->GetVelocity_FreeStreamND();
22342234
const su2double Viscosity = config->GetViscosity_FreeStreamND();
22352235
const su2double Thermal_Conductivity = config->GetThermalConductivity_FreeStreamND();
2236-
const su2double Cp = config->GetSpecific_Heat_CpND();
2236+
const su2double Cp = config->GetSpecificHeatCp_FreeStreamND();
22372237

22382238
su2double VelMag = 0.0;
22392239
for (unsigned short iDim = 0; iDim < nDim; ++iDim) VelMag += Vel[iDim] * Vel[iDim];

SU2_CFD/src/solvers/CEulerSolver.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -787,14 +787,16 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
787787

788788
su2double Temperature_FreeStream = 0.0, Mach2Vel_FreeStream = 0.0, ModVel_FreeStream = 0.0,
789789
Energy_FreeStream = 0.0, ModVel_FreeStreamND = 0.0, Velocity_Reynolds = 0.0,
790-
Omega_FreeStream = 0.0, Omega_FreeStreamND = 0.0, Viscosity_FreeStream = 0.0, Thermal_Conductivity_FreeStream = 0.0,
790+
Omega_FreeStream = 0.0, Omega_FreeStreamND = 0.0, Viscosity_FreeStream = 0.0,
791+
Thermal_Conductivity_FreeStream = 0.0, SpecificHeat_Cp_FreeStream = 0.0,
791792
Density_FreeStream = 0.0, Pressure_FreeStream = 0.0, Tke_FreeStream = 0.0, Re_ThetaT_FreeStream = 0.0,
792793
Length_Ref = 0.0, Density_Ref = 0.0, Pressure_Ref = 0.0, Velocity_Ref = 0.0,
793794
Temperature_Ref = 0.0, Time_Ref = 0.0, Omega_Ref = 0.0, Force_Ref = 0.0,
794795
Gas_Constant_Ref = 0.0, Viscosity_Ref = 0.0, Conductivity_Ref = 0.0, Energy_Ref= 0.0,
795796
Froude = 0.0, Pressure_FreeStreamND = 0.0, Density_FreeStreamND = 0.0,
796797
Temperature_FreeStreamND = 0.0, Gas_ConstantND = 0.0,
797-
Velocity_FreeStreamND[3] = {0.0, 0.0, 0.0}, Viscosity_FreeStreamND = 0.0, Thermal_Conductivity_FreeStreamND = 0.0,
798+
Velocity_FreeStreamND[3] = {0.0, 0.0, 0.0}, Viscosity_FreeStreamND = 0.0,
799+
Thermal_Conductivity_FreeStreamND = 0.0, SpecificHeat_Cp_FreeStreamND = 0.0,
798800
Tke_FreeStreamND = 0.0, Energy_FreeStreamND = 0.0,
799801
Total_UnstTimeND = 0.0, Delta_UnstTimeND = 0.0, TgammaR = 0.0, Heat_Flux_Ref = 0.0;
800802

@@ -948,8 +950,11 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
948950

949951
Viscosity_FreeStream = auxFluidModel->GetLaminarViscosity();
950952
Thermal_Conductivity_FreeStream = auxFluidModel->GetThermalConductivity();
953+
SpecificHeat_Cp_FreeStream = auxFluidModel->GetCp();
954+
951955
config->SetViscosity_FreeStream(Viscosity_FreeStream);
952956
config->SetThermalConductivity_FreeStream(Thermal_Conductivity_FreeStream);
957+
config->SetSpecificHeatCp_FreeStream(SpecificHeat_Cp_FreeStream);
953958

954959
Density_FreeStream = Reynolds*Viscosity_FreeStream/(Velocity_Reynolds*config->GetLength_Reynolds());
955960
config->SetDensity_FreeStream(Density_FreeStream);
@@ -968,8 +973,10 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
968973
auxFluidModel->SetThermalConductivityModel(config);
969974
Viscosity_FreeStream = auxFluidModel->GetLaminarViscosity();
970975
Thermal_Conductivity_FreeStream = auxFluidModel->GetThermalConductivity();
976+
SpecificHeat_Cp_FreeStream = auxFluidModel->GetCp();
971977
config->SetViscosity_FreeStream(Viscosity_FreeStream);
972978
config->SetThermalConductivity_FreeStream(Thermal_Conductivity_FreeStream);
979+
config->SetSpecificHeatCp_FreeStream(SpecificHeat_Cp_FreeStream);
973980
Energy_FreeStream = auxFluidModel->GetStaticEnergy() + 0.5*ModVel_FreeStream*ModVel_FreeStream;
974981

975982
/*--- Compute Reynolds number ---*/
@@ -1054,6 +1061,8 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
10541061
Viscosity_FreeStreamND = Viscosity_FreeStream / Viscosity_Ref; config->SetViscosity_FreeStreamND(Viscosity_FreeStreamND);
10551062
Thermal_Conductivity_FreeStreamND = Thermal_Conductivity_FreeStream / Conductivity_Ref;
10561063
config->SetThermalConductivity_FreeStreamND(Thermal_Conductivity_FreeStreamND);
1064+
SpecificHeat_Cp_FreeStreamND = SpecificHeat_Cp_FreeStream / Gas_Constant_Ref;
1065+
config->SetSpecificHeatCp_FreeStreamND(SpecificHeat_Cp_FreeStreamND);
10571066

10581067
Tke_FreeStream = 3.0/2.0*(ModVel_FreeStream*ModVel_FreeStream*config->GetTurbulenceIntensity_FreeStream()*config->GetTurbulenceIntensity_FreeStream());
10591068
config->SetTke_FreeStream(Tke_FreeStream);

SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,14 +775,16 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig *config,
775775

776776
su2double Temperature_FreeStream = 0.0, Mach2Vel_FreeStream = 0.0, ModVel_FreeStream = 0.0,
777777
Energy_FreeStream = 0.0, ModVel_FreeStreamND = 0.0, Velocity_Reynolds = 0.0,
778-
Omega_FreeStream = 0.0, Omega_FreeStreamND = 0.0, Viscosity_FreeStream = 0.0, Thermal_Conductivity_FreeStream = 0.0,
778+
Omega_FreeStream = 0.0, Omega_FreeStreamND = 0.0, Viscosity_FreeStream = 0.0,
779+
Thermal_Conductivity_FreeStream = 0.0, SpecificHeat_Cp_FreeStream = 0.0,
779780
Density_FreeStream = 0.0, Pressure_FreeStream = 0.0, Tke_FreeStream = 0.0,
780781
Length_Ref = 0.0, Density_Ref = 0.0, Pressure_Ref = 0.0, Velocity_Ref = 0.0,
781782
Temperature_Ref = 0.0, Time_Ref = 0.0, Omega_Ref = 0.0, Force_Ref = 0.0,
782783
Gas_Constant_Ref = 0.0, Viscosity_Ref = 0.0, Conductivity_Ref = 0.0, Energy_Ref= 0.0,
783784
Froude = 0.0, Pressure_FreeStreamND = 0.0, Density_FreeStreamND = 0.0,
784785
Temperature_FreeStreamND = 0.0, Gas_ConstantND = 0.0,
785-
Velocity_FreeStreamND[3] = {0.0, 0.0, 0.0}, Viscosity_FreeStreamND = 0.0, Thermal_Conductivity_FreeStreamND = 0.0,
786+
Velocity_FreeStreamND[3] = {0.0, 0.0, 0.0}, Viscosity_FreeStreamND = 0.0,
787+
Thermal_Conductivity_FreeStreamND = 0.0, SpecificHeat_Cp_FreeStreamND = 0.0,
786788
Tke_FreeStreamND = 0.0, Energy_FreeStreamND = 0.0,
787789
Total_UnstTimeND = 0.0, Delta_UnstTimeND = 0.0;
788790

@@ -961,6 +963,8 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig *config,
961963
config->SetViscosity_FreeStream(Viscosity_FreeStream);
962964
Thermal_Conductivity_FreeStream = FluidModel->GetThermalConductivity();
963965
config->SetThermalConductivity_FreeStream(Thermal_Conductivity_FreeStream);
966+
SpecificHeat_Cp_FreeStream = FluidModel->GetCp();
967+
config->SetSpecificHeatCp_FreeStream(SpecificHeat_Cp_FreeStream);
964968

965969
Density_FreeStream = Reynolds*Viscosity_FreeStream/(Velocity_Reynolds*config->GetLength_Reynolds());
966970
config->SetDensity_FreeStream(Density_FreeStream);
@@ -981,6 +985,8 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig *config,
981985
config->SetViscosity_FreeStream(Viscosity_FreeStream);
982986
Thermal_Conductivity_FreeStream = FluidModel->GetThermalConductivity();
983987
config->SetThermalConductivity_FreeStream(Thermal_Conductivity_FreeStream);
988+
SpecificHeat_Cp_FreeStream = FluidModel->GetCp();
989+
config->SetSpecificHeatCp_FreeStream(SpecificHeat_Cp_FreeStream);
984990
Energy_FreeStream = FluidModel->GetStaticEnergy() + 0.5*ModVel_FreeStream*ModVel_FreeStream;
985991

986992
}
@@ -1061,6 +1067,8 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig *config,
10611067
Viscosity_FreeStreamND = Viscosity_FreeStream / Viscosity_Ref; config->SetViscosity_FreeStreamND(Viscosity_FreeStreamND);
10621068
Thermal_Conductivity_FreeStreamND = Thermal_Conductivity_FreeStream / Conductivity_Ref;
10631069
config->SetThermalConductivity_FreeStreamND(Thermal_Conductivity_FreeStreamND);
1070+
SpecificHeat_Cp_FreeStreamND = SpecificHeat_Cp_FreeStream / Gas_Constant_Ref;
1071+
config->SetSpecificHeatCp_FreeStreamND(SpecificHeat_Cp_FreeStreamND);
10641072

10651073
Tke_FreeStream = 3.0/2.0*(ModVel_FreeStream*ModVel_FreeStream*config->GetTurbulenceIntensity_FreeStream()*config->GetTurbulenceIntensity_FreeStream());
10661074
config->SetTke_FreeStream(Tke_FreeStream);

SU2_CFD/src/solvers/CHeatSolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ void CHeatSolver::Heat_Fluxes(CGeometry *geometry, CSolver **solver_container, C
598598
su2double *Coord, *Coord_Normal, *Normal, Area, dist, Twall, dTdn;
599599
string Marker_Tag, HeatFlux_Tag;
600600

601-
const su2double thermal_diffusivity = flow ? config->GetThermalConductivity_FreeStreamND()/config->GetSpecific_Heat_CpND() :
601+
const su2double thermal_diffusivity = flow ? config->GetThermalConductivity_FreeStreamND()/config->GetSpecificHeatCp_FreeStreamND() :
602602
config->GetThermalDiffusivity();
603603

604604
AllBound_HeatFlux = 0.0;

SU2_CFD/src/solvers/CIncEulerSolver.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,14 @@ CIncEulerSolver::~CIncEulerSolver() {
243243
void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMesh) {
244244

245245
su2double Temperature_FreeStream = 0.0, ModVel_FreeStream = 0.0,Energy_FreeStream = 0.0,
246-
ModVel_FreeStreamND = 0.0, Omega_FreeStream = 0.0, Omega_FreeStreamND = 0.0, Viscosity_FreeStream = 0.0, Thermal_Conductivity_FreeStream = 0.0,
246+
ModVel_FreeStreamND = 0.0, Omega_FreeStream = 0.0, Omega_FreeStreamND = 0.0, Viscosity_FreeStream = 0.0,
247+
Thermal_Conductivity_FreeStream = 0.0, SpecificHeat_Cp_FreeStream = 0.0,
247248
Density_FreeStream = 0.0, Pressure_FreeStream = 0.0, Pressure_Thermodynamic = 0.0, Tke_FreeStream = 0.0,
248249
Length_Ref = 0.0, Density_Ref = 0.0, Pressure_Ref = 0.0, Temperature_Ref = 0.0, Velocity_Ref = 0.0, Time_Ref = 0.0,
249250
Gas_Constant_Ref = 0.0, Omega_Ref = 0.0, Force_Ref = 0.0, Viscosity_Ref = 0.0, Conductivity_Ref = 0.0, Heat_Flux_Ref = 0.0, Energy_Ref= 0.0, Pressure_FreeStreamND = 0.0, Pressure_ThermodynamicND = 0.0, Density_FreeStreamND = 0.0,
250251
Temperature_FreeStreamND = 0.0, Gas_ConstantND = 0.0, Specific_Heat_CpND = 0.0, Thermal_Expansion_CoeffND = 0.0,
251-
Velocity_FreeStreamND[3] = {0.0, 0.0, 0.0}, Viscosity_FreeStreamND = 0.0, Thermal_Conductivity_FreeStreamND = 0.0,
252+
Velocity_FreeStreamND[3] = {0.0, 0.0, 0.0}, Viscosity_FreeStreamND = 0.0,
253+
Thermal_Conductivity_FreeStreamND = 0.0, SpecificHeat_Cp_FreeStreamND = 0.0,
252254
Tke_FreeStreamND = 0.0, Energy_FreeStreamND = 0.0,
253255
Total_UnstTimeND = 0.0, Delta_UnstTimeND = 0.0;
254256

@@ -361,6 +363,8 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
361363
config->SetViscosity_FreeStream(Viscosity_FreeStream);
362364
Thermal_Conductivity_FreeStream = auxFluidModel->GetThermalConductivity();
363365
config->SetThermalConductivity_FreeStream(Thermal_Conductivity_FreeStream);
366+
SpecificHeat_Cp_FreeStream = auxFluidModel->GetCp();
367+
config->SetSpecificHeatCp_FreeStream(SpecificHeat_Cp_FreeStream);
364368

365369
Reynolds = Density_FreeStream*ModVel_FreeStream/Viscosity_FreeStream; config->SetReynolds(Reynolds);
366370

@@ -455,6 +459,8 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
455459
Viscosity_FreeStreamND = Viscosity_FreeStream / Viscosity_Ref; config->SetViscosity_FreeStreamND(Viscosity_FreeStreamND);
456460
Thermal_Conductivity_FreeStreamND = Thermal_Conductivity_FreeStream / Conductivity_Ref;
457461
config->SetThermalConductivity_FreeStreamND(Thermal_Conductivity_FreeStreamND);
462+
SpecificHeat_Cp_FreeStreamND = SpecificHeat_Cp_FreeStream / Gas_Constant_Ref;
463+
config->SetSpecificHeatCp_FreeStreamND(SpecificHeat_Cp_FreeStreamND);
458464

459465
Tke_FreeStream = 3.0/2.0*(ModVel_FreeStream*ModVel_FreeStream*config->GetTurbulenceIntensity_FreeStream()*config->GetTurbulenceIntensity_FreeStream());
460466
config->SetTke_FreeStream(Tke_FreeStream);

SU2_CFD/src/solvers/CNSSolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ void CNSSolver::SetTau_Wall_WF(CGeometry *geometry, CSolver **solver_container,
789789
unsigned long smallYPlusCounter = 0; /*--- counts the number of wall cells where y+ < 5 ---*/
790790

791791
const su2double Gas_Constant = config->GetGas_ConstantND();
792-
const su2double Cp = config->GetSpecific_Heat_CpND();
792+
const su2double Cp = (Gamma / Gamma_Minus_One) * Gas_Constant;
793793
const unsigned short max_iter = config->GetwallModel_MaxIter();
794794
const su2double relax = config->GetwallModel_RelFac();
795795

0 commit comments

Comments
 (0)