Skip to content

Commit 866a041

Browse files
pcarruscagpcarruscag
committed
Merge remote-tracking branch 'origin/develop' into pedro/deflation
2 parents f881bb4 + e7d6c12 commit 866a041

12 files changed

Lines changed: 23 additions & 24 deletions

File tree

‎.github/workflows/regression.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
- config_set: BaseNoMPI-asan
128128
flags: '--buildtype=debugoptimized -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true --warnlevel=3 --werror'
129129
- config_set: ReverseNoMPI-asan
130-
flags: '--buildtype=debugoptimized -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled --warnlevel=3 --werror'
130+
flags: '--buildtype=debugoptimized --optimization=1 -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled --warnlevel=3 --werror'
131131
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
132132
steps:
133133
- name: Cache Object Files

‎Common/src/linear_algebra/CSysMatrix.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void CSysMatrix<ScalarType>::Initialize(unsigned long npoint, unsigned long npoi
157157
};
158158

159159
GPUAllocAndInit(d_matrix, nnz * nVar * nEqn);
160-
GPUAllocAndCopy(d_row_ptr, row_ptr, (nPointDomain + 1.0));
160+
GPUAllocAndCopy(d_row_ptr, row_ptr, (nPointDomain + 1));
161161
GPUAllocAndCopy(d_col_ind, col_ind, nnz);
162162
}
163163

