Skip to content

Commit 3ce0bad

Browse files
WallyMaierWallyMaier
committed
updating regression, final pr comments, constifyings functions
1 parent ae3c554 commit 3ce0bad

11 files changed

Lines changed: 15 additions & 21 deletions

File tree

‎SU2_CFD/include/fluid/CNEMOGas.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,17 +202,17 @@ class CNEMOGas : public CFluidModel {
202202
/*!
203203
* \brief Compute derivative of pressure w.r.t. conservative variables.
204204
*/
205-
void ComputedPdU(su2double *V, vector<su2double>& val_eves, su2double *val_dPdU);
205+
void ComputedPdU(const su2double *V, const vector<su2double>& val_eves, su2double *val_dPdU);
206206

207207
/*!
208208
* \brief Compute derivative of temperature w.r.t. conservative variables.
209209
*/
210-
void ComputedTdU(su2double *V, su2double *val_dTdU);
210+
void ComputedTdU(const su2double *V, su2double *val_dTdU);
211211

212212
/*!
213213
* \brief Compute derivative of vibrational temperature w.r.t. conservative variables.
214214
*/
215-
void ComputedTvedU(su2double *V, vector<su2double>& val_eves, su2double *val_dTvedU);
215+
void ComputedTvedU(const su2double *V, const vector<su2double>& val_eves, su2double *val_dTvedU);
216216

217217
/*!
218218
* \brief Set the translational temperature.

‎SU2_CFD/include/numerics/CNumerics.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,12 +1413,12 @@ class CNumerics {
14131413
const bool jac_j = residual.jacobian_j != nullptr;
14141414

14151415
for (auto iVar = 0; iVar<nVar; iVar++){
1416-
if (residual[iVar] != residual[iVar]) ERR = true;
1416+
if (std::isnan(SU2_TYPE::GetValue(residual[iVar]))) ERR = true;
14171417

14181418
if (implicit) {
14191419
for (auto jVar = 0; jVar < nVar; jVar++){
1420-
if (residual.jacobian_i[iVar][jVar] != residual.jacobian_i[iVar][jVar]) ERR = true;
1421-
if ((jac_j) && (residual.jacobian_j[iVar][jVar] != residual.jacobian_j[iVar][jVar])) ERR = true;
1420+
if (std::isnan(SU2_TYPE::GetValue(residual.jacobian_i[iVar][jVar]))) ERR = true;
1421+
if ((jac_j) && (std::isnan(SU2_TYPE::GetValue(residual.jacobian_j[iVar][jVar])))) ERR = true;
14221422
}
14231423
}
14241424
}

‎SU2_CFD/include/numerics/NEMO/convection/lax.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class CCentLax_NEMO : public CNEMONumerics {
4040

4141
su2double *Diff_U; /*!< \brief Difference of conservative variables. */
4242
su2double *MeanU, *MeanV;
43-
vector<su2double> mean_eves;
4443
su2double *MeandPdU;
4544
su2double *ProjFlux; /*!< \brief Projected inviscid flux tensor. */
4645
su2double Param_p, Param_Kappa_0; /*!< \brief Artificial dissipation parameters. */

‎SU2_CFD/include/numerics/NEMO/convection/msw.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class CUpwMSW_NEMO : public CNEMONumerics {
4545
su2double *rhosst_i, *rhosst_j;
4646
su2double ProjVel_i, ProjVel_j;
4747
su2double *Ust_i, *Ust_j, *Vst_i, *Vst_j;
48-
vector<su2double> eves_st_i, eves_st_j;
4948
su2double *dPdUst_i, *dPdUst_j;
5049
su2double **P_Tensor, **invP_Tensor;
5150

‎SU2_CFD/include/numerics/NEMO/convection/roe.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class CUpwRoe_NEMO : public CNEMONumerics {
4040
private:
4141
su2double *Diff_U;
4242
su2double *RoeU, *RoeV;
43-
vector<su2double> roe_eves;
4443
su2double *ProjFlux_i, *ProjFlux_j;
4544
su2double *Lambda, *Epsilon;
4645
su2double **P_Tensor, **invP_Tensor;

‎SU2_CFD/src/fluid/CNEMOGas.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ su2double CNEMOGas::ComputerhoCvve() {
155155
return rhoCvve;
156156
}
157157

158-
void CNEMOGas::ComputedPdU(su2double *V, vector<su2double>& val_eves, su2double *val_dPdU){
158+
void CNEMOGas::ComputedPdU(const su2double *V, const vector<su2double>& val_eves, su2double *val_dPdU){
159159

160160
// Note: Electron energy not included properly.
161161

@@ -238,7 +238,7 @@ void CNEMOGas::ComputedPdU(su2double *V, vector<su2double>& val_eves, su2double
238238

239239
}
240240

241-
void CNEMOGas::ComputedTdU(su2double *V, su2double *val_dTdU){
241+
void CNEMOGas::ComputedTdU(const su2double *V, su2double *val_dTdU){
242242

243243
/*--- Necessary indexes to assess primitive variables ---*/
244244
const unsigned long T_INDEX = nSpecies;
@@ -276,7 +276,7 @@ void CNEMOGas::ComputedTdU(su2double *V, su2double *val_dTdU){
276276

277277
}
278278

279-
void CNEMOGas::ComputedTvedU(su2double *V, vector<su2double>& val_eves, su2double *val_dTvedU){
279+
void CNEMOGas::ComputedTvedU(const su2double *V, const vector<su2double>& val_eves, su2double *val_dTvedU){
280280

281281
/*--- Necessary indexes to assess primitive variables ---*/
282282
unsigned long RHOCVVE_INDEX = nSpecies+nDim+7;

‎SU2_CFD/src/numerics/NEMO/convection/lax.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ CNumerics::ResidualType<> CCentLax_NEMO::ComputeResidual(const CConfig *config)
9393
MeanV[iVar] = 0.5*(V_i[iVar]+V_j[iVar]);
9494

9595
/*--- Compute NonEq specific variables ---*/
96-
auto& mean_eves = fluidmodel->ComputeSpeciesEve(MeanV[TVE_INDEX]);
96+
const auto& mean_eves = fluidmodel->ComputeSpeciesEve(MeanV[TVE_INDEX]);
9797
fluidmodel->ComputedPdU(MeanV, mean_eves, MeandPdU);
9898

9999
/*--- Get projected flux tensor ---*/

‎SU2_CFD/src/numerics/NEMO/convection/msw.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ CUpwMSW_NEMO::CUpwMSW_NEMO(unsigned short val_nDim,
5757
dPdUst_i = new su2double [nVar];
5858
dPdUst_j = new su2double [nVar];
5959

60-
eves_st_i.resize(nSpecies,0.0);
61-
eves_st_j.resize(nSpecies,0.0);
62-
6360
P_Tensor = new su2double* [nVar];
6461
invP_Tensor = new su2double* [nVar];
6562
for (unsigned short iVar = 0; iVar < nVar; iVar++) {
@@ -174,8 +171,8 @@ CNumerics::ResidualType<> CUpwMSW_NEMO::ComputeResidual(const CConfig *config) {
174171
su2double ProjVelst_i = onemw*ProjVel_i + w*ProjVel_j;
175172
su2double ProjVelst_j = onemw*ProjVel_j + w*ProjVel_i;
176173

177-
auto& eves_st_i = fluidmodel->ComputeSpeciesEve(Vst_i[TVE_INDEX]);
178-
auto& eves_st_j = fluidmodel->ComputeSpeciesEve(Vst_j[TVE_INDEX]);
174+
const auto& eves_st_i = fluidmodel->ComputeSpeciesEve(Vst_i[TVE_INDEX]);
175+
const auto& eves_st_j = fluidmodel->ComputeSpeciesEve(Vst_j[TVE_INDEX]);
179176

180177
fluidmodel->ComputedPdU(Vst_i, eves_st_i, dPdUst_i);
181178
fluidmodel->ComputedPdU(Vst_j, eves_st_j, dPdUst_j);

‎SU2_CFD/src/numerics/NEMO/convection/roe.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ CNumerics::ResidualType<> CUpwRoe_NEMO::ComputeResidual(const CConfig *config) {
107107
for (unsigned short iVar = 0; iVar < nPrimVar; iVar++)
108108
RoeV[iVar] = (R*V_j[iVar] + V_i[iVar])/(R+1);
109109

110-
auto& roe_eves = fluidmodel->ComputeSpeciesEve(RoeV[TVE_INDEX]);
110+
const auto& roe_eves = fluidmodel->ComputeSpeciesEve(RoeV[TVE_INDEX]);
111111

112112
/*--- Calculate derivatives of pressure ---*/
113113
fluidmodel->ComputedPdU(RoeV, roe_eves, RoedPdU);

‎TestCases/parallel_regression.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def main():
7171
invwedge.cfg_dir = "nonequilibrium/invwedge"
7272
invwedge.cfg_file = "invwedge.cfg"
7373
invwedge.test_iter = 10
74-
invwedge.test_vals = [-1.011572, -1.537291, -18.301794, -18.629156, -18.575201, 2.304333, 2.009490, 5.353433, 0.906651]
74+
invwedge.test_vals = [-0.998812, -1.524371, -18.301794, -18.629156, -18.575201, 2.318954, 2.011581, 5.366905, 0.919345]
7575
invwedge.su2_exec = "mpirun -n 2 SU2_CFD"
7676
invwedge.timeout = 1600
7777
invwedge.new_output = True

0 commit comments

Comments
 (0)