Skip to content

Commit 0edd71f

Browse files
Used MAXNDIM and MAXNVAR to initialize arrays in TurboAverageProcess
1 parent e81bf06 commit 0edd71f

1 file changed

Lines changed: 8 additions & 27 deletions

File tree

SU2_CFD/src/solvers/CEulerSolver.cpp

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8586,14 +8586,11 @@ void CEulerSolver::TurboAverageProcess(CSolver **solver, CGeometry *geometry, CC
85868586
const auto nSpanWiseSections = config->GetnSpanWiseSections();
85878587

85888588
for (auto iSpan= 0; iSpan < nSpanWiseSections + 1; iSpan++){
8589-
su2double TotalDensity{0}, TotalPressure{0}, TotalNu{0}, TotalOmega{0}, TotalKine{0},
8590-
TotalAreaDensity{0}, TotalAreaPressure{0}, TotalAreaNu{0}, TotalAreaOmega{0}, TotalAreaKine{0},
8591-
TotalMassDensity{0}, TotalMassPressure{0}, TotalMassNu{0}, TotalMassOmega{0}, TotalMassKine{0};
8592-
8593-
su2double *TotalVelocity = new su2double[nDim],
8594-
*TotalAreaVelocity = new su2double[nDim],
8595-
*TotalMassVelocity = new su2double[nDim],
8596-
*TotalFluxes = new su2double[nVar];
8589+
su2double TotalDensity{0}, TotalPressure{0}, TotalNu{0}, TotalOmega{0}, TotalKine{0}, TotalVelocity[MAXNDIM],
8590+
TotalAreaDensity{0}, TotalAreaPressure{0}, TotalAreaNu{0}, TotalAreaOmega{0}, TotalAreaKine{0}, TotalAreaVelocity[MAXNDIM],
8591+
TotalMassDensity{0}, TotalMassPressure{0}, TotalMassNu{0}, TotalMassOmega{0}, TotalMassKine{0}, TotalMassVelocity[MAXNDIM];
8592+
8593+
su2double TotalFluxes[MAXNVAR];
85978594
/*--- Forces initialization for contenitors ---*/
85988595
for (auto iVar=0u;iVar<nVar;iVar++)
85998596
TotalFluxes[iVar]= 0.0;
@@ -8613,11 +8610,7 @@ void CEulerSolver::TurboAverageProcess(CSolver **solver, CGeometry *geometry, CC
86138610
auto Density = nodes->GetDensity(iPoint);
86148611
auto Enthalpy = nodes->GetEnthalpy(iPoint);
86158612

8616-
su2double *Velocity = new su2double[nDim],
8617-
*UnitNormal = new su2double[nDim],
8618-
*TurboNormal = new su2double[nDim],
8619-
*TurboVelocity = new su2double[nDim];
8620-
8613+
su2double Velocity[MAXNDIM] = {0}, UnitNormal[MAXNDIM] = {0}, TurboNormal[MAXNDIM] = {0}, TurboVelocity[MAXNDIM] = {0};
86218614
geometry->turbovertex[iMarker][iSpan][iVertex]->GetNormal(UnitNormal);
86228615
geometry->turbovertex[iMarker][iSpan][iVertex]->GetTurboNormal(TurboNormal);
86238616
auto Area = geometry->turbovertex[iMarker][iSpan][iVertex]->GetArea();
@@ -8672,11 +8665,6 @@ void CEulerSolver::TurboAverageProcess(CSolver **solver, CGeometry *geometry, CC
86728665
TotalMassOmega += Area*(Density*TurboVelocity[0] )*Omega;
86738666
TotalMassNu += Area*(Density*TurboVelocity[0] )*Nu;
86748667
}
8675-
8676-
delete [] Velocity;
8677-
delete [] UnitNormal;
8678-
delete [] TurboNormal;
8679-
delete [] TurboVelocity;
86808668
};
86818669

86828670
for (auto iMarker = 0u; iMarker < config->GetnMarker_All(); iMarker++){
@@ -8764,9 +8752,8 @@ void CEulerSolver::TurboAverageProcess(CSolver **solver, CGeometry *geometry, CC
87648752
/*--- Compute the averaged value for the boundary of interest for the span of interest ---*/
87658753

87668754
bool belowMachLimit = (abs(MachTest)< config->GetAverageMachLimit());
8767-
su2double avgDensity{0}, avgPressure{0}, avgKine{0}, avgOmega{0}, avgNu{0};
8768-
su2double *avgVelocity = new su2double[nDim],
8769-
*avgMixTurboVelocity = new su2double[nDim];
8755+
su2double avgDensity{0}, avgPressure{0}, avgKine{0}, avgOmega{0}, avgNu{0},
8756+
avgVelocity[MAXNDIM] = {0}, avgMixTurboVelocity[MAXNDIM] = {0};
87708757
for (auto iVar = 0u; iVar<nVar; iVar++){
87718758
AverageFlux[iMarker][iSpan][iVar] = TotalFluxes[iVar]/TotalArea;
87728759
SpanTotalFlux[iMarker][iSpan][iVar] = TotalFluxes[iVar];
@@ -8919,16 +8906,10 @@ void CEulerSolver::TurboAverageProcess(CSolver **solver, CGeometry *geometry, CC
89198906
} else {
89208907
ComputeTurboVelocity(avgVelocity, AverageTurboNormal , TurboVel, marker_flag, config->GetKind_TurboMachinery(iZone));
89218908
}
8922-
delete [] avgVelocity;
8923-
delete [] avgMixTurboVelocity;
89248909
}
89258910
}
89268911
} // iMarkerTP
89278912
} // iMarker
8928-
delete [] TotalVelocity;
8929-
delete [] TotalMassVelocity;
8930-
delete [] TotalAreaVelocity;
8931-
delete [] TotalFluxes;
89328913
} // iSpan
89338914

89348915
/*--- Compute Outlet Static Pressure if Radial equilibrium is imposed ---*/

0 commit comments

Comments
 (0)