‎Common/src/wall_model.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ void CWallModelLogLaw::WallShearStressAndHeatFlux(const su2double tExchange, con
371371
(-(1.0 / 11.0) * h_wm * exp(-0.33 * y_plus) / nu_wall +
372372
(1.0 / 11.0) * h_wm * exp(-(1.0 / 11.0) * y_plus) / nu_wall +
373373
(1.0 / 33.0) * u_tau0 * pow(h_wm, 2.0) * exp(-0.33 * y_plus) / pow(nu_wall, 2.0)) -
374-
1.0 * h_wm / (nu_wall * (karman * y_plus + 1.0));
374+
h_wm / (nu_wall * (karman * y_plus + 1.0));
375375

376376
/* Newton method
377377
*/

‎SU2_CFD/src/solvers/CEulerSolver.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config,
246246
Energy_Inf = config->GetEnergy_FreeStreamND();
247247
Mach_Inf = config->GetMach();
248248

249-
/*--- Initialize the secondary values for direct derivative approxiations ---*/
249+
/*--- Initialize the secondary values for direct derivative approximations ---*/
250250

251251
switch(direct_diff) {
252252
case NO_DERIVATIVE:
@@ -5571,8 +5571,8 @@ void CEulerSolver::BC_TurboRiemann(CGeometry *geometry, CSolver **solver_contain
55715571

55725572
switch(config->GetKind_Data_Riemann(Marker_Tag))
55735573
{
5574-
//TODO(turbo), generilize for 3D case
5575-
//TODO(turbo), generilize for Inlet and Outlet in for backflow treatment
5574+
//TODO(turbo), generalize for 3D case
5575+
//TODO(turbo), generalize for Inlet and Outlet in for backflow treatment
55765576
//TODO(turbo), implement not uniform inlet and radial equilibrium for the outlet
55775577
case TOTAL_CONDITIONS_PT:
55785578

@@ -6535,8 +6535,8 @@ void CEulerSolver::BC_Giles(CGeometry *geometry, CSolver **solver_container, CNu
65356535
switch(config->GetKind_Data_Giles(Marker_Tag))
65366536
{
65376537

6538-
//Done, generilize for 3D case
6539-
//TODO(turbo), generilize for Inlet and Outlet in for backflow treatment
6538+
//Done, generalize for 3D case
6539+
//TODO(turbo), generalize for Inlet and Outlet in for backflow treatment
65406540

65416541
case TOTAL_CONDITIONS_PT: case MIXING_IN:case TOTAL_CONDITIONS_PT_1D: case MIXING_IN_1D:
65426542
if(config->GetSpatialFourier()){

‎SU2_CFD/src/solvers/CIncEulerSolver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
171171
GetFluidModel()->SetTDState_T(Temperature_Inf, scalar_init);
172172
Enthalpy_Inf = GetFluidModel()->GetEnthalpy();
173173

174-
/*--- Initialize the secondary values for direct derivative approxiations ---*/
174+
/*--- Initialize the secondary values for direct derivative approximations ---*/
175175

176176
switch (config->GetDirectDiff()) {
177177
case NO_DERIVATIVE:

‎SU2_CFD/src/solvers/CNEMOEulerSolver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ CNEMOEulerSolver::CNEMOEulerSolver(CGeometry *geometry, CConfig *config,
146146
Temperature_Inf = config->GetTemperature_FreeStreamND();
147147
Temperature_ve_Inf = config->GetTemperature_ve_FreeStreamND();
148148

149-
/*--- Initialize the secondary values for direct derivative approxiations ---*/
149+
/*--- Initialize the secondary values for direct derivative approximations ---*/
150150
switch(direct_diff) {
151151
case NO_DERIVATIVE:
152152
/*--- Default ---*/

‎SU2_CFD/src/solvers/CNEMONSSolver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ CNEMONSSolver::CNEMONSSolver(CGeometry *geometry, CConfig *config, unsigned shor
4242
Prandtl_Lam = config->GetPrandtl_Lam();
4343
Prandtl_Turb = config->GetPrandtl_Turb();
4444

45-
/*--- Initialize the secondary values for direct derivative approxiations ---*/
45+
/*--- Initialize the secondary values for direct derivative approximations ---*/
4646
switch(config->GetDirectDiff()) {
4747
case D_VISCOSITY:
4848
SU2_TYPE::SetDerivative(Viscosity_Inf, 1.0);

‎SU2_CFD/src/solvers/CRadP1Solver.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ CRadP1Solver::CRadP1Solver(CGeometry* geometry, CConfig *config) : CRadSolver(ge
8484
/*--- Read farfield conditions from config ---*/
8585
Temperature_Inf = config->GetTemperature_FreeStreamND();
8686

87-
/*--- Initialize the secondary values for direct derivative approxiations ---*/
87+
/*--- Initialize the secondary values for direct derivative approximations ---*/
8888

8989
switch(direct_diff){
9090
case NO_DERIVATIVE: case D_DENSITY:
@@ -320,7 +320,7 @@ void CRadP1Solver::BC_Isothermal_Wall(CGeometry *geometry, CSolver **solver_cont
320320

321321
/*--- Compute the radiative heat flux. ---*/
322322
Radiative_Energy = nodes->GetSolution(iPoint, 0);
323-
Radiative_Heat_Flux = 1.0*Theta*(Ib_w - Radiative_Energy);
323+
Radiative_Heat_Flux = Theta*(Ib_w - Radiative_Energy);
324324

325325
/*--- Compute the Viscous contribution to the residual ---*/
326326
Res_Visc[0] = Radiative_Heat_Flux*Area;
@@ -394,7 +394,7 @@ void CRadP1Solver::BC_Far_Field(CGeometry *geometry, CSolver **solver_container,
394394

395395
/*--- Compute the radiative heat flux. ---*/
396396
Radiative_Energy = nodes->GetSolution(iPoint, 0);
397-
Radiative_Heat_Flux = 1.0*Theta*(Ib_w - Radiative_Energy);
397+
Radiative_Heat_Flux = Theta*(Ib_w - Radiative_Energy);
398398

399399
/*--- Compute the Viscous contribution to the residual ---*/
400400
Res_Visc[0] = Radiative_Heat_Flux*Area;

‎SU2_CFD/src/solvers/CTransLMSolver.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ void CTransLMSolver::Postprocessing(CGeometry *geometry, CSolver **solver_contai
214214
const su2double vel_u = flowNodes->GetVelocity(iPoint, 0);
215215
const su2double vel_v = flowNodes->GetVelocity(iPoint, 1);
216216
const su2double vel_w = (nDim ==3) ? flowNodes->GetVelocity(iPoint, 2) : 0.0;
217-
const su2double VelocityMag = sqrt(vel_u*vel_u + vel_v*vel_v + vel_w*vel_w);
217+
const su2double VelocityMag = max(sqrt(pow(vel_u, 2) + pow(vel_v, 2) + pow(vel_w, 2)), EPS);
218218
su2double omega = 0.0;
219219
su2double k = 0.0;
220220
if(TurbFamily == TURB_FAMILY::KW){
@@ -253,8 +253,8 @@ void CTransLMSolver::Postprocessing(CGeometry *geometry, CSolver **solver_contai
253253
su2double Intermittency_Sep = 2.0*max(0.0, Re_v/(3.235*Corr_Rec)-1.0)*f_reattach;
254254
Intermittency_Sep = min(Intermittency_Sep,2.0)*f_theta;
255255
Intermittency_Sep = min(max(0.0, Intermittency_Sep), 2.0);
256-
nodes -> SetIntermittencySep(iPoint, Intermittency_Sep);
257-
nodes -> SetIntermittencyEff(iPoint, Intermittency_Sep);
256+
nodes->SetIntermittencySep(iPoint, Intermittency_Sep);
257+
nodes->SetIntermittencyEff(iPoint, Intermittency_Sep);
258258

259259
}
260260
END_SU2_OMP_FOR
@@ -282,7 +282,6 @@ void CTransLMSolver::Source_Residual(CGeometry *geometry, CSolver **solver_conta
282282
const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
283283

284284
auto* flowNodes = su2staticcast_p<CFlowVariable*>(solver_container[FLOW_SOL]->GetNodes());
285-
//auto* turbNodes = su2staticcast_p<CFlowVariable*>(solver_container[TURB_SOL]->GetNodes());
286285
CVariable* turbNodes = solver_container[TURB_SOL]->GetNodes();
287286

288287
/*--- Pick one numerics object per thread. ---*/
@@ -547,8 +546,8 @@ void CTransLMSolver::LoadRestart(CGeometry** geometry, CSolver*** solver, CConfi
547546

548547
const auto index = counter * Restart_Vars[1] + skipVars;
549548
for (auto iVar = 0u; iVar < nVar; iVar++) nodes->SetSolution(iPoint_Local, iVar, Restart_Data[index + iVar]);
550-
nodes ->SetIntermittencySep(iPoint_Local, Restart_Data[index + 2]);
551-
nodes ->SetIntermittencyEff(iPoint_Local, Restart_Data[index + 3]);
549+
nodes->SetIntermittencySep(iPoint_Local, Restart_Data[index + 2]);
550+
nodes->SetIntermittencyEff(iPoint_Local, Restart_Data[index + 3]);
552551

553552
/*--- Increment the overall counter for how many points have been loaded. ---*/
554553
counter++;

‎SU2_CFD/src/solvers/CTurbSSTSolver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ void CTurbSSTSolver::Postprocessing(CGeometry *geometry, CSolver **solver_contai
272272
}
273273
shearStress = sqrt(shearStress);
274274

275-
const su2double FrictionVelocity = sqrt(shearStress/flowNodes->GetDensity(iPoint));
275+
const su2double FrictionVelocity = max(sqrt(shearStress/flowNodes->GetDensity(iPoint)), EPS);
276276
const su2double wall_dist = geometry->vertex[iMarker][iVertex]->GetNearestNeighborDistance();
277277

278278
const su2double Derivative = flowNodes->GetLaminarViscosity(jPoint) * pow(nodes->GetSolution(jPoint, 0), 0.673) / wall_dist;

0 commit comments

Comments
 (0)