Skip to content

Commit 4c3253c

Browse files
committed
Merge remote-tracking branch 'github/fix_addresssanitizer_findings' into fix_addresssanitizer_findings
2 parents 545843f + 73c59fb commit 4c3253c

13 files changed

Lines changed: 30 additions & 30 deletions

Common/include/option_structure.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1710,7 +1710,7 @@ class COptionActDisk : public COptionBase {
17101710
delete[] marker_outlet;
17111711

17121712
SetDefault();
1713-
};
1713+
}
17141714

17151715
string SetValue(const vector<string>& option_value) override {
17161716
COptionBase::SetValue(option_value);

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,8 +979,8 @@ void CFVMFlowSolverBase<V, R>::LoadRestart_impl(CGeometry **geometry, CSolver **
979979
{
980980
/*--- Delete the class memory that is used to load the restart. ---*/
981981

982-
Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
983-
Restart_Data.clear(); Restart_Data.shrink_to_fit();
982+
Restart_Vars = decltype(Restart_Vars){};
983+
Restart_Data = decltype(Restart_Data){};
984984
}
985985
END_SU2_OMP_SAFE_GLOBAL_ACCESS
986986
}

SU2_CFD/src/solvers/CAdjEulerSolver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3898,8 +3898,8 @@ void CAdjEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
38983898

38993899
/*--- Delete the class memory that is used to load the restart. ---*/
39003900

3901-
Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
3902-
Restart_Data.clear(); Restart_Data.shrink_to_fit();
3901+
Restart_Vars = decltype(Restart_Vars){};
3902+
Restart_Data = decltype(Restart_Data){};
39033903
}
39043904

39053905
void CAdjEulerSolver::SetAuxVar_Surface_Gradient(CGeometry *geometry, const CConfig *config) {

SU2_CFD/src/solvers/CBaselineSolver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,8 +480,8 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
480480

481481
/*--- Delete the class memory that is used to load the restart. ---*/
482482

483-
Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
484-
Restart_Data.clear(); Restart_Data.shrink_to_fit();
483+
Restart_Vars = decltype(Restart_Vars){};
484+
Restart_Data = decltype(Restart_Data){};
485485
}
486486

487487
void CBaselineSolver::LoadRestart_FSI(CGeometry *geometry, CConfig *config, int val_iter) {

SU2_CFD/src/solvers/CBaselineSolver_FEM.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,8 @@ void CBaselineSolver_FEM::LoadRestart(CGeometry **geometry, CSolver ***solver, C
379379

380380
/*--- Delete the class memory that is used to load the restart. ---*/
381381

382-
Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
383-
Restart_Data.clear(); Restart_Data.shrink_to_fit();
382+
Restart_Vars = decltype(Restart_Vars){};
383+
Restart_Data = decltype(Restart_Data){};
384384
}
385385

386386
CBaselineSolver_FEM::~CBaselineSolver_FEM() = default;

SU2_CFD/src/solvers/CFEASolver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3142,8 +3142,8 @@ void CFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c
31423142

31433143
/*--- Delete the class memory that is used to load the restart. ---*/
31443144

3145-
Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
3146-
Restart_Data.clear(); Restart_Data.shrink_to_fit();
3145+
Restart_Vars = decltype(Restart_Vars){};
3146+
Restart_Data = decltype(Restart_Data){};
31473147
}
31483148

31493149
void CFEASolver::RegisterVariables(CGeometry *geometry, CConfig *config, bool reset)

SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9571,6 +9571,6 @@ void CFEM_DG_EulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, C
95719571

95729572
/*--- Delete the class memory that is used to load the restart. ---*/
95739573

9574-
Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
9575-
Restart_Data.clear(); Restart_Data.shrink_to_fit();
9574+
Restart_Vars = decltype(Restart_Vars){};
9575+
Restart_Data = decltype(Restart_Data){};
95769576
}

SU2_CFD/src/solvers/CHeatSolver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ void CHeatSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *
265265
/*--- Delete the class memory that is used to load the restart. ---*/
266266

267267
BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS {
268-
Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
269-
Restart_Data.clear(); Restart_Data.shrink_to_fit();
268+
Restart_Vars = decltype(Restart_Vars){};
269+
Restart_Data = decltype(Restart_Data){};
270270
}
271271
END_SU2_OMP_SAFE_GLOBAL_ACCESS
272272
}

SU2_CFD/src/solvers/CMeshSolver.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -857,8 +857,8 @@ void CMeshSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *
857857

858858
/*--- Delete the class memory that is used to load the restart. ---*/
859859

860-
Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
861-
Restart_Data.clear(); Restart_Data.shrink_to_fit();
860+
Restart_Vars = decltype(Restart_Vars){};
861+
Restart_Data = decltype(Restart_Data){};
862862
}
863863

864864
void CMeshSolver::RestartOldGeometry(CGeometry *geometry, const CConfig *config) {
@@ -955,8 +955,8 @@ void CMeshSolver::RestartOldGeometry(CGeometry *geometry, const CConfig *config)
955955

956956
/*--- Delete the class memory that is used to load the restart. ---*/
957957

958-
Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
959-
Restart_Data.clear(); Restart_Data.shrink_to_fit();
958+
Restart_Vars = decltype(Restart_Vars){};
959+
Restart_Data = decltype(Restart_Data){};
960960

961961
InitiateComms(geometry, config, CommType);
962962
CompleteComms(geometry, config, CommType);

SU2_CFD/src/solvers/CRadSolver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,6 @@ void CRadSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c
160160

161161
/*--- Delete the class memory that is used to load the restart. ---*/
162162

163-
Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
164-
Restart_Data.clear(); Restart_Data.shrink_to_fit();
163+
Restart_Vars = decltype(Restart_Vars){};
164+
Restart_Data = decltype(Restart_Data){};
165165
}

0 commit comments

Comments
 (0)