Skip to content

Commit 15a3b6b

Browse files
Applied const correctness to MixedOut_Average function
1 parent b9d366d commit 15a3b6b

1 file changed

Lines changed: 17 additions & 25 deletions

File tree

SU2_CFD/src/solvers/CEulerSolver.cpp

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9444,42 +9444,37 @@ void CEulerSolver::TurboAverageProcess(CSolver **solver, CGeometry *geometry, CC
94449444
void CEulerSolver::MixedOut_Average (CConfig *config, su2double val_init_pressure, const su2double *val_Averaged_Flux,
94459445
const su2double *val_normal, su2double& pressure_mix, su2double& density_mix) {
94469446

9447-
su2double dx, f, df, resdl = 1.0E+05;
9448-
unsigned short iter = 0, iDim;
9449-
su2double relax_factor = config->GetMixedout_Coeff(0);
9450-
su2double toll = config->GetMixedout_Coeff(1);
9447+
su2double resdl = 1.0E+05;
9448+
const auto relax_factor = config->GetMixedout_Coeff(0);
9449+
const auto toll = config->GetMixedout_Coeff(1);
94519450
unsigned short maxiter = SU2_TYPE::Int(config->GetMixedout_Coeff(2));
9452-
su2double dhdP, dhdrho, enthalpy_mix, velsq, *vel;
9453-
9454-
vel = new su2double[nDim];
94559451

94569452
pressure_mix = val_init_pressure;
94579453

94589454
/*--- Newton-Raphson's method with central difference formula ---*/
9459-
9455+
unsigned short iter{0};
94609456
while ( iter <= maxiter ) {
94619457

9462-
density_mix = val_Averaged_Flux[0]*val_Averaged_Flux[0]/(val_Averaged_Flux[1] - pressure_mix);
9458+
const su2double density_mix = val_Averaged_Flux[0]*val_Averaged_Flux[0]/(val_Averaged_Flux[1] - pressure_mix);
94639459
GetFluidModel()->SetTDState_Prho(pressure_mix, density_mix);
9464-
enthalpy_mix = GetFluidModel()->GetStaticEnergy() + (pressure_mix)/(density_mix);
9460+
const su2double enthalpy_mix = GetFluidModel()->GetStaticEnergy() + (pressure_mix)/(density_mix);
94659461

94669462
GetFluidModel()->ComputeDerivativeNRBC_Prho(pressure_mix, density_mix);
9467-
dhdP = GetFluidModel()->GetdhdP_rho();
9468-
dhdrho = GetFluidModel()->Getdhdrho_P();
9463+
const su2double dhdP = GetFluidModel()->GetdhdP_rho();
9464+
const su2double dhdrho = GetFluidModel()->Getdhdrho_P();
94699465

9466+
su2double vel[MAXNDIM] = {0};
94709467
vel[0] = (val_Averaged_Flux[1] - pressure_mix) / val_Averaged_Flux[0];
9471-
for (iDim = 1; iDim < nDim; iDim++) {
9468+
for (auto iDim = 1u; iDim < nDim; iDim++)
94729469
vel[iDim] = val_Averaged_Flux[iDim+1] / val_Averaged_Flux[0];
9473-
}
9470+
94749471

9475-
velsq = 0.0;
9476-
for (unsigned short iDim = 0; iDim < nDim; iDim++) {
9477-
velsq += vel[iDim]*vel[iDim];
9478-
}
9479-
f = val_Averaged_Flux[nDim+1] - val_Averaged_Flux[0]*(enthalpy_mix + velsq/2);
9480-
df = -val_Averaged_Flux[0]*(dhdP - 1/density_mix) - dhdrho*density_mix*density_mix/val_Averaged_Flux[0];
9481-
dx = -f/df;
9482-
resdl = dx/val_init_pressure;
9472+
const su2double velsq = GeometryToolbox::DotProduct(nDim, vel, vel);
9473+
9474+
const su2double f = val_Averaged_Flux[nDim+1] - val_Averaged_Flux[0]*(enthalpy_mix + velsq/2);
9475+
const su2double df = -val_Averaged_Flux[0]*(dhdP - 1/density_mix) - dhdrho*density_mix*density_mix/val_Averaged_Flux[0];
9476+
const su2double dx = -f/df;
9477+
const su2double resdl = dx/val_init_pressure;
94839478
pressure_mix += relax_factor*dx;
94849479

94859480
iter += 1;
@@ -9488,11 +9483,8 @@ void CEulerSolver::MixedOut_Average (CConfig *config, su2double val_init_pressur
94889483
}
94899484

94909485
}
9491-
94929486
density_mix = val_Averaged_Flux[0]*val_Averaged_Flux[0]/(val_Averaged_Flux[1] - pressure_mix);
94939487

9494-
delete [] vel;
9495-
94969488
}
94979489

94989490
void CEulerSolver::GatherInOutAverageValues(CConfig *config, CGeometry *geometry){

0 commit comments

Comments
 (0)