Skip to content

Commit 1d50d53

Browse files
TobiKattmannTobiKattmann
committed
Revert "Make all SA+SST solver+variable methods final."
This reverts commit 8f3087b.
1 parent 0b63bbe commit 1d50d53

4 files changed

Lines changed: 51 additions & 51 deletions

File tree

‎SU2_CFD/include/solvers/CTurbSASolver.hpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class CTurbSASolver final : public CTurbSolver {
108108
unsigned short iMesh,
109109
unsigned short iRKStep,
110110
unsigned short RunTime_EqSystem,
111-
bool Output) final;
111+
bool Output) override;
112112

113113
/*!
114114
* \brief A virtual member.
@@ -119,7 +119,7 @@ class CTurbSASolver final : public CTurbSolver {
119119
void Postprocessing(CGeometry *geometry,
120120
CSolver **solver_container,
121121
CConfig *config,
122-
unsigned short iMesh) final;
122+
unsigned short iMesh) override;
123123

124124
/*!
125125
* \brief Compute the viscous flux for the turbulent equation at a particular edge.
@@ -131,7 +131,7 @@ class CTurbSASolver final : public CTurbSolver {
131131
* \note Calls a generic implementation after defining a SolverSpecificNumerics object.
132132
*/
133133
void Viscous_Residual(unsigned long iEdge, CGeometry* geometry, CSolver** solver_container,
134-
CNumerics* numerics, CConfig* config) final;
134+
CNumerics* numerics, CConfig* config) override;
135135

136136
/*!
137137
* \brief Source term computation.
@@ -145,7 +145,7 @@ class CTurbSASolver final : public CTurbSolver {
145145
CSolver **solver_container,
146146
CNumerics **numerics_container,
147147
CConfig *config,
148-
unsigned short iMesh) final;
148+
unsigned short iMesh) override;
149149

150150
/*!
151151
* \brief Source term computation.
@@ -159,7 +159,7 @@ class CTurbSASolver final : public CTurbSolver {
159159
CSolver **solver_container,
160160
CNumerics *numerics,
161161
CConfig *config,
162-
unsigned short iMesh) final;
162+
unsigned short iMesh) override;
163163

164164
/*!
165165
* \brief Impose the Navier-Stokes wall boundary condition.
@@ -175,7 +175,7 @@ class CTurbSASolver final : public CTurbSolver {
175175
CNumerics *conv_numerics,
176176
CNumerics *visc_numerics,
177177
CConfig *config,
178-
unsigned short val_marker) final;
178+
unsigned short val_marker) override;
179179

180180
/*!
181181
* \brief Impose the Navier-Stokes wall boundary condition.
@@ -191,7 +191,7 @@ class CTurbSASolver final : public CTurbSolver {
191191
CNumerics *conv_numerics,
192192
CNumerics *visc_numerics,
193193
CConfig *config,
194-
unsigned short val_marker) final;
194+
unsigned short val_marker) override;
195195

196196
/*!
197197
* \brief Impose the Far Field boundary condition.
@@ -207,7 +207,7 @@ class CTurbSASolver final : public CTurbSolver {
207207
CNumerics *conv_numerics,
208208
CNumerics *visc_numerics,
209209
CConfig *config,
210-
unsigned short val_marker) final;
210+
unsigned short val_marker) override;
211211

212212
/*!
213213
* \brief Impose the inlet boundary condition.
@@ -223,7 +223,7 @@ class CTurbSASolver final : public CTurbSolver {
223223
CNumerics *conv_numerics,
224224
CNumerics *visc_numerics,
225225
CConfig *config,
226-
unsigned short val_marker) final;
226+
unsigned short val_marker) override;
227227

228228
/*!
229229
* \brief Impose the inlet boundary condition.
@@ -239,7 +239,7 @@ class CTurbSASolver final : public CTurbSolver {
239239
CNumerics *conv_numerics,
240240
CNumerics *visc_numerics,
241241
CConfig *config,
242-
unsigned short val_marker) final;
242+
unsigned short val_marker) override;
243243

244244
/*!
245245
* \brief Impose the inlet boundary condition.
@@ -255,7 +255,7 @@ class CTurbSASolver final : public CTurbSolver {
255255
CNumerics *conv_numerics,
256256
CNumerics *visc_numerics,
257257
CConfig *config,
258-
unsigned short val_marker) final;
258+
unsigned short val_marker) override;
259259

260260
/*!
261261
* \brief Impose the outlet boundary condition.
@@ -271,7 +271,7 @@ class CTurbSASolver final : public CTurbSolver {
271271
CNumerics *conv_numerics,
272272
CNumerics *visc_numerics,
273273
CConfig *config,
274-
unsigned short val_marker) final;
274+
unsigned short val_marker) override;
275275

276276
/*!
277277
* \brief Impose the engine inflow boundary condition.
@@ -287,7 +287,7 @@ class CTurbSASolver final : public CTurbSolver {
287287
CNumerics *conv_numerics,
288288
CNumerics *visc_numerics,
289289
CConfig *config,
290-
unsigned short val_marker) final;
290+
unsigned short val_marker) override;
291291

292292
/*!
293293
* \brief Impose the engine exhaust boundary condition.
@@ -303,7 +303,7 @@ class CTurbSASolver final : public CTurbSolver {
303303
CNumerics *conv_numerics,
304304
CNumerics *visc_numerics,
305305
CConfig *config,
306-
unsigned short val_marker) final;
306+
unsigned short val_marker) override;
307307

308308
/*!
309309
* \brief Impose an actuator disk inlet boundary condition.
@@ -319,7 +319,7 @@ class CTurbSASolver final : public CTurbSolver {
319319
CNumerics *conv_numerics,
320320
CNumerics *visc_numerics,
321321
CConfig *config,
322-
unsigned short val_marker) final;
322+
unsigned short val_marker) override;
323323

324324
/*!
325325
* \brief Impose an actuator disk outlet boundary condition.
@@ -335,7 +335,7 @@ class CTurbSASolver final : public CTurbSolver {
335335
CNumerics *conv_numerics,
336336
CNumerics *visc_numerics,
337337
CConfig *config,
338-
unsigned short val_marker) final;
338+
unsigned short val_marker) override;
339339

340340
/*!
341341
* \brief Impose an actuator disk inlet boundary condition.
@@ -353,7 +353,7 @@ class CTurbSASolver final : public CTurbSolver {
353353
CNumerics *visc_numerics,
354354
CConfig *config,
355355
unsigned short val_marker,
356-
bool val_inlet_surface) final;
356+
bool val_inlet_surface) override;
357357

358358
/*!
359359
* \brief Store of a set of provided inlet profile values at a vertex.
@@ -363,7 +363,7 @@ class CTurbSASolver final : public CTurbSolver {
363363
*/
364364
void SetInletAtVertex(const su2double *val_inlet,
365365
unsigned short iMarker,
366-
unsigned long iVertex) final;
366+
unsigned long iVertex) override;
367367

