Skip to content

Commit 3437f2b

Browse files
committed
address some comments
1 parent 63f7af0 commit 3437f2b

3 files changed

Lines changed: 16 additions & 36 deletions

File tree

SU2_CFD/include/solvers/CDiscAdjMeshSolver.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
*/
4040
class CDiscAdjMeshSolver final : public CSolver {
4141
private:
42-
unsigned short KindDirect_Solver;
43-
CSolver *direct_solver;
42+
unsigned short KindDirect_Solver = 0;
43+
CSolver *direct_solver = nullptr;
4444

4545
CDiscAdjMeshBoundVariable* nodes = nullptr; /*!< \brief Variables of the discrete adjoint mesh solver. */
4646

SU2_CFD/include/solvers/CSolver.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3806,7 +3806,7 @@ class CSolver {
38063806
* \brief A virtual member. Extract and set the geometrical sensitivity.
38073807
* \param[in] geometry - Geometrical definition of the problem.
38083808
* \param[in] config - Definition of the particular problem.
3809-
* \param[in] solver - The target solver for the sensitivities, optional, for when the mesh solver is used.
3809+
* \param[in] target_solver - The target solver for the sensitivities, optional, for when the mesh solver is used.
38103810
*/
38113811
inline virtual void SetSensitivity(CGeometry *geometry, CConfig *config, CSolver *target_solver = nullptr){ }
38123812

SU2_CFD/src/solvers/CDiscAdjMeshSolver.cpp

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,15 @@
2525
* License along with SU2. If not, see <http://www.gnu.org/licenses/>.
2626
*/
2727

28-
29-
3028
#include "../../include/solvers/CDiscAdjMeshSolver.hpp"
3129
#include "../../include/variables/CDiscAdjMeshBoundVariable.hpp"
3230

33-
CDiscAdjMeshSolver::CDiscAdjMeshSolver(void) : CSolver (){
3431

35-
KindDirect_Solver = 0;
32+
CDiscAdjMeshSolver::CDiscAdjMeshSolver() : CSolver () {}
3633

37-
direct_solver = nullptr;
38-
39-
}
34+
CDiscAdjMeshSolver::CDiscAdjMeshSolver(CGeometry *geometry, CConfig *config) : CSolver() {}
4035

41-
CDiscAdjMeshSolver::CDiscAdjMeshSolver(CGeometry *geometry, CConfig *config) : CSolver(){
42-
43-
KindDirect_Solver = 0;
44-
45-
}
46-
47-
CDiscAdjMeshSolver::CDiscAdjMeshSolver(CGeometry *geometry, CConfig *config, CSolver *direct_solver) : CSolver(){
36+
CDiscAdjMeshSolver::CDiscAdjMeshSolver(CGeometry *geometry, CConfig *config, CSolver *direct_solver) : CSolver() {
4837

4938
unsigned short iVar, iDim;
5039

@@ -64,11 +53,10 @@ CDiscAdjMeshSolver::CDiscAdjMeshSolver(CGeometry *geometry, CConfig *config, CSo
6453

6554
/*--- Define some structures for locating max residuals ---*/
6655

67-
Point_Max = new unsigned long[nVar]; for (iVar = 0; iVar < nVar; iVar++) Point_Max[iVar] = 0;
56+
Point_Max = new unsigned long[nVar] ();
6857
Point_Max_Coord = new su2double*[nVar];
6958
for (iVar = 0; iVar < nVar; iVar++) {
70-
Point_Max_Coord[iVar] = new su2double[nDim];
71-
for (iDim = 0; iDim < nDim; iDim++) Point_Max_Coord[iVar][iDim] = 0.0;
59+
Point_Max_Coord[iVar] = new su2double[nDim] ();
7260
}
7361

7462
/*--- Define some auxiliary vectors related to the residual for problems with a BGS strategy---*/
@@ -80,11 +68,10 @@ CDiscAdjMeshSolver::CDiscAdjMeshSolver(CGeometry *geometry, CConfig *config, CSo
8068

8169
/*--- Define some structures for locating max residuals ---*/
8270

83-
Point_Max_BGS = new unsigned long[nVar]; for (iVar = 0; iVar < nVar; iVar++) Point_Max_BGS[iVar] = 0;
71+
Point_Max_BGS = new unsigned long[nVar] ();
8472
Point_Max_Coord_BGS = new su2double*[nVar];
8573
for (iVar = 0; iVar < nVar; iVar++) {
86-
Point_Max_Coord_BGS[iVar] = new su2double[nDim];
87-
for (iDim = 0; iDim < nDim; iDim++) Point_Max_Coord_BGS[iVar][iDim] = 0.0;
74+
Point_Max_Coord_BGS[iVar] = new su2double[nDim] ();
8875
}
8976

9077
}
@@ -121,18 +108,15 @@ CDiscAdjMeshSolver::~CDiscAdjMeshSolver(void){
121108
}
122109

123110

124-
void CDiscAdjMeshSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container, CConfig *config_container, unsigned short iMesh, unsigned short iRKStep, unsigned short RunTime_EqSystem, bool Output){
125-
126-
111+
void CDiscAdjMeshSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container, CConfig *config_container,
112+
unsigned short iMesh, unsigned short iRKStep, unsigned short RunTime_EqSystem, bool Output){
127113
}
128114

129115
void CDiscAdjMeshSolver::SetRecording(CGeometry* geometry, CConfig *config){
130116

131-
132-
unsigned long iPoint;
133117
/*--- Reset the solution to the initial (converged) solution ---*/
134118

135-
for (iPoint = 0; iPoint < nPoint; iPoint++) {
119+
for (auto iPoint = 0ul; iPoint < nPoint; iPoint++) {
136120
direct_solver->GetNodes()->SetBound_Disp(iPoint,nodes->GetBoundDisp_Direct(iPoint));
137121
}
138122

@@ -160,11 +144,9 @@ void CDiscAdjMeshSolver::RegisterVariables(CGeometry *geometry, CConfig *config,
160144

161145
void CDiscAdjMeshSolver::ExtractAdjoint_Solution(CGeometry *geometry, CConfig *config){
162146

163-
unsigned long iPoint;
164-
165147
/*--- Extract the sensitivities of the mesh coordinates ---*/
166148

167-
for (iPoint = 0; iPoint < nPoint; iPoint++){
149+
for (auto iPoint = 0ul; iPoint < nPoint; iPoint++){
168150

169151
/*--- Extract the adjoint solution from the original mesh coordinates ---*/
170152

@@ -180,11 +162,9 @@ void CDiscAdjMeshSolver::ExtractAdjoint_Solution(CGeometry *geometry, CConfig *c
180162

181163
void CDiscAdjMeshSolver::ExtractAdjoint_Variables(CGeometry *geometry, CConfig *config){
182164

183-
unsigned long iPoint;
184-
185165
/*--- Extract the sensitivities of the boundary displacements ---*/
186166

187-
for (iPoint = 0; iPoint < nPoint; iPoint++){
167+
for (auto iPoint = 0ul; iPoint < nPoint; iPoint++){
188168

189169
/*--- Extract the adjoint solution of the boundary displacements ---*/
190170

@@ -210,7 +190,7 @@ void CDiscAdjMeshSolver::SetSensitivity(CGeometry *geometry, CConfig *config, CS
210190
ExtractAdjoint_Variables(geometry, config);
211191

212192
/*--- Store the sensitivities in the flow adjoint container ---*/
213-
for (auto iPoint = 0u; iPoint < nPoint; iPoint++) {
193+
for (auto iPoint = 0ul; iPoint < nPoint; iPoint++) {
214194

215195
/*--- If sharp edge, set the sensitivity to 0 on that region ---*/
216196
su2double limiter = 1.0;

0 commit comments

Comments
 (0)