Skip to content

Commit 37a866f

Browse files
author
rois1995
committed
- Removed debug quantities
- Made Get/SetSRSGridSize non virtual
1 parent f10c465 commit 37a866f

File tree

6 files changed

+2
-116
lines changed

6 files changed

+2
-116
lines changed

‎SU2_CFD/include/variables/CTurbSSTVariable.hpp‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ class CTurbSSTVariable final : public CTurbVariable {
4646
VectorType CDkw; /*!< \brief Cross-diffusion. */
4747
SST_ParsedOptions sstParsedOptions;
4848

49-
VectorType ftilda_d;
50-
VectorType l_RANS;
51-
VectorType l_LES;
52-
VectorType r_dl;
53-
VectorType r_dt;
54-
VectorType r_d;
55-
5649
public:
5750
/*!
5851
* \brief Constructor of the class.
@@ -96,34 +89,4 @@ class CTurbSSTVariable final : public CTurbVariable {
9689
*/
9790
inline su2double GetCrossDiff(unsigned long iPoint) const override { return CDkw(iPoint); }
9891

99-
/*!
100-
* \brief Set the DES Length Scale.
101-
* \param[in] iPoint - Point index.
102-
*/
103-
inline void SetDebug_Quantities(CConfig *config, unsigned long iPoint, su2double val_ftilda_d, su2double val_l_RANS, su2double val_l_LES, su2double val_r_d) override {
104-
ftilda_d(iPoint) = val_ftilda_d;
105-
l_RANS(iPoint) = val_l_RANS;
106-
l_LES(iPoint) = val_l_LES;
107-
108-
if ( config->GetKind_HybridRANSLES() == SST_DDES || config->GetKind_HybridRANSLES() == SST_EDDES)
109-
r_d(iPoint) = val_r_d;
110-
else
111-
r_dt(iPoint) = val_r_d;
112-
}
113-
114-
inline void SetDebug_Quantities(CConfig *config, unsigned long iPoint, su2double val_ftilda_d, su2double val_l_RANS, su2double val_l_LES, su2double val_r_dl, su2double val_r_dt) override {
115-
ftilda_d(iPoint) = val_ftilda_d;
116-
l_RANS(iPoint) = val_l_RANS;
117-
l_LES(iPoint) = val_l_LES;
118-
r_dt(iPoint) = val_r_dt;
119-
r_dl(iPoint) = val_r_dl;
120-
}
121-
122-
inline su2double Get_L_RANS(unsigned long iPoint) const override { return l_RANS(iPoint); }
123-
inline su2double Get_L_LES(unsigned long iPoint) const override { return l_LES(iPoint); }
124-
inline su2double Get_ftilda_d(unsigned long iPoint) const override { return ftilda_d(iPoint); }
125-
inline su2double Get_r_dt(unsigned long iPoint) const override { return r_dt(iPoint); }
126-
inline su2double Get_r_dl(unsigned long iPoint) const override { return r_dl(iPoint); }
127-
inline su2double Get_r_d(unsigned long iPoint) const override { return r_d(iPoint); }
128-
12992
};