368368
/*!
369369
* \brief Get the set of value imposed at an inlet.
@@ -379,7 +379,7 @@ class CTurbSASolver final : public CTurbSolver {
379379
unsigned short val_kind_marker,
380380
string val_marker,
381381
const CGeometry *geometry,
382-
const CConfig *config) const final;
382+
const CConfig *config) const override;
383383

384384
/*!
385385
* \brief Set a uniform inlet profile
@@ -390,12 +390,12 @@ class CTurbSASolver final : public CTurbSolver {
390390
* \param[in] config - Definition of the particular problem.
391391
* \param[in] iMarker - Surface marker where the coefficient is computed.
392392
*/
393-
void SetUniformInlet(const CConfig* config, unsigned short iMarker) final;
393+
void SetUniformInlet(const CConfig* config, unsigned short iMarker) override;
394394

395395
/*!
396396
* \brief Get the value of nu tilde at the far-field.
397397
* \return Value of nu tilde at the far-field.
398398
*/
399-
inline su2double GetNuTilde_Inf(void) const final { return Solution_Inf[0]; }
399+
inline su2double GetNuTilde_Inf(void) const override { return Solution_Inf[0]; }
400400

401401
};

‎SU2_CFD/include/solvers/CTurbSSTSolver.hpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class CTurbSSTSolver final : public CTurbSolver {
9292
unsigned short iMesh,
9393
unsigned short iRKStep,
9494
unsigned short RunTime_EqSystem,
95-
bool Output) final;
95+
bool Output) override;
9696

9797
/*!
9898
* \brief Computes the eddy viscosity.
@@ -104,7 +104,7 @@ class CTurbSSTSolver final : public CTurbSolver {
104104
void Postprocessing(CGeometry *geometry,
105105
CSolver **solver_container,
106106
CConfig *config,
107-
unsigned short iMesh) final;
107+
unsigned short iMesh) override;
108108

109109
/*!
110110
* \brief Compute the viscous flux for the turbulent equation at a particular edge.
@@ -116,7 +116,7 @@ class CTurbSSTSolver final : public CTurbSolver {
116116
* \note Calls a generic implementation after defining a SolverSpecificNumerics object.
117117
*/
118118
void Viscous_Residual(unsigned long iEdge, CGeometry* geometry, CSolver** solver_container,
119-
CNumerics* numerics, CConfig* config) final;
119+
CNumerics* numerics, CConfig* config) override;
120120

