Skip to content

Commit d4564da

Browse files
author
rois1995
committed
- Fixed variable inputs
1 parent 86db90b commit d4564da

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

‎Common/include/option_structure.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,15 +1472,15 @@ static const MapType<std::string, WINDOW_FUNCTION> Window_Map = {
14721472
*/
14731473
enum ENUM_HYBRIDRANSLES {
14741474
NO_HYBRIDRANSLES = 0, /*!< \brief No turbulence model. */
1475-
SA_DES = 1, /*!< \brief Kind of Hybrid RANS/LES (SA - Detached Eddy Simulation (DES)). */
1476-
SA_DDES = 2, /*!< \brief Kind of Hybrid RANS/LES (SA - Delayed DES (DDES) with Delta_max SGS ). */
1477-
SA_ZDES = 3, /*!< \brief Kind of Hybrid RANS/LES (SA - Delayed DES (DDES) with Vorticity based SGS like Zonal DES). */
1478-
SA_EDDES = 4, /*!< \brief Kind of Hybrid RANS/LES (SA - Delayed DES (DDES) with Shear Layer Adapted SGS: Enhanced DDES). */
1479-
SST_DDES = 5, /*!< \brief Kind of Hybrid RANS/LES (SST - Delayed DES (DDES): DDES). */
1480-
SST_IDDES = 6, /*!< \brief Kind of Hybrid RANS/LES (SST - Delayed DES (DDES): Improved DDES). */
1481-
SST_SIDDES = 7, /*!< \brief Kind of Hybrid RANS/LES (SST - Delayed DES (DDES): Simplified Improved DDES). */
1482-
SST_EDDES = 8, /*!< \brief Kind of Hybrid RANS/LES (SST - Delayed DES (DDES): Enhanced (SLA) DDES). */
1483-
SA_EDDES_UNSTR = 9 /*!< \brief Kind of Hybrid RANS/LES (SST - Delayed DES (DDES): Enhanced (SLA) DDES). */
1475+
SA_DES = 1, /*!< \brief Kind of Hybrid RANS/LES (SA - Detached Eddy Simulation (DES)). */
1476+
SA_DDES = 2, /*!< \brief Kind of Hybrid RANS/LES (SA - Delayed DES (DDES) with Delta_max SGS ). */
1477+
SA_ZDES = 3, /*!< \brief Kind of Hybrid RANS/LES (SA - Delayed DES (DDES) with Vorticity based SGS like Zonal DES). */
1478+
SA_EDDES = 4, /*!< \brief Kind of Hybrid RANS/LES (SA - Delayed DES (DDES) with Shear Layer Adapted SGS: Enhanced DDES). */
1479+
SA_EDDES_UNSTR = 5, /*!< \brief Kind of Hybrid RANS/LES (SA - Delayed DES (DDES) with Shear Layer Adapted SGS: Enhanced DDES and for Unstructured grids). */
1480+
SST_DDES = 6, /*!< \brief Kind of Hybrid RANS/LES (SST - Delayed DES (DDES): DDES). */
1481+
SST_IDDES = 7, /*!< \brief Kind of Hybrid RANS/LES (SST - Delayed DES (DDES): Improved DDES). */
1482+
SST_SIDDES = 8, /*!< \brief Kind of Hybrid RANS/LES (SST - Delayed DES (DDES): Simplified Improved DDES). */
1483+
SST_EDDES = 9 /*!< \brief Kind of Hybrid RANS/LES (SST - Delayed DES (DDES): Enhanced (SLA) DDES). */
14841484
};
14851485
static const MapType<std::string, ENUM_HYBRIDRANSLES> HybridRANSLES_Map = {
14861486
MakePair("NONE", NO_HYBRIDRANSLES)

‎SU2_CFD/include/variables/CTurbVariable.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class CTurbVariable : public CScalarVariable {
134134
* \brief Set the vortex tilting measure for computation of the EDDES length scale
135135
* \param[in] iPoint - Point index.
136136
*/
137-
void SetVortex_Tilting(unsigned long iPoint, const su2double Strain[3][3],
137+
void SetVortex_Tilting(unsigned long iPoint, su2double **Strain,
138138
const su2double* Vorticity, su2double LaminarViscosity) override;
139139

140140
/*!

‎SU2_CFD/include/variables/CVariable.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2247,7 +2247,7 @@ class CVariable {
22472247

22482248
inline virtual su2double GetTau_Wall(unsigned long iPoint) const { return 0.0; }
22492249

2250-
inline virtual void SetVortex_Tilting(unsigned long iPoint, const su2double Strain[3][3],
2250+
inline virtual void SetVortex_Tilting(unsigned long iPoint, su2double **Strain,
22512251
const su2double* Vorticity, su2double LaminarViscosity) {}
22522252

22532253
inline virtual su2double GetVortex_Tilting(unsigned long iPoint) const { return 0.0; }

‎SU2_CFD/src/solvers/CTurbSASolver.cpp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,12 @@ void CTurbSASolver::Preprocessing(CGeometry *geometry, CSolver **solver_containe
191191

192192
SU2_OMP_FOR_STAT(omp_chunk_size)
193193
for (unsigned long iPoint = 0; iPoint < nPoint; iPoint++){
194-
su2double Grad_Vel[3][3] = {{0.0}}, StrainMat[3][3] = {{0.0}};
194+
su2double **Grad_Vel = new su2double* [nDim];
195+
su2double **StrainMat = new su2double* [nDim];
195196
auto Vorticity = flowNodes->GetVorticity(iPoint);
196197
for (unsigned short iDim = 0; iDim < nDim; iDim++) {
198+
Grad_Vel[iDim] = new su2double [nDim];
199+
StrainMat[iDim] = new su2double [nDim];
197200
for (unsigned short jDim = 0; jDim < nDim; jDim++) {
198201
Grad_Vel[iDim][jDim] = nodes->GetGradient_Primitive(iPoint, prim_idx.Velocity() + iDim, jDim);
199202
}
@@ -1426,8 +1429,8 @@ void CTurbSASolver::SetDES_LengthScale(CSolver **solver, CGeometry *geometry, CC
14261429

14271430
const su2double maxDelta = geometry->nodes->GetMaxLength(iPoint);
14281431

1429-
const su2double r_d = (kinematicViscosityTurb+kinematicViscosity)/(uijuij*k2*pow(wallDistance, 2.0));
1430-
const su2double f_d = 1.0-tanh(pow(8.0*r_d,3.0));
1432+
const su2double r_d = (kinematicViscosityTurb+kinematicViscosity)/(uijuij*k2*pow(wallDistance, 2));
1433+
const su2double f_d = 1.0-tanh(pow(8.0*r_d,3));
14311434

14321435
const su2double distDES = constDES * maxDelta;
14331436
lengthScale = wallDistance-f_d*max(0.0,(wallDistance-distDES));
@@ -1569,8 +1572,8 @@ void CTurbSASolver::SetDES_LengthScale(CSolver **solver, CGeometry *geometry, CC
15691572
min(f_max,
15701573
f_min + ((f_max - f_min)/(a2 - a1)) * (vortexTiltingMeasure - a1)));
15711574

1572-
const su2double r_d = (kinematicViscosityTurb+kinematicViscosity)/(uijuij*k2*pow(wallDistance, 2.0));
1573-
const su2double f_d = 1.0-tanh(pow(8.0*r_d,3.0));
1575+
const su2double r_d = (kinematicViscosityTurb+kinematicViscosity)/(uijuij*k2*pow(wallDistance, 2));
1576+
const su2double f_d = 1.0-tanh(pow(8.0*r_d,3));
15741577

15751578
su2double maxDelta = (ln_max/sqrt(3.0)) * f_kh;
15761579
if (f_d < 0.999){

‎SU2_CFD/src/solvers/CTurbSSTSolver.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,12 @@ void CTurbSSTSolver::Preprocessing(CGeometry *geometry, CSolver **solver_contain
213213

214214
SU2_OMP_FOR_STAT(omp_chunk_size)
215215
for (unsigned long iPoint = 0; iPoint < nPoint; iPoint++){
216-
su2double Grad_Vel[3][3] = {{0.0}}, StrainMat[3][3] = {{0.0}};
216+
su2double **Grad_Vel = new su2double* [nDim];
217+
su2double **StrainMat = new su2double* [nDim];
217218
auto Vorticity = flowNodes->GetVorticity(iPoint);
218219
for (unsigned short iDim = 0; iDim < nDim; iDim++) {
220+
Grad_Vel[iDim] = new su2double [nDim];
221+
StrainMat[iDim] = new su2double [nDim];
219222
for (unsigned short jDim = 0; jDim < nDim; jDim++) {
220223
Grad_Vel[iDim][jDim] = nodes->GetGradient_Primitive(iPoint, prim_idx.Velocity() + iDim, jDim);
221224
}

‎SU2_CFD/src/variables/CTurbVariable.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ CTurbVariable::CTurbVariable(unsigned long npoint, unsigned long ndim, unsigned
4444
}
4545

4646

47-
void CTurbVariable::SetVortex_Tilting(unsigned long iPoint, const su2double Strain[3][3],
47+
void CTurbVariable::SetVortex_Tilting(unsigned long iPoint, su2double **Strain,
4848
const su2double* Vorticity, su2double LaminarViscosity) {
4949

5050
su2double Omega, StrainDotVort[3], numVecVort[3];

0 commit comments

Comments
 (0)