Skip to content

Commit 459362a

Browse files
authored
remove else
1 parent 6883961 commit 459362a

1 file changed

Lines changed: 33 additions & 36 deletions

File tree

SU2_CFD/include/numerics/turbulent/turb_sources.hpp

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -338,44 +338,41 @@ class CSourcePieceWise_TurbSST final : public CNumerics {
338338
if (Coord_i[1] < EPS) {
339339
return;
340340
}
341+
342+
su2double yinv, rhov;
343+
su2double sigma_k_i, sigma_omega_i;
344+
su2double pk_axi, pw_axi, ck_axi, cw_axi, dk_axi, dw_axi;
341345

342-
else{
343-
344-
su2double yinv, rhov;
345-
su2double sigma_k_i, sigma_omega_i;
346-
su2double pk_axi, pw_axi, ck_axi, cw_axi, dk_axi, dw_axi;
347-
348-
yinv = 1.0/Coord_i[1];
349-
rhov = Density_i*V_i[2];
350-
351-
/*--- Compute blended constants ---*/
352-
sigma_k_i = F1_i*sigma_k_1 + (1.0 - F1_i)*sigma_k_2;
353-
sigma_omega_i = F1_i*sigma_omega_1 + (1.0 - F1_i)*sigma_omega_2;
354-
355-
/*--- Production ---*/
356-
pk_axi = max(0.0,2.0/3.0*rhov*TurbVar_i[0]*(2.0/zeta*(yinv*V_i[2]-PrimVar_Grad_i[2][1]
357-
-PrimVar_Grad_i[1][0]) -1.0));
358-
pw_axi = alfa_blended*zeta/TurbVar_i[0]*pk_axi;
359-
360-
/*--- Convection ---*/
361-
ck_axi = rhov*TurbVar_i[0];
362-
cw_axi = rhov*TurbVar_i[1];
363-
364-
/*--- Diffusion ---*/
365-
dk_axi = (Laminar_Viscosity_i+sigma_k_i*Eddy_Viscosity_i)*TurbVar_Grad_i[0][1];
366-
dw_axi = (Laminar_Viscosity_i+sigma_omega_i*Eddy_Viscosity_i)*TurbVar_Grad_i[1][1];
367-
368-
/*--- Add all terms to the residuals ---*/
369-
Residual[0] += yinv*Volume*(pk_axi-ck_axi+dk_axi);
370-
Residual[1] += yinv*Volume*(pw_axi-cw_axi+dw_axi);
346+
yinv = 1.0/Coord_i[1];
347+
rhov = Density_i*V_i[2];
371348

372-
/*--- Add contribution to the jacobian for implicit time integration---*/
373-
Jacobian_i[0][0] += yinv*Volume*(sigma_k_i/zeta*TurbVar_Grad_i[0][1]-V_i[2]);
374-
Jacobian_i[0][1] -= yinv*Volume*sigma_k_i*TurbVar_i[0]*TurbVar_Grad_i[0][1]/(zeta*zeta);
375-
Jacobian_i[1][0] += yinv*Volume*sigma_k_i/zeta*TurbVar_Grad_i[1][1];
376-
Jacobian_i[1][1] -= yinv*Volume*(sigma_k_i*TurbVar_i[0]*TurbVar_Grad_i[1][1]/(zeta*zeta)+V_i[2]);
377-
378-
}
349+
/*--- Compute blended constants ---*/
350+
sigma_k_i = F1_i*sigma_k_1 + (1.0 - F1_i)*sigma_k_2;
351+
sigma_omega_i = F1_i*sigma_omega_1 + (1.0 - F1_i)*sigma_omega_2;
352+
353+
/*--- Production ---*/
354+
pk_axi = max(0.0,2.0/3.0*rhov*TurbVar_i[0]*(2.0/zeta*(yinv*V_i[2]-PrimVar_Grad_i[2][1]
355+
-PrimVar_Grad_i[1][0]) -1.0));
356+
pw_axi = alfa_blended*zeta/TurbVar_i[0]*pk_axi;
357+
358+
/*--- Convection ---*/
359+
ck_axi = rhov*TurbVar_i[0];
360+
cw_axi = rhov*TurbVar_i[1];
361+
362+
/*--- Diffusion ---*/
363+
dk_axi = (Laminar_Viscosity_i+sigma_k_i*Eddy_Viscosity_i)*TurbVar_Grad_i[0][1];
364+
dw_axi = (Laminar_Viscosity_i+sigma_omega_i*Eddy_Viscosity_i)*TurbVar_Grad_i[1][1];
365+
366+
/*--- Add all terms to the residuals ---*/
367+
Residual[0] += yinv*Volume*(pk_axi-ck_axi+dk_axi);
368+
Residual[1] += yinv*Volume*(pw_axi-cw_axi+dw_axi);
369+
370+
/*--- Add contribution to the jacobian for implicit time integration---*/
371+
Jacobian_i[0][0] += yinv*Volume*(sigma_k_i/zeta*TurbVar_Grad_i[0][1]-V_i[2]);
372+
Jacobian_i[0][1] -= yinv*Volume*sigma_k_i*TurbVar_i[0]*TurbVar_Grad_i[0][1]/(zeta*zeta);
373+
Jacobian_i[1][0] += yinv*Volume*sigma_k_i/zeta*TurbVar_Grad_i[1][1];
374+
Jacobian_i[1][1] -= yinv*Volume*(sigma_k_i*TurbVar_i[0]*TurbVar_Grad_i[1][1]/(zeta*zeta)+V_i[2]);
375+
379376
}
380377

381378
public:

0 commit comments

Comments
 (0)