121121
/*!
122122
* \brief Source term computation.
@@ -130,7 +130,7 @@ class CTurbSSTSolver final : public CTurbSolver {
130130
CSolver **solver_container,
131131
CNumerics **numerics_container,
132132
CConfig *config,
133-
unsigned short iMesh) final;
133+
unsigned short iMesh) override;
134134

135135
/*!
136136
* \brief Source term computation.
@@ -144,7 +144,7 @@ class CTurbSSTSolver final : public CTurbSolver {
144144
CSolver **solver_container,
145145
CNumerics *numerics,
146146
CConfig *config,
147-
unsigned short iMesh) final;
147+
unsigned short iMesh) override;
148148

149149
/*!
150150
* \brief Impose the Navier-Stokes wall boundary condition.
@@ -160,7 +160,7 @@ class CTurbSSTSolver final : public CTurbSolver {
160160
CNumerics *conv_numerics,
161161
CNumerics *visc_numerics,
162162
CConfig *config,
163-
unsigned short val_marker) final;
163+
unsigned short val_marker) override;
164164
/*!
165165
* \brief Impose the Navier-Stokes wall boundary condition.
166166
* \param[in] geometry - Geometrical definition of the problem.
@@ -175,7 +175,7 @@ class CTurbSSTSolver final : public CTurbSolver {
175175
CNumerics *conv_numerics,
176176
CNumerics *visc_numerics,
177177
CConfig *config,
178-
unsigned short val_marker) final;
178+
unsigned short val_marker) override;
179179

180180
/*!
181181
* \brief Impose the Far Field boundary condition.
@@ -191,7 +191,7 @@ class CTurbSSTSolver final : public CTurbSolver {
191191
CNumerics *conv_numerics,
192192
CNumerics *visc_numerics,
193193
CConfig *config,
194-
unsigned short val_marker) final;
194+
unsigned short val_marker) override;
195195

196196
/*!
197197
* \brief Impose the inlet boundary condition.
@@ -207,7 +207,7 @@ class CTurbSSTSolver final : public CTurbSolver {
207207
CNumerics *conv_numerics,
208208
CNumerics *visc_numerics,
209209
CConfig *config,
210-
unsigned short val_marker) final;
210+
unsigned short val_marker) override;
211211

212212
/*!
213213
* \brief Impose the inlet boundary condition.
@@ -223,7 +223,7 @@ class CTurbSSTSolver final : public CTurbSolver {
223223
CNumerics *conv_numerics,
224224
CNumerics *visc_numerics,
225225
CConfig *config,
226-
unsigned short val_marker) final;
226+
unsigned short val_marker) override;
227227

228228
/*!
229229
* \brief Impose the inlet boundary condition.
@@ -239,7 +239,7 @@ class CTurbSSTSolver final : public CTurbSolver {
239239
CNumerics *conv_numerics,
240240
CNumerics *visc_numerics,
241241
CConfig *config,
242-
unsigned short val_marker) final;
242+
unsigned short val_marker) override;
243243
/*!
244244
* \brief Impose the outlet boundary condition.
245245
* \param[in] geometry - Geometrical definition of the problem.
@@ -254,13 +254,13 @@ class CTurbSSTSolver final : public CTurbSolver {
254254
CNumerics *conv_numerics,
255255
CNumerics *visc_numerics,
256256
CConfig *config,
257-
unsigned short val_marker) final;
257+
unsigned short val_marker) override;
258258

259259
/*!
260260
* \brief Get the constants for the SST model.
261261
* \return A pointer to an array containing a set of constants
262262
*/
263-
inline const su2double* GetConstants() const final { return constants; }
263+
inline const su2double* GetConstants() const override { return constants; }
264264

265265
/*!
266266
* \brief Store of a set of provided inlet profile values at a vertex.
@@ -270,7 +270,7 @@ class CTurbSSTSolver final : public CTurbSolver {
270270
*/
271271
void SetInletAtVertex(const su2double *val_inlet,
272272
unsigned short iMarker,
273-
unsigned long iVertex) final;
273+
unsigned long iVertex) override;
274274

275275
/*!
276276
* \brief Get the set of value imposed at an inlet.
@@ -286,7 +286,7 @@ class CTurbSSTSolver final : public CTurbSolver {
286286
unsigned short val_kind_marker,
287287
string val_marker,
288288
const CGeometry *geometry,
289-
const CConfig *config) const final;
289+
const CConfig *config) const override;
290290
/*!
291291
* \brief Set a uniform inlet profile
292292
*
@@ -296,19 +296,19 @@ class CTurbSSTSolver final : public CTurbSolver {
296296
* \param[in] config - Definition of the particular problem.
297297
* \param[in] iMarker - Surface marker where the coefficient is computed.
298298
*/
299-
void SetUniformInlet(const CConfig* config, unsigned short iMarker) final;
299+
void SetUniformInlet(const CConfig* config, unsigned short iMarker) override;
300300

301301
/*!
302302
* \brief Get the value of the turbulent kinetic energy.
303303
* \return Value of the turbulent kinetic energy.
304304
*/
305-
inline su2double GetTke_Inf(void) const final { return Solution_Inf[0]; }
305+
inline su2double GetTke_Inf(void) const override { return Solution_Inf[0]; }
306306

307307
/*!
308308
* \brief Get the value of the turbulent frequency.
309309
* \return Value of the turbulent frequency.
310310
*/
311-
inline su2double GetOmega_Inf(void) const final { return Solution_Inf[1]; }
311+
inline su2double GetOmega_Inf(void) const override { return Solution_Inf[1]; }
312312

313313

314314
};

‎SU2_CFD/include/variables/CTurbSAVariable.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,47 +59,47 @@ class CTurbSAVariable final : public CTurbVariable {
5959
/*!
6060
* \brief Destructor of the class.
6161
*/
62-
~CTurbSAVariable() final = default;
62+
~CTurbSAVariable() override = default;
6363

6464
/*!
6565
* \brief Get the intermittency of the BC transition model.
6666
* \param[in] iPoint - Point index.
6767
* \return Value of the intermittency of the BC transition model.
6868
*/
69-
inline su2double GetGammaBC(unsigned long iPoint) const final { return gamma_BC(iPoint); }
69+
inline su2double GetGammaBC(unsigned long iPoint) const override { return gamma_BC(iPoint); }
7070

7171
/*!
7272
* \brief Set the intermittency of the BC transition model.
7373
* \param[in] iPoint - Point index.
7474
* \param[in] val_gamma - New value of the intermittency.
7575
*/
76-
inline void SetGammaBC(unsigned long iPoint, su2double val_gamma) final { gamma_BC(iPoint) = val_gamma; }
76+
inline void SetGammaBC(unsigned long iPoint, su2double val_gamma) override { gamma_BC(iPoint) = val_gamma; }
7777

7878
/*!
7979
* \brief Get the DES length scale
8080
* \param[in] iPoint - Point index.
8181
* \return Value of the DES length Scale.
8282
*/
83-
inline su2double GetDES_LengthScale(unsigned long iPoint) const final { return DES_LengthScale(iPoint); }
83+
inline su2double GetDES_LengthScale(unsigned long iPoint) const override { return DES_LengthScale(iPoint); }
8484

8585
/*!
8686
* \brief Set the DES Length Scale.
8787
* \param[in] iPoint - Point index.
8888
*/
89-
inline void SetDES_LengthScale(unsigned long iPoint, su2double val_des_lengthscale) final { DES_LengthScale(iPoint) = val_des_lengthscale; }
89+
inline void SetDES_LengthScale(unsigned long iPoint, su2double val_des_lengthscale) override { DES_LengthScale(iPoint) = val_des_lengthscale; }
9090

9191
/*!
9292
* \brief Set the vortex tilting measure for computation of the EDDES length scale
9393
* \param[in] iPoint - Point index.
9494
*/
9595
void SetVortex_Tilting(unsigned long iPoint, CMatrixView<const su2double>,
96-
const su2double* Vorticity, su2double LaminarViscosity) final;
96+
const su2double* Vorticity, su2double LaminarViscosity) override;
9797

9898
/*!
9999
* \brief Get the vortex tilting measure for computation of the EDDES length scale
100100
* \param[in] iPoint - Point index.
101101
* \return Value of the DES length Scale
102102
*/
103-
inline su2double GetVortex_Tilting(unsigned long iPoint) const final { return Vortex_Tilting(iPoint); }
103+
inline su2double GetVortex_Tilting(unsigned long iPoint) const override { return Vortex_Tilting(iPoint); }
104104

105105
};

0 commit comments

Comments
 (0)