Skip to content

Commit 1f4232a

Browse files
committed
fix compilation error on gcc 5.4, remove obsolete option from testcases
1 parent d7933df commit 1f4232a

6 files changed

Lines changed: 14 additions & 15 deletions

File tree

Common/include/CConfig.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -821,9 +821,9 @@ class CConfig {
821821
su2double* CpPolyCoefficients; /*!< \brief Definition of the temperature polynomial coefficients for specific heat Cp. */
822822
su2double* MuPolyCoefficients; /*!< \brief Definition of the temperature polynomial coefficients for viscosity. */
823823
su2double* KtPolyCoefficients; /*!< \brief Definition of the temperature polynomial coefficients for thermal conductivity. */
824-
array<su2double, N_POLY_COEFFS> CpPolyCoefficientsND{0.0}; /*!< \brief Definition of the non-dimensional temperature polynomial coefficients for specific heat Cp. */
825-
array<su2double, N_POLY_COEFFS>MuPolyCoefficientsND{0.0}; /*!< \brief Definition of the non-dimensional temperature polynomial coefficients for viscosity. */
826-
array<su2double, N_POLY_COEFFS>KtPolyCoefficientsND{0.0}; /*!< \brief Definition of the non-dimensional temperature polynomial coefficients for thermal conductivity. */
824+
array<su2double, N_POLY_COEFFS> CpPolyCoefficientsND{{0.0}}; /*!< \brief Definition of the non-dimensional temperature polynomial coefficients for specific heat Cp. */
825+
array<su2double, N_POLY_COEFFS> MuPolyCoefficientsND{{0.0}}; /*!< \brief Definition of the non-dimensional temperature polynomial coefficients for viscosity. */
826+
array<su2double, N_POLY_COEFFS> KtPolyCoefficientsND{{0.0}}; /*!< \brief Definition of the non-dimensional temperature polynomial coefficients for thermal conductivity. */
827827
su2double Thermal_Conductivity_Solid, /*!< \brief Thermal conductivity in solids. */
828828
Thermal_Diffusivity_Solid, /*!< \brief Thermal diffusivity in solids. */
829829
Temperature_Freestream_Solid, /*!< \brief Temperature in solids at freestream conditions. */
@@ -1017,9 +1017,9 @@ class CConfig {
10171017
su2double FinalRotation_Rate_Z; /*!< \brief Final rotation rate Z if Ramp rotating frame is activated. */
10181018
su2double FinalOutletPressure; /*!< \brief Final outlet pressure if Ramp outlet pressure is activated. */
10191019
su2double MonitorOutletPressure; /*!< \brief Monitor outlet pressure if Ramp outlet pressure is activated. */
1020-
array<su2double, N_POLY_COEFFS> default_cp_polycoeffs{0.0}; /*!< \brief Array for specific heat polynomial coefficients. */
1021-
array<su2double, N_POLY_COEFFS> default_mu_polycoeffs{0.0}; /*!< \brief Array for viscosity polynomial coefficients. */
1022-
array<su2double, N_POLY_COEFFS> default_kt_polycoeffs{0.0}; /*!< \brief Array for thermal conductivity polynomial coefficients. */
1020+
array<su2double, N_POLY_COEFFS> default_cp_polycoeffs{{0.0}}; /*!< \brief Array for specific heat polynomial coefficients. */
1021+
array<su2double, N_POLY_COEFFS> default_mu_polycoeffs{{0.0}}; /*!< \brief Array for viscosity polynomial coefficients. */
1022+
array<su2double, N_POLY_COEFFS> default_kt_polycoeffs{{0.0}}; /*!< \brief Array for thermal conductivity polynomial coefficients. */
10231023
su2double *ExtraRelFacGiles; /*!< \brief coefficient for extra relaxation factor for Giles BC*/
10241024
bool Body_Force; /*!< \brief Flag to know if a body force is included in the formulation. */
10251025
su2double *Body_Force_Vector; /*!< \brief Values of the prescribed body force vector. */

SU2_CFD/include/fluid/CIncIdealGasPolynomial.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ class CIncIdealGasPolynomial final : public CFluidModel {
7474

7575
/* Evaluate the new Cp from the coefficients and temperature. */
7676
Cp = coeffs_[0];
77+
su2double t_i = 1.0;
7778
for (int i = 1; i < N; ++i) {
78-
su2double t_i = t;
79-
for (int j = 1; j < i; ++j) t_i *= t;
79+
t_i *= t;
8080
Cp += coeffs_[i] * t_i;
8181
}
8282
Cv = Cp / Gamma;

SU2_CFD/include/fluid/CPolynomialConductivity.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ class CPolynomialConductivity final : public CConductivityModel {
6767
void SetConductivity(su2double t, su2double rho, su2double mu_lam, su2double mu_turb, su2double cp) override {
6868
/* Evaluate the new kt from the coefficients and temperature. */
6969
kt_ = coeffs_[0];
70+
su2double t_i = 1.0;
7071
for (int i = 1; i < N; ++i) {
71-
su2double t_i = t;
72-
for (int j = 1; j < i; ++j) t_i *= t;
72+
t_i *= t;
7373
kt_ += coeffs_[i] * t_i;
7474
}
7575
}

SU2_CFD/include/fluid/CPolynomialConductivityRANS.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ class CPolynomialConductivityRANS final : public CConductivityModel {
6969
void SetConductivity(su2double t, su2double rho, su2double mu_lam, su2double mu_turb, su2double cp) override {
7070
/* Evaluate the new kt from the coefficients and temperature. */
7171
kt_ = coeffs_[0];
72+
su2double t_i = 1.0;
7273
for (int i = 1; i < N; ++i) {
73-
su2double t_i = t;
74-
for (int j = 1; j < i; ++j) t_i *= t;
74+
t_i *= t;
7575
kt_ += coeffs_[i] * t_i;
7676
}
7777

SU2_CFD/include/fluid/CPolynomialViscosity.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ class CPolynomialViscosity final : public CViscosityModel {
6969
void SetViscosity(su2double t, su2double rho) override {
7070
/* Evaluate the new mu from the coefficients and temperature. */
7171
mu_ = coeffs_[0];
72+
su2double t_i = 1.0;
7273
for (int i = 1; i < N; ++i) {
73-
su2double t_i = t;
74-
for (int j = 1; j < i; ++j) t_i *= t;
74+
t_i *= t;
7575
mu_ += coeffs_[i] * t_i;
7676
}
7777
}

TestCases/disc_adj_fea/configAD_fem.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ DEAD_LOAD=NO
4242
FORMULATION_ELASTICITY_2D = PLANE_STRAIN
4343

4444
NONLINEAR_FEM_SOLUTION_METHOD = NEWTON_RAPHSON
45-
NONLINEAR_FEM_INT_ITER = 10
4645

4746
CONV_FILENAME= history
4847
VOLUME_FILENAME= beam

0 commit comments

Comments
 (0)