Skip to content

Commit

Permalink
Reset vectors by move-assigning an empty vector.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jblueh
jblueh committed Feb 15, 2024
1 parent 094f369 commit 19ab7ff
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -979,8 +979,8 @@ void CFVMFlowSolverBase<V, R>::LoadRestart_impl(CGeometry **geometry, CSolver **
{
/*--- Delete the class memory that is used to load the restart. ---*/

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};
}
END_SU2_OMP_SAFE_GLOBAL_ACCESS
}
Expand Down
4 changes: 2 additions & 2 deletions SU2_CFD/src/solvers/CAdjEulerSolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3898,8 +3898,8 @@ void CAdjEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf

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

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};
}

void CAdjEulerSolver::SetAuxVar_Surface_Gradient(CGeometry *geometry, const CConfig *config) {
Expand Down
4 changes: 2 additions & 2 deletions SU2_CFD/src/solvers/CBaselineSolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,8 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf

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

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};
}

void CBaselineSolver::LoadRestart_FSI(CGeometry *geometry, CConfig *config, int val_iter) {
Expand Down
4 changes: 2 additions & 2 deletions SU2_CFD/src/solvers/CBaselineSolver_FEM.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,8 @@ void CBaselineSolver_FEM::LoadRestart(CGeometry **geometry, CSolver ***solver, C

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

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};
}

CBaselineSolver_FEM::~CBaselineSolver_FEM() = default;
4 changes: 2 additions & 2 deletions SU2_CFD/src/solvers/CFEASolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3142,8 +3142,8 @@ void CFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c

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

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};
}

void CFEASolver::RegisterVariables(CGeometry *geometry, CConfig *config, bool reset)
Expand Down
4 changes: 2 additions & 2 deletions SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9571,6 +9571,6 @@ void CFEM_DG_EulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, C

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

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};
}
4 changes: 2 additions & 2 deletions SU2_CFD/src/solvers/CHeatSolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ void CHeatSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *
/*--- Delete the class memory that is used to load the restart. ---*/

BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS {
Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};
}
END_SU2_OMP_SAFE_GLOBAL_ACCESS
}
Expand Down
8 changes: 4 additions & 4 deletions SU2_CFD/src/solvers/CMeshSolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -857,8 +857,8 @@ void CMeshSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *

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

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};
}

void CMeshSolver::RestartOldGeometry(CGeometry *geometry, const CConfig *config) {
Expand Down Expand Up @@ -955,8 +955,8 @@ void CMeshSolver::RestartOldGeometry(CGeometry *geometry, const CConfig *config)

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

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};

InitiateComms(geometry, config, CommType);
CompleteComms(geometry, config, CommType);
Expand Down
4 changes: 2 additions & 2 deletions SU2_CFD/src/solvers/CRadSolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,6 @@ void CRadSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c

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

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};
}
10 changes: 5 additions & 5 deletions SU2_CFD/src/solvers/CSolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ CSolver::~CSolver() {
delete [] Jacobian_jj;
}

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};

delete VerificationSolution;
}
Expand Down Expand Up @@ -3185,7 +3185,7 @@ void CSolver::InterpolateRestartData(const CGeometry *geometry, const CConfig *c
sendBuf(iPoint,iVar) = Restart_Data[iPointDonor*nFields+iVar];
}

Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Data = decltype(Restart_Data){};

/*--- Make room to receive donor data from other ranks, and to map it to target points. ---*/

Expand Down Expand Up @@ -4212,8 +4212,8 @@ void CSolver::BasicLoadRestart(CGeometry *geometry, const CConfig *config, const

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

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};

/*--- Detect a wrong solution file ---*/

Expand Down
4 changes: 2 additions & 2 deletions SU2_CFD/src/solvers/CSpeciesSolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ void CSpeciesSolver::LoadRestart(CGeometry** geometry, CSolver*** solver, CConfi
BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS {
/*--- Delete the class memory that is used to load the restart. ---*/

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};
}
END_SU2_OMP_SAFE_GLOBAL_ACCESS
}
Expand Down
4 changes: 2 additions & 2 deletions SU2_CFD/src/solvers/CTurbSolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ void CTurbSolver::LoadRestart(CGeometry** geometry, CSolver*** solver, CConfig*
BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS {
/*--- Delete the class memory that is used to load the restart. ---*/

Restart_Vars.clear(); Restart_Vars.shrink_to_fit();
Restart_Data.clear(); Restart_Data.shrink_to_fit();
Restart_Vars = decltype(Restart_Vars){};
Restart_Data = decltype(Restart_Data){};
}
END_SU2_OMP_SAFE_GLOBAL_ACCESS
}
Expand Down

0 comments on commit 19ab7ff

Please sign in to comment.