Skip to content

Commit a4836f4

Browse files
authored
Merge pull request #1445 from su2code/fix_gcc485
Fix compilation with GCC 4.8.5
2 parents 0a053ef + e91160c commit a4836f4

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

SU2_CFD/include/numerics/turbulent/turb_sources.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,9 @@ class CSourcePieceWise_TurbSST final : public CNumerics {
334334

335335
su2double kAmb, omegaAmb;
336336

337-
su2double Residual[2],
338-
*Jacobian_i[2] = {nullptr},
339-
Jacobian_Buffer[4] = {0.0}; /// Static storage for the Jacobian (which needs to be pointer for return type).
337+
su2double Residual[2];
338+
su2double* Jacobian_i[2];
339+
su2double Jacobian_Buffer[4]; /// Static storage for the Jacobian (which needs to be pointer for return type).
340340

341341
bool incompressible;
342342
bool sustaining_terms;

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2554,7 +2554,7 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
25542554
/*--- Compute non-dimensional velocity and y+ ---*/
25552555

25562556
FrictionVel = sqrt(fabs(WallShearStress[iMarker][iVertex]) / Density);
2557-
2557+
25582558
if (!wallfunctions) {
25592559
YPlus[iMarker][iVertex] = WallDistMod * FrictionVel / (Viscosity / Density);
25602560
}
@@ -2583,12 +2583,12 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
25832583
const auto& thermal_conductivity_tr = nodes->GetThermalConductivity(iPoint);
25842584
const auto& thermal_conductivity_ve = nodes->GetThermalConductivity_ve(iPoint);
25852585
const auto& Grad_PrimVar = nodes->GetGradient_Primitive(iPoint);
2586-
2586+
25872587
su2double dTn = GeometryToolbox::DotProduct(nDim, Grad_PrimVar[T_INDEX], UnitNormal);
25882588
su2double dTven = GeometryToolbox::DotProduct(nDim, Grad_PrimVar[TVE_INDEX], UnitNormal);
2589-
2589+
25902590
/*--- Surface energy balance: trans-rot heat flux, vib-el heat flux,
2591-
enthalpy transport due to mass diffusion ---*/
2591+
enthalpy transport due to mass diffusion ---*/
25922592
HeatFlux[iMarker][iVertex] = thermal_conductivity_tr*dTn + thermal_conductivity_ve*dTven;
25932593
}
25942594

0 commit comments

Comments
 (0)