Skip to content

Commit 6118dff

Browse files
committed
fix the Roe kappa thing and some compiler warnings
1 parent 7bd274a commit 6118dff

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

  • SU2_CFD/src/numerics/flow/convection

SU2_CFD/src/numerics/flow/convection/roe.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,11 @@ CNumerics::ResidualType<> CUpwRoeBase_Flow::ComputeResidual(const CConfig* confi
219219
/*--- Initialize residual (flux) and Jacobians ---*/
220220

221221
for (iVar = 0; iVar < nVar; iVar++)
222-
Flux[iVar] = kappa*(ProjFlux_i[iVar]+ProjFlux_j[iVar]);
222+
Flux[iVar] = 0.5*(ProjFlux_i[iVar]+ProjFlux_j[iVar]);
223223

224224
if (implicit) {
225-
GetInviscidProjJac(Velocity_i, &Energy_i, Normal, kappa, Jacobian_i);
226-
GetInviscidProjJac(Velocity_j, &Energy_j, Normal, kappa, Jacobian_j);
225+
GetInviscidProjJac(Velocity_i, &Energy_i, Normal, 0.5, Jacobian_i);
226+
GetInviscidProjJac(Velocity_j, &Energy_j, Normal, 0.5, Jacobian_j);
227227
}
228228

229229
/*--- Finalize in children class ---*/
@@ -316,7 +316,7 @@ void CUpwL2Roe_Flow::FinalizeResidual(su2double *val_residual, su2double **val_J
316316

317317
/*--- Compute wave amplitudes (characteristics) ---*/
318318

319-
su2double proj_delta_vel = 0.0, delta_vel[3];
319+
su2double proj_delta_vel = 0.0, delta_vel[3] = {0.0};
320320
for (iDim = 0; iDim < nDim; iDim++) {
321321
delta_vel[iDim] = Velocity_j[iDim] - Velocity_i[iDim];
322322
proj_delta_vel += delta_vel[iDim]*UnitNormal[iDim];
@@ -325,7 +325,7 @@ void CUpwL2Roe_Flow::FinalizeResidual(su2double *val_residual, su2double **val_J
325325
su2double delta_p = Pressure_j - Pressure_i;
326326
su2double delta_rho = Density_j - Density_i;
327327

328-
su2double delta_wave[5] = {0.0, 0.0, 0.0, 0.0, 0.0};
328+
su2double delta_wave[5] = {0.0};
329329
if (nDim == 2) {
330330
delta_wave[0] = delta_rho - delta_p/RoeSoundSpeed2;
331331
delta_wave[1] = (UnitNormal[1]*delta_vel[0]-UnitNormal[0]*delta_vel[1])*zeta;
@@ -389,7 +389,7 @@ void CUpwLMRoe_Flow::FinalizeResidual(su2double *val_residual, su2double **val_J
389389

390390
/*--- Compute wave amplitudes (characteristics) ---*/
391391

392-
su2double proj_delta_vel = 0.0, delta_vel[3];
392+
su2double proj_delta_vel = 0.0, delta_vel[3] = {0.0};
393393
for (iDim = 0; iDim < nDim; iDim++) {
394394
delta_vel[iDim] = Velocity_j[iDim] - Velocity_i[iDim];
395395
proj_delta_vel += delta_vel[iDim]*UnitNormal[iDim];
@@ -398,7 +398,7 @@ void CUpwLMRoe_Flow::FinalizeResidual(su2double *val_residual, su2double **val_J
398398
su2double delta_p = Pressure_j - Pressure_i;
399399
su2double delta_rho = Density_j - Density_i;
400400

401-
su2double delta_wave[5] = {0.0, 0.0, 0.0, 0.0, 0.0};
401+
su2double delta_wave[5] = {0.0};
402402
if (nDim == 2) {
403403
delta_wave[0] = delta_rho - delta_p/RoeSoundSpeed2;
404404
delta_wave[1] = (UnitNormal[1]*delta_vel[0]-UnitNormal[0]*delta_vel[1]);
@@ -930,11 +930,11 @@ CNumerics::ResidualType<> CUpwGeneralRoe_Flow::ComputeResidual(const CConfig* co
930930
GetPMatrix_inv(invP_Tensor, &RoeDensity, RoeVelocity, &RoeSoundSpeed, &RoeChi , &RoeKappa, UnitNormal);
931931

932932
/*--- Jacobians of the inviscid flux, scaled by
933-
kappa because val_resconv ~ kappa*(fc_i+fc_j)*Normal ---*/
933+
0.5 because val_resconv ~ 0.5*(fc_i+fc_j)*Normal ---*/
934934

935-
GetInviscidProjJac(Velocity_i, &Enthalpy_i, &Chi_i, &Kappa_i, Normal, kappa, Jacobian_i);
935+
GetInviscidProjJac(Velocity_i, &Enthalpy_i, &Chi_i, &Kappa_i, Normal, 0.5, Jacobian_i);
936936

937-
GetInviscidProjJac(Velocity_j, &Enthalpy_j, &Chi_j, &Kappa_j, Normal, kappa, Jacobian_j);
937+
GetInviscidProjJac(Velocity_j, &Enthalpy_j, &Chi_j, &Kappa_j, Normal, 0.5, Jacobian_j);
938938

939939

940940
/*--- Diference variables iPoint and jPoint ---*/
@@ -943,7 +943,7 @@ CNumerics::ResidualType<> CUpwGeneralRoe_Flow::ComputeResidual(const CConfig* co
943943

944944
/*--- Roe's Flux approximation ---*/
945945
for (iVar = 0; iVar < nVar; iVar++) {
946-
Flux[iVar] = kappa*(ProjFlux_i[iVar]+ProjFlux_j[iVar]);
946+
Flux[iVar] = 0.5*(ProjFlux_i[iVar]+ProjFlux_j[iVar]);
947947
for (jVar = 0; jVar < nVar; jVar++) {
948948
Proj_ModJac_Tensor_ij = 0.0;
949949

0 commit comments

Comments
 (0)