Skip to content

Commit b8ecc10

Browse files
Merge branch 'develop' into feature_preconditioning
2 parents 61be943 + 5e038c0 commit b8ecc10

File tree

2 files changed

+5
-17
lines changed

2 files changed

+5
-17
lines changed

SU2_CFD/include/numerics/flow/flow_diffusion.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,7 @@ class CAvgGradInc_Flow final : public CAvgGrad_Base {
349349
*/
350350
class CGeneralAvgGrad_Flow final : public CAvgGrad_Base {
351351
private:
352-
su2double Mean_SecVar[2], /*!< \brief Mean secondary variables. */
353-
Mean_Thermal_Conductivity, /*!< \brief Mean value of the thermal conductivity. */
354-
Mean_Cp; /*!< \brief Mean value of the Cp. */
352+
su2double Mean_SecVar[2]; /*!< \brief Mean secondary variables. */
355353

356354
/*!
357355
* \brief Compute the Jacobian of the heat flux vector

SU2_CFD/src/numerics/flow/flow_sources.cpp

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -489,13 +489,9 @@ CNumerics::ResidualType<> CSourceGravity::ComputeResidual(const CConfig* config)
489489
return ResidualType<>(residual, jacobian, nullptr);
490490
}
491491

492-
CSourceRotatingFrame_Flow::CSourceRotatingFrame_Flow(unsigned short val_nDim, unsigned short val_nVar, const CConfig* config) :
493-
CSourceBase_Flow(val_nDim, val_nVar, config) {
494-
495-
Gamma = config->GetGamma();
496-
Gamma_Minus_One = Gamma - 1.0;
497-
498-
}
492+
CSourceRotatingFrame_Flow::CSourceRotatingFrame_Flow(unsigned short val_nDim, unsigned short val_nVar,
493+
const CConfig* config)
494+
: CSourceBase_Flow(val_nDim, val_nVar, config) {}
499495

500496
CNumerics::ResidualType<> CSourceRotatingFrame_Flow::ComputeResidual(const CConfig* config) {
501497

@@ -557,9 +553,6 @@ CSourceIncRotatingFrame_Flow::CSourceIncRotatingFrame_Flow(unsigned short val_nD
557553

558554
implicit = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
559555

560-
Gamma = config->GetGamma();
561-
Gamma_Minus_One = Gamma - 1.0;
562-
563556
/*--- Retrieve the angular velocity vector from config. ---*/
564557
for (unsigned short iDim = 0; iDim < 3; iDim++)
565558
Omega[iDim] = config->GetRotation_Rate(iDim)/config->GetOmega_Ref();
@@ -620,10 +613,7 @@ CNumerics::ResidualType<> CSourceIncRotatingFrame_Flow::ComputeResidual(const CC
620613

621614
CSourceVorticityConfinement::CSourceVorticityConfinement(unsigned short val_nDim, unsigned short val_nVar,
622615
const CConfig* config)
623-
: CSourceBase_Flow(val_nDim, val_nVar, config) {
624-
Gamma = config->GetGamma();
625-
Gamma_Minus_One = Gamma - 1.0;
626-
}
616+
: CSourceBase_Flow(val_nDim, val_nVar, config) {}
627617

628618
CNumerics::ResidualType<> CSourceVorticityConfinement::ComputeResidual(const CConfig* config) {
629619
/*--- density, \rho ---*/

0 commit comments

Comments
 (0)