‎SU2_CFD/include/variables/CTurbVariable.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ class CTurbVariable : public CScalarVariable {
108108
* \param[in] iPoint - Point index.
109109
* \return the value of the desired grid size for Scale Resolving Simulations.
110110
*/
111-
inline su2double GetSRSGridSize(unsigned long iPoint) const final { return SRSGridSize(iPoint); }
111+
inline su2double GetSRSGridSize(unsigned long iPoint) const { return SRSGridSize(iPoint); }
112112

113113
/*!
114114
* \brief Set the value of the desired grid size for Scale Resolving Simulations.
115115
* \param[in] iPoint - Point index.
116116
* \param[in] val_muT - Value of the desired grid size for Scale Resolving Simulations.
117117
*/
118-
inline void SetSRSGridSize(unsigned long iPoint, su2double val_gridSize) final { SRSGridSize(iPoint) = val_gridSize; }
118+
inline void SetSRSGridSize(unsigned long iPoint, su2double val_gridSize) { SRSGridSize(iPoint) = val_gridSize; }
119119

120120
/*!
121121
* \brief Get the DES length scale

‎SU2_CFD/include/variables/CVariable.hpp‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -397,25 +397,6 @@ class CVariable {
397397
*/
398398
inline virtual void SetDES_LengthScale(unsigned long iPoint, su2double val_des_lengthscale) {}
399399

400-
/*!
401-
* \brief A virtual member.
402-
* \param[in] iPoint - Point index.
403-
*/
404-
inline virtual void SetDebug_Quantities(CConfig *config, unsigned long iPoint, su2double val_ftilda_d, su2double val_l_RANS, su2double val_l_LES, su2double val_r_d) {}
405-
406-
inline virtual su2double Get_L_RANS(unsigned long iPoint) const { return 0.0; }
407-
inline virtual su2double Get_L_LES(unsigned long iPoint) const { return 0.0; }
408-
inline virtual su2double Get_ftilda_d(unsigned long iPoint) const { return 0.0; }
409-
inline virtual su2double Get_r_dt(unsigned long iPoint) const { return 0.0; }
410-
inline virtual su2double Get_r_dl(unsigned long iPoint) const { return 0.0; }
411-
inline virtual su2double Get_r_d(unsigned long iPoint) const { return 0.0; }
412-
413-
/*!
414-
* \brief A virtual member.
415-
* \param[in] iPoint - Point index.
416-
*/
417-
inline virtual void SetDebug_Quantities(CConfig *config, unsigned long iPoint, su2double val_ftilda_d, su2double val_l_RANS, su2double val_l_LES, su2double val_r_dl, su2double val_r_dt) {}
418-
419400
/*!
420401
* \brief A virtual member.
421402
* \param[in] iPoint - Point index.
@@ -1740,18 +1721,6 @@ class CVariable {
17401721
*/
17411722
inline virtual void SetmuT(unsigned long iPoint, su2double val_muT) {}
17421723

1743-
/*!
1744-
* \brief Get the value of the desired grid size for Scale Resolving Simulations.
1745-
* \return the value of the desired grid size for Scale Resolving Simulations.
1746-
*/
1747-
inline virtual su2double GetSRSGridSize(unsigned long iPoint) const { return 0.0; }
1748-
1749-
/*!
1750-
* \brief Set the value of the desired grid size for Scale Resolving Simulations.
1751-
* \param[in] val_gridSize
1752-
*/
1753-
inline virtual void SetSRSGridSize(unsigned long iPoint, su2double val_gridSize) {}
1754-
17551724
/*!
17561725
* \brief Set the value of the turbulence index.
17571726
* \param[in] val_turb_index - turbulence index

‎SU2_CFD/src/output/CFlowOutput.cpp‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,13 +1251,11 @@ void CFlowOutput::SetVolumeOutputFieldsScalarSolution(const CConfig* config){
12511251
switch (TurbModelFamily(config->GetKind_Turb_Model())) {
12521252
case TURB_FAMILY::SA:
12531253
AddVolumeOutput("NU_TILDE", "Nu_Tilde", "SOLUTION", "Spalart-Allmaras variable");
1254-
AddVolumeOutput("SRS_GRID_SIZE", "Srs_grid_size", "SOLUTION", "desired grid size for Scale Resolving Simulations");
12551254
break;
12561255

12571256
case TURB_FAMILY::KW:
12581257
AddVolumeOutput("TKE", "Turb_Kin_Energy", "SOLUTION", "Turbulent kinetic energy");
12591258
AddVolumeOutput("DISSIPATION", "Omega", "SOLUTION", "Rate of dissipation");
1260-
AddVolumeOutput("SRS_GRID_SIZE", "Srs_grid_size", "SOLUTION", "desired grid size for Scale Resolving Simulations");
12611259
break;
12621260

12631261
case TURB_FAMILY::NONE:
@@ -1485,19 +1483,6 @@ void CFlowOutput::SetVolumeOutputFieldsScalarMisc(const CConfig* config) {
14851483
if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES) {
14861484
AddVolumeOutput("DES_LENGTHSCALE", "DES_LengthScale", "DDES", "DES length scale value");
14871485
AddVolumeOutput("WALL_DISTANCE", "Wall_Distance", "DDES", "Wall distance value");
1488-
if (config->GetKind_Turb_Model() == TURB_MODEL::SST) {
1489-
AddVolumeOutput("F_D", "f_d", "DDES", "Empiric blending function");
1490-
AddVolumeOutput("L_RANS", "l_RANS", "DDES", "RANS length scale value");
1491-
AddVolumeOutput("L_LES", "l_LES", "DDES", "LES length scale value");
1492-
}
1493-
if ( config->GetKind_HybridRANSLES() == SST_DDES || config->GetKind_HybridRANSLES() == SST_EDDES){
1494-
AddVolumeOutput("R_D", "r_d", "DDES", "r_d");
1495-
} else if ( config->GetKind_HybridRANSLES() == SST_IDDES){
1496-
AddVolumeOutput("R_DT", "r_dt", "DDES", "turbulent r_d");
1497-
AddVolumeOutput("R_DL", "r_dl", "DDES", "laminar r_d");
1498-
} else if ( config->GetKind_HybridRANSLES() == SST_SIDDES){
1499-
AddVolumeOutput("R_DT", "r_dt", "DDES", "turbulent r_d");
1500-
}
15011486
AddVolumeOutput("LESIQ", "LESIQ", "DDES", "LESIQ index for SRS simulations");
15021487
}
15031488

@@ -1640,23 +1625,6 @@ void CFlowOutput::LoadVolumeDataScalar(const CConfig* config, const CSolver* con
16401625
if (config->GetKind_HybridRANSLES() != NO_HYBRIDRANSLES) {
16411626
SetVolumeOutputValue("DES_LENGTHSCALE", iPoint, Node_Flow->GetDES_LengthScale(iPoint));
16421627
SetVolumeOutputValue("WALL_DISTANCE", iPoint, Node_Geo->GetWall_Distance(iPoint));
1643-
if ( config->GetKind_HybridRANSLES() == SST_DDES || config->GetKind_HybridRANSLES() == SST_EDDES){
1644-
SetVolumeOutputValue("F_D", iPoint, Node_Turb->Get_ftilda_d(iPoint));
1645-
SetVolumeOutputValue("L_RANS", iPoint, Node_Turb->Get_L_RANS(iPoint));
1646-
SetVolumeOutputValue("L_LES", iPoint, Node_Turb->Get_L_LES(iPoint));
1647-
SetVolumeOutputValue("R_D", iPoint, Node_Turb->Get_r_d(iPoint));
1648-
} else if ( config->GetKind_HybridRANSLES() == SST_IDDES){
1649-
SetVolumeOutputValue("F_D", iPoint, Node_Turb->Get_ftilda_d(iPoint));
1650-
SetVolumeOutputValue("L_RANS", iPoint, Node_Turb->Get_L_RANS(iPoint));
1651-
SetVolumeOutputValue("L_LES", iPoint, Node_Turb->Get_L_LES(iPoint));
1652-
SetVolumeOutputValue("R_DT", iPoint, Node_Turb->Get_r_dt(iPoint));
1653-
SetVolumeOutputValue("R_DL", iPoint, Node_Turb->Get_r_dl(iPoint));
1654-
} else if ( config->GetKind_HybridRANSLES() == SST_SIDDES){
1655-
SetVolumeOutputValue("F_D", iPoint, Node_Turb->Get_ftilda_d(iPoint));
1656-
SetVolumeOutputValue("L_RANS", iPoint, Node_Turb->Get_L_RANS(iPoint));
1657-
SetVolumeOutputValue("L_LES", iPoint, Node_Turb->Get_L_LES(iPoint));
1658-
SetVolumeOutputValue("R_DT", iPoint, Node_Turb->Get_r_dt(iPoint));
1659-
}
16601628
const su2double mut = Node_Flow->GetEddyViscosity(iPoint);
16611629
const su2double mu = Node_Flow->GetLaminarViscosity(iPoint);
16621630
const su2double LESIQ = 1.0/(1.0+0.05*pow((mut+mu)/mu, 0.53));

‎SU2_CFD/src/solvers/CTurbSSTSolver.cpp‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,8 +1104,6 @@ void CTurbSSTSolver::SetDES_LengthScale(CSolver **solver, CGeometry *geometry, C
11041104

11051105
DES_lengthScale = l_RANS - f_d * max(0.0, l_RANS - l_LES);
11061106

1107-
nodes->SetDebug_Quantities(config, iPoint, f_d, l_RANS, l_LES, r_d);
1108-
11091107
break;
11101108
}
11111109
case SST_IDDES: {
@@ -1134,8 +1132,6 @@ void CTurbSSTSolver::SetDES_LengthScale(CSolver **solver, CGeometry *geometry, C
11341132
const su2double Delta = min(C_w * max(sqrt(wallDist2), h_max), h_max);
11351133
const su2double l_LES = C_DES * Delta;
11361134

1137-
nodes->SetDebug_Quantities(config, iPoint, ftilda_d, l_RANS, l_LES, r_dl, r_dt);
1138-
11391135
DES_lengthScale = ftilda_d *(1.0+f_e)*l_RANS + (1.0 - ftilda_d) * l_LES;
11401136

11411137
break;
@@ -1156,8 +1152,6 @@ void CTurbSSTSolver::SetDES_LengthScale(CSolver **solver, CGeometry *geometry, C
11561152
const su2double Delta = min(C_w * max(sqrt(wallDist2), h_max), h_max);
11571153
const su2double l_LES = C_DES * Delta;
11581154

1159-
nodes->SetDebug_Quantities(config, iPoint, ftilda_d, l_RANS, l_LES, r_dt);
1160-
11611155
DES_lengthScale = ftilda_d*l_RANS + (1.0 - ftilda_d) * l_LES;
11621156

11631157
break;
@@ -1221,7 +1215,6 @@ void CTurbSSTSolver::SetDES_LengthScale(CSolver **solver, CGeometry *geometry, C
12211215

12221216
const su2double l_LES = C_DES * delta;
12231217
DES_lengthScale = l_RANS - f_d * max(0.0, l_RANS - l_LES);
1224-
nodes->SetDebug_Quantities(config, iPoint, f_d, l_RANS, l_LES, r_d);
12251218
}
12261219
}
12271220

‎SU2_CFD/src/variables/CTurbSSTVariable.cpp‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ CTurbSSTVariable::CTurbSSTVariable(su2double kine, su2double omega, su2double mu
5050
F2.resize(nPoint) = su2double(0.0);
5151
CDkw.resize(nPoint) = su2double(0.0);
5252

53-
ftilda_d.resize(nPoint) = su2double(0.0);
54-
l_RANS.resize(nPoint) = su2double(0.0);
55-
l_LES.resize(nPoint) = su2double(0.0);
56-
r_dl.resize(nPoint) = su2double(0.0);
57-
r_dt.resize(nPoint) = su2double(0.0);
58-
r_d.resize(nPoint) = su2double(0.0);
59-
6053
muT.resize(nPoint) = mut;
6154

6255
}

0 commit comments

Comments
 (0)