Skip to content

Commit 654b531

Browse files
committed
Apply more changes from code review.
1 parent f00eabb commit 654b531

3 files changed

Lines changed: 12 additions & 14 deletions

File tree

Common/include/linear_algebra/CSysMatrix.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ class CSysMatrix {
515515
if (!mat_ij) return;
516516
for (auto iVar = 0ul; iVar < nVar; ++iVar) {
517517
for (auto jVar = 0ul; jVar < nEqn; ++jVar) {
518-
*mat_ij = (Overwrite ? ScalarType(0) : *mat_ij) + PassiveAssign(alpha * val_block[iVar][jVar]);
518+
*mat_ij = (Overwrite ? ScalarType(0) : *mat_ij) + PassiveAssign(alpha * val_block(iVar, jVar));
519519
++mat_ij;
520520
}
521521
}

SU2_CFD/include/solvers/CGradientSmoothingSolver.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class CGradientSmoothingSolver final : public CFEASolverBase {
137137
/*!
138138
* \brief Set the boundary conditions
139139
*/
140-
void Impose_BC(CGeometry* geometry, const CConfig* config);
140+
void Impose_BC(const CGeometry* geometry, const CConfig* config);
141141

142142
/*!
143143
* \brief Set Dirichlet boundary conditions

SU2_CFD/src/solvers/CGradientSmoothingSolver.cpp

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ void CGradientSmoothingSolver::Compute_Surface_Residual(CGeometry* geometry, con
589589
}
590590
}
591591

592-
void CGradientSmoothingSolver::Impose_BC(CGeometry* geometry, const CConfig* config) {
592+
void CGradientSmoothingSolver::Impose_BC(const CGeometry* geometry, const CConfig* config) {
593593
unsigned int iMarker;
594594

595595
/*--- Get the boundary markers and iterate over them
@@ -896,20 +896,19 @@ void CGradientSmoothingSolver::ReadSensFromGeometry(const CGeometry* geometry) {
896896
}
897897

898898
void CGradientSmoothingSolver::WriteSensitivity(CGeometry* geometry, const CConfig* config) {
899-
unsigned long iPoint;
899+
900900
unsigned int iDim;
901901
su2double normal[MAXNDIM];
902-
su2double norm;
903902

904903
/*--- Split between surface and volume first. ---*/
905904
if ( config->GetSmoothOnSurface() ) {
906905
/*--- Write back values for all design boundaries in the surface case. ---*/
907906
for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
908907
if (config->GetMarker_All_DV(iMarker) == YES) {
909908
for (unsigned long iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
910-
iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
909+
const auto iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
911910
geometry->vertex[iMarker][iVertex]->GetNormal(normal);
912-
norm = GeometryToolbox::Norm(nDim, normal);
911+
const auto norm = GeometryToolbox::Norm(nDim, normal);
913912
for (iDim = 0; iDim < nDim; iDim++) {
914913
normal[iDim] = normal[iDim] / norm;
915914
nodes->SetSensitivity(iPoint, iDim, normal[iDim] * LinSysSol[iPoint]);
@@ -919,11 +918,11 @@ void CGradientSmoothingSolver::WriteSensitivity(CGeometry* geometry, const CConf
919918
}
920919
} else {
921920
if (config->GetSmoothSepDim()) {
922-
for (iPoint = 0; iPoint < nPoint; iPoint++) {
921+
for (auto iPoint = 0ul; iPoint < nPoint; iPoint++) {
923922
nodes->SetSensitivity(iPoint, GetCurrentDim(), LinSysSol[iPoint]);
924923
}
925924
} else {
926-
for (iPoint = 0; iPoint < nPoint; iPoint++) {
925+
for (auto iPoint = 0ul; iPoint < nPoint; iPoint++) {
927926
for (iDim = 0; iDim < nDim; iDim++) {
928927
nodes->SetSensitivity(iPoint, iDim, LinSysSol(iPoint, iDim));
929928
}
@@ -955,7 +954,6 @@ void CGradientSmoothingSolver::ReadVectorToGeometry(const CGeometry* geometry, C
955954
void CGradientSmoothingSolver::Set_VertexEliminationSchedule(CGeometry* geometry, const CConfig* config) {
956955
/*--- Store global point indices of essential BC markers. ---*/
957956
vector<unsigned long> myPoints;
958-
unsigned long iPoint, iVertex;
959957

960958
/*--- get global indexes of Dirichlet boundaries ---*/
961959

@@ -965,9 +963,9 @@ void CGradientSmoothingSolver::Set_VertexEliminationSchedule(CGeometry* geometry
965963
* and the current rank holds part of it. ---*/
966964
for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
967965
if (config->GetMarker_All_DV(iMarker) == YES && config->GetDirichletSurfaceBound()) {
968-
for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
966+
for (auto iVertex = 0ul; iVertex < geometry->nVertex[iMarker]; iVertex++) {
969967
/*--- Get node index ---*/
970-
iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
968+
const auto iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
971969
if (nodes->GetIsBoundaryPoint(iPoint)) {
972970
myPoints.push_back(geometry->nodes->GetGlobalIndex(iPoint));
973971
}
@@ -986,7 +984,7 @@ void CGradientSmoothingSolver::Set_VertexEliminationSchedule(CGeometry* geometry
986984
}
987985
}
988986
for (auto iMarker : markers) {
989-
for (iVertex = 0ul; iVertex < geometry->nVertex[iMarker]; iVertex++) {
987+
for (auto iVertex = 0ul; iVertex < geometry->nVertex[iMarker]; iVertex++) {
990988
auto iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
991989
myPoints.push_back(geometry->nodes->GetGlobalIndex(iPoint));
992990
}
@@ -1004,7 +1002,7 @@ void CGradientSmoothingSolver::Set_VertexEliminationSchedule(CGeometry* geometry
10041002
void CGradientSmoothingSolver::Complete_Surface_StiffMatrix(const CGeometry* geometry) {
10051003

10061004
/*--- Assembling the stiffness matrix on the design surface means the Jacobian is the identity for nodes inside the domain. ---*/
1007-
for (unsigned long iPoint = 0; iPoint < geometry->GetnPointDomain(); iPoint++){
1005+
for (unsigned long iPoint = 0ul; iPoint < geometry->GetnPointDomain(); iPoint++){
10081006
if (visited[iPoint]==false) {
10091007
Jacobian.AddVal2Diag(iPoint, 1.0);
10101008
}

0 commit comments

Comments
 (0)