Skip to content

Commit 19d3329

Browse files
committed
Remove errors from #1281. No auto for su2double with rhs math operation and MAXNVAR fix for flow.
1 parent 9a6346f commit 19d3329

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

SU2_CFD/src/solvers/CHeatSolver.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@ void CHeatSolver::Upwind_Residual(CGeometry *geometry, CSolver **solver_containe
363363
nVarFlow = solver_container[FLOW_SOL]->GetnVar();
364364

365365
/*--- Define some auxiliary vectors related to the primitive flow solution ---*/
366-
su2double Primitive_Flow_i[MAXNVAR] = {0};
367-
su2double Primitive_Flow_j[MAXNVAR] = {0};
366+
vector<su2double> Primitive_Flow_i(nVarFlow, 0.0);
367+
vector<su2double> Primitive_Flow_j(nVarFlow, 0.0);
368368

369369
for (auto iEdge = 0ul; iEdge < geometry->GetnEdge(); iEdge++) {
370370

@@ -421,7 +421,7 @@ void CHeatSolver::Upwind_Residual(CGeometry *geometry, CSolver **solver_containe
421421
Temp_i_Corrected = Temp_i + Project_Temp_i_Grad;
422422
Temp_j_Corrected = Temp_j + Project_Temp_j_Grad;
423423

424-
numerics->SetPrimitive(Primitive_Flow_i, Primitive_Flow_j);
424+
numerics->SetPrimitive(Primitive_Flow_i.data(), Primitive_Flow_j.data());
425425
numerics->SetTemperature(Temp_i_Corrected, Temp_j_Corrected);
426426
}
427427

@@ -571,9 +571,9 @@ void CHeatSolver::BC_Isothermal_Wall(CGeometry *geometry, CSolver **solver_conta
571571
su2double *Normal, *Coord_i, *Coord_j, Area, dist_ij, Twall, dTdn;
572572
const bool implicit = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
573573

574-
const auto laminar_viscosity = config->GetMu_ConstantND();
575-
const auto Prandtl_Lam = config->GetPrandtl_Lam();
576-
const auto thermal_diffusivity = flow ? laminar_viscosity/Prandtl_Lam : config->GetThermalDiffusivity_Solid();
574+
const su2double laminar_viscosity = config->GetMu_ConstantND();
575+
const su2double Prandtl_Lam = config->GetPrandtl_Lam();
576+
const su2double thermal_diffusivity = flow ? laminar_viscosity/Prandtl_Lam : config->GetThermalDiffusivity_Solid();
577577

578578
//su2double Prandtl_Turb = config->GetPrandtl_Turb();
579579
//laminar_viscosity = config->GetViscosity_FreeStreamND(); // TDE check for consistency for CHT
@@ -832,8 +832,8 @@ void CHeatSolver::BC_ConjugateHeat_Interface(CGeometry *geometry, CSolver **solv
832832

833833
const bool implicit = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
834834

835-
const auto Temperature_Ref = config->GetTemperature_Ref();
836-
const auto rho_cp_solid = config->GetDensity_Solid()*config->GetSpecific_Heat_Cp();
835+
const su2double Temperature_Ref = config->GetTemperature_Ref();
836+
const su2double rho_cp_solid = config->GetDensity_Solid()*config->GetSpecific_Heat_Cp();
837837

838838
if (flow) {
839839

0 commit comments

Comments
 (0)