Apply changes from code review.

thomasdick · thomasdick · commit d138d8cc819b · 2022-01-17T15:07:13.000+01:00
diff --git a/Common/src/geometry/elements/CLINE.cpp b/Common/src/geometry/elements/CLINE.cpp
@@ -9,7 +9,7 @@
  * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
- * Copyright 2012-2019, SU2 Contributors (cf. AUTHORS.md)
+ * Copyright 2012-2022, SU2 Contributors (cf. AUTHORS.md)
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/Common/src/geometry/elements/CPYRAM6.cpp b/Common/src/geometry/elements/CPYRAM6.cpp
@@ -9,7 +9,7 @@
  * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
- * Copyright 2012-2019, SU2 Contributors (cf. AUTHORS.md)
+ * Copyright 2012-2022, SU2 Contributors (cf. AUTHORS.md)
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/Common/src/geometry/elements/CTETRA4.cpp b/Common/src/geometry/elements/CTETRA4.cpp
@@ -9,7 +9,7 @@
  * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
- * Copyright 2012-2019, SU2 Contributors (cf. AUTHORS.md)
+ * Copyright 2012-2022, SU2 Contributors (cf. AUTHORS.md)
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/Common/src/geometry/elements/CTRIA3.cpp b/Common/src/geometry/elements/CTRIA3.cpp
@@ -9,7 +9,7 @@
  * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
- * Copyright 2012-2019, SU2 Contributors (cf. AUTHORS.md)
+ * Copyright 2012-2022, SU2 Contributors (cf. AUTHORS.md)
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/Common/src/grid_movement/CVolumetricMovement.cpp b/Common/src/grid_movement/CVolumetricMovement.cpp
@@ -1761,7 +1761,7 @@ void CVolumetricMovement::UpdateGridCoord_Derivatives(CGeometry *geometry, CConf
     }
   } else if ((Kind_SU2 == SU2_COMPONENT::SU2_DOT) && !ForwardProjectionDerivative) {
     // need to reset here, since we read out the whole vector, but are only interested in boundary derivatives.
-    if (config->GetSmoothGradient() && !ForwardProjectionDerivative) {
+    if (config->GetSmoothGradient()) {
       for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
         for (iDim = 0; iDim < nDim; iDim++) {
           total_index = iPoint*nDim + iDim;
diff --git a/SU2_CFD/include/integration/CIntegrationFactory.hpp b/SU2_CFD/include/integration/CIntegrationFactory.hpp
@@ -9,7 +9,7 @@
  * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
- * Copyright 2012-2019, SU2 Contributors (cf. AUTHORS.md)
+ * Copyright 2012-2022, SU2 Contributors (cf. AUTHORS.md)
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/SU2_CFD/include/numerics/CGradSmoothing.hpp b/SU2_CFD/include/numerics/CGradSmoothing.hpp
@@ -9,7 +9,7 @@
  * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
- * Copyright 2012-2019, SU2 Contributors (cf. AUTHORS.md)
+ * Copyright 2012-2022, SU2 Contributors (cf. AUTHORS.md)
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,7 +36,7 @@
  * \ingroup Grad_Smooth
  * \author T. Dick
  */
-class CGradSmoothing : public CNumerics {
+class CGradSmoothing final : public CNumerics {
   su2activematrix val_DHiDHj;
   su2activevector Ni_Vec;
 
@@ -55,10 +55,10 @@ class CGradSmoothing : public CNumerics {
   CGradSmoothing(unsigned short val_nDim, const CConfig* config);
 
   /*!
-   * \brief Destructor of the class.
+   * \brief Build the tangent stiffness matrix of an element.
+   * \param[in,out] element_container - Element whose tangent matrix is being built.
+   * \param[in] config - Definition of the problem.
    */
-  ~CGradSmoothing();
-
-  void Compute_Tangent_Matrix(CElement *element_container, const CConfig *config);
+  void Compute_Tangent_Matrix(CElement *element_container, const CConfig *config) override;
 
 };
diff --git a/SU2_CFD/include/solvers/CFEASolverBase.hpp b/SU2_CFD/include/solvers/CFEASolverBase.hpp
@@ -27,6 +27,8 @@
 
 #pragma once
 
+#include <unordered_set>
+
 #include "CSolver.hpp"
 #include "../../../Common/include/geometry/elements/CElement.hpp"
 #include "../../../Common/include/parallelization/omp_structure.hpp"
diff --git a/SU2_CFD/include/solvers/CGradientSmoothingSolver.hpp b/SU2_CFD/include/solvers/CGradientSmoothingSolver.hpp
@@ -35,23 +35,21 @@
 /*! \class CGradientSmoothingSolver
  *  \brief Main class for defining a gradient smoothing.
  *  \author T. Dick.
- *  \date March 25, 2019.
  */
 class CGradientSmoothingSolver final : public CFEASolverBase {
 public:
 
 /** Introduction of a new alias for the data type to allow compilation with forward mode.
  *
  * This is done for compatibility to the treatment of Jacobian and System in CSolver.hpp.
- * Note that the computations done here are always 'passive', i.e. not intended to be differentiated. We only need to
- * define functions depending on this once.
+ * Note that the computations done here are always 'passive', i.e. not intended to be differentiated.
+ * We only need to define functions depending on this once.
  */
 #ifndef CODI_FORWARD_TYPE
   typedef su2mixedfloat su2matvecscalar;
 #else
   typedef su2double su2matvecscalar;
 #endif
-  using MatrixType = C2DContainer<unsigned long, su2double, StorageType::RowMajor, 64, DynamicSize, DynamicSize>;
 
  private:
   unsigned int curDim;                       /*!< \brief If we separate dimensions this tells us in what dimension we currently are. */
@@ -112,6 +110,7 @@ class CGradientSmoothingSolver final : public CFEASolverBase {
                                 CConfig *config,
                                 su2double** Gradient) override;
 
+ private:
 
   /*!
    * \brief Assemble the stiffness matrix
@@ -179,11 +178,6 @@ class CGradientSmoothingSolver final : public CFEASolverBase {
                                               CConfig *config,
                                               su2double** Gradient) override;
 
-  /*!
-   * \brief Return current parameter gradient.
-   */
-  inline const vector<su2double>& GetDeltaP() const { return deltaP; }
-
   /*!
    * \brief write the DV gradient into a file
    */
@@ -231,22 +225,11 @@ class CGradientSmoothingSolver final : public CFEASolverBase {
    */
   void ReadSensFromGeometry(const CGeometry *geometry) override;
 
- private:
   /*!
    * \brief Write the solution of the linear solver into the sensitivities of the nodes
    */
   void WriteSensitivity(CGeometry* geometry, const CConfig* config);
 
-  /*!
-   * \brief Copy sensitivities from a vector into the geometry
-   */
-  void WriteVectorToGeometry(CGeometry* geometry, const CSysVector<su2matvecscalar>& vector) const;
-
-  /*!
-   * \brief Copy sensitivities from the geometry into a vector
-   */
-  void ReadVectorToGeometry(const CGeometry* geometry, CSysVector<su2matvecscalar>& vector);
-
   /*!
    * \brief Get the value of the reference coordinate to set on the element structure.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -301,7 +284,7 @@ class CGradientSmoothingSolver final : public CFEASolverBase {
   /*!
    * \brief Return the current working dimension.
    */
-  inline const unsigned int& GetCurrentDim() const {
+  inline unsigned int GetCurrentDim() const {
     return curDim;
   }
 
diff --git a/SU2_CFD/include/solvers/CSolver.hpp b/SU2_CFD/include/solvers/CSolver.hpp
@@ -38,8 +38,6 @@
 #include <set>
 #include <stdlib.h>
 #include <stdio.h>
-#include <unordered_set>
-#include <unordered_map>
 
 #include "../fluid/CFluidModel.hpp"
 #include "../task_definition.hpp"
diff --git a/SU2_CFD/include/variables/CSobolevSmoothingVariable.hpp b/SU2_CFD/include/variables/CSobolevSmoothingVariable.hpp
@@ -42,12 +42,7 @@ class CSobolevSmoothingVariable final : public CVariable {
    * \param[in] ndim - Number of dimensions of the problem.
    * \param[in] config - Definition of the particular problem.
    */
-  CSobolevSmoothingVariable(unsigned long npoint, unsigned long ndim, CConfig *config);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  ~CSobolevSmoothingVariable() override = default;
+  CSobolevSmoothingVariable(unsigned long npoint, unsigned long ndim, const CConfig *config);
 
   /*!
    * \brief Set the sensitivity at the node
diff --git a/SU2_CFD/src/numerics/CGradSmoothing.cpp b/SU2_CFD/src/numerics/CGradSmoothing.cpp
@@ -38,8 +38,6 @@ CGradSmoothing::CGradSmoothing(unsigned short val_nDim, const CConfig* config) :
   Ni_Vec.setConstant(0.0);
 }
 
-CGradSmoothing::~CGradSmoothing() {}
-
 void CGradSmoothing::Compute_Tangent_Matrix(CElement *element, const CConfig *config) {
 
   unsigned int iDim, jDim, iGauss, nGauss, iShape, jShape, nNode;
diff --git a/SU2_CFD/src/solvers/CGradientSmoothingSolver.cpp b/SU2_CFD/src/solvers/CGradientSmoothingSolver.cpp
@@ -31,8 +31,33 @@
 #include "../../include/solvers/CGradientSmoothingSolver.hpp"
 #include "../../include/variables/CSobolevSmoothingVariable.hpp"
 
+/*!
+ * \namespace CGradientSmoothingSolverDetails
+ * \brief Namespace to hide helper functions used by the CGradientSmoothingSolver class.
+ */
+namespace CGradientSmoothingSolverDetails {
+
+template<typename su2matvecscalar>
+void WriteVectorToGeometry(CGeometry* geometry, const CSysVector<su2matvecscalar>& vector) {
+  for (auto iPoint = 0ul; iPoint < geometry->GetnPoint(); iPoint++) {
+    for (auto iDim = 0u; iDim < geometry->GetnDim(); iDim++) {
+      geometry->SetSensitivity(iPoint,iDim, vector(iPoint, iDim));
+    }
+  }
+}
+
+template<typename su2matvecscalar>
+void ReadVectorToGeometry(const CGeometry* geometry, CSysVector<su2matvecscalar>& vector) {
+  for (auto iPoint = 0ul; iPoint < geometry->GetnPoint(); iPoint++) {
+    for (auto iDim = 0u; iDim < geometry->GetnDim(); iDim++) {
+      vector(iPoint, iDim) = SU2_TYPE::GetValue(geometry->GetSensitivity(iPoint,iDim));
+    }
+  }
+}
+} // namespace CGradientSmoothingSolverDetails
+
 CGradientSmoothingSolver::CGradientSmoothingSolver(CGeometry *geometry, CConfig *config) : CFEASolverBase(LINEAR_SOLVER_MODE::GRADIENT_MODE) {
-  unsigned int iDim, marker_count = 0;
+  unsigned int marker_count = 0;
   unsigned long iPoint;
 
   /*--- This solver does not perform recording operations --*/
@@ -80,9 +105,6 @@ CGradientSmoothingSolver::CGradientSmoothingSolver(CGeometry *geometry, CConfig
     }
   }
 
-  Residual = new su2double[nDim];   for (iDim = 0; iDim < nDim; iDim++) Residual[iDim] = 0.0;
-  Solution = new su2double[nDim];   for (iDim = 0; iDim < nDim; iDim++) Solution[iDim] = 0.0;
-
   /*--- initializations for linear equation systems ---*/
   if ( !config->GetSmoothOnSurface() ) {
     nVar = config->GetSmoothSepDim() ? 1 : nDim;
@@ -143,16 +165,6 @@ CGradientSmoothingSolver::CGradientSmoothingSolver(CGeometry *geometry, CConfig
 
 CGradientSmoothingSolver::~CGradientSmoothingSolver(void) {
 
-  if (element_container != nullptr) {
-    for (unsigned int iVar = 0; iVar < MAX_TERMS; iVar++) {
-      for (unsigned int jVar = 0; jVar < MAX_FE_KINDS; jVar++) {
-        delete element_container[iVar][jVar];
-      }
-      delete [] element_container[iVar];
-    }
-    delete [] element_container;
-  }
-
   delete nodes;
 
 }
@@ -288,9 +300,9 @@ void CGradientSmoothingSolver::ApplyGradientSmoothingDV(CGeometry *geometry, CNu
     } else {
 
       /*--- Forward evaluation of the mesh deformation ---*/
-      WriteVectorToGeometry(geometry, helperVecIn);
+      CGradientSmoothingSolverDetails::WriteVectorToGeometry<su2matvecscalar>(geometry, helperVecIn);
       grid_movement->SetVolume_Deformation(geometry, config, false, true, true);
-      ReadVectorToGeometry(geometry, helperVecIn);
+      CGradientSmoothingSolverDetails::ReadVectorToGeometry<su2matvecscalar>(geometry, helperVecIn);
 
       CSysMatrixComms::Initiate(helperVecIn, geometry, config, SOLUTION_MATRIX);
       CSysMatrixComms::Complete(helperVecIn, geometry, config, SOLUTION_MATRIX);
@@ -305,9 +317,9 @@ void CGradientSmoothingSolver::ApplyGradientSmoothingDV(CGeometry *geometry, CNu
       }
 
       /*--- Forward evaluation of the mesh deformation ---*/
-      WriteVectorToGeometry(geometry, helperVecOut);
+      CGradientSmoothingSolverDetails::WriteVectorToGeometry<su2matvecscalar>(geometry, helperVecOut);
       grid_movement->SetVolume_Deformation(geometry, config, false, true, false);
-      ReadVectorToGeometry(geometry, helperVecOut);
+      CGradientSmoothingSolverDetails::ReadVectorToGeometry<su2matvecscalar>(geometry, helperVecOut);
 
     }
 
@@ -324,7 +336,7 @@ void CGradientSmoothingSolver::ApplyGradientSmoothingDV(CGeometry *geometry, CNu
   if (rank == MASTER_NODE) {
     /*--- For multizone append zone number to filename. ---*/
     string hess_filename = config->GetObjFunc_Hess_FileName();
-    if (config->GetMultizone_Problem()) config->GetMultizone_FileName(hess_filename, config->GetiZone(), ".dat");
+    if (config->GetMultizone_Problem()) hess_filename=config->GetMultizone_FileName(hess_filename, config->GetiZone(), ".dat");
     ofstream SysMatrix(hess_filename);
     SysMatrix.precision(config->GetOutput_Precision());
 
@@ -333,7 +345,7 @@ void CGradientSmoothingSolver::ApplyGradientSmoothingDV(CGeometry *geometry, CNu
         SysMatrix << hessian(row,column);
         if (column!=nDVtotal-1) SysMatrix << ", ";
       }
-      if (row!=nDVtotal-1) SysMatrix << std::endl;
+      if (row!=nDVtotal-1) SysMatrix << '\n';
     }
     SysMatrix.close();
   }
@@ -463,8 +475,8 @@ void CGradientSmoothingSolver::Compute_Surface_StiffMatrix(CGeometry* geometry,
         Jacobian.AddBlock(indexNode[iNode], indexNode[jNode], Jacobian_block);
 
         /*--- Store if we set values for a given node already ---*/
-        if (visited[indexNode[iNode]]==false) { visited[indexNode[iNode]]=true; }
-        if (visited[indexNode[jNode]]==false) { visited[indexNode[jNode]]=true; }
+        visited[indexNode[iNode]]=true;
+        visited[indexNode[jNode]]=true;
 
       }
     }
@@ -476,6 +488,7 @@ void CGradientSmoothingSolver::Compute_Residual(CGeometry* geometry, const CConf
   unsigned int iDim, iNode, nNodes = 0;
   int EL_KIND = 0;
   std::array<unsigned long, MAXNNODE_3D> indexNode;
+  std::array<su2double, MAXNDIM> Residual;
   su2double Weight, Jac_X, val_Coord;
 
   for (iElem = 0; iElem < geometry->GetnElem(); iElem++) {
@@ -534,7 +547,7 @@ void CGradientSmoothingSolver::Compute_Surface_Residual(CGeometry* geometry, con
   int EL_KIND = 0;
   std::array<unsigned long, MAXNNODE_2D> indexNode;
   std::array<unsigned long, MAXNNODE_2D> indexVertex;
-  su2double Weight, Jac_X, normalSens = 0.0, norm, val_Coord;
+  su2double Weight, Jac_X, norm, val_Coord, normalSens = 0.0, Residual=0.0;
   su2double normal[MAXNDIM];
 
   for (iElem = 0; iElem < geometry->GetnElem_Bound(val_marker); iElem++) {
@@ -579,10 +592,10 @@ void CGradientSmoothingSolver::Compute_Surface_Residual(CGeometry* geometry, con
           normalSens += normal[iDim] * nodes->GetSensitivity(indexNode[iNode], iDim);
         }
 
-        Residual[0] += Weight * Jac_X * element_container[GRAD_TERM][EL_KIND]->GetNi(iNode, iGauss) * normalSens;
-        LinSysRes.AddBlock(indexNode[iNode], Residual);
+        Residual += Weight * Jac_X * element_container[GRAD_TERM][EL_KIND]->GetNi(iNode, iGauss) * normalSens;
+        LinSysRes.AddBlock(indexNode[iNode], &Residual);
 
-        Residual[0] = 0;
+        Residual = 0;
         normalSens = 0;
       }
     }
@@ -691,7 +704,7 @@ void CGradientSmoothingSolver::CalculateOriginalGradient(CGeometry *geometry, CV
 
   grid_movement->SetVolume_Deformation(geometry, config, false, true);
 
-  ReadVectorToGeometry(geometry, helperVecOut);
+  CGradientSmoothingSolverDetails::ReadVectorToGeometry<su2matvecscalar>(geometry, helperVecOut);
 
   ProjectMeshToDV(geometry, helperVecOut, deltaP, activeCoord, config);
 
@@ -721,7 +734,7 @@ void CGradientSmoothingSolver::OutputDVGradient(const CConfig* config, string ou
   unsigned iDV;
   if (rank == MASTER_NODE) {
     /*--- For multizone append zone number to filename. ---*/
-    if (config->GetMultizone_Problem()) config->GetMultizone_FileName(out_file, config->GetiZone(), ".dat");
+    if (config->GetMultizone_Problem()) out_file=config->GetMultizone_FileName(out_file, config->GetiZone(), ".dat");
     ofstream delta_p (out_file);
     delta_p.precision(config->GetOutput_Precision());
 
@@ -931,26 +944,6 @@ void CGradientSmoothingSolver::WriteSensitivity(CGeometry* geometry, const CConf
   }
 }
 
-void CGradientSmoothingSolver::WriteVectorToGeometry(CGeometry* geometry, const CSysVector<su2matvecscalar>& vector) const {
-  unsigned long iPoint;
-  unsigned int iDim;
-  for (iPoint = 0; iPoint < nPoint; iPoint++) {
-    for (iDim = 0; iDim < nDim; iDim++) {
-      geometry->SetSensitivity(iPoint,iDim, vector(iPoint, iDim));
-    }
-  }
-}
-
-void CGradientSmoothingSolver::ReadVectorToGeometry(const CGeometry* geometry, CSysVector<su2matvecscalar>& vector) {
-  unsigned long iPoint;
-  unsigned int iDim;
-  for (iPoint = 0; iPoint < nPoint; iPoint++) {
-    for (iDim = 0; iDim < nDim; iDim++) {
-      vector(iPoint, iDim) = SU2_TYPE::GetValue(geometry->GetSensitivity(iPoint,iDim));
-    }
-  }
-}
-
 void CGradientSmoothingSolver::Set_VertexEliminationSchedule(CGeometry* geometry, const CConfig* config) {
   /*--- Store global point indices of essential BC markers. ---*/
   vector<unsigned long> myPoints;
diff --git a/SU2_CFD/src/variables/CSobolevSmoothingVariable.cpp b/SU2_CFD/src/variables/CSobolevSmoothingVariable.cpp
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
diff --git a/TestCases/grad_smooth/naca0012/inv_NACA0012_gradsmooth.cfg b/TestCases/grad_smooth/naca0012/inv_NACA0012_gradsmooth.cfg
diff --git a/TestCases/grad_smooth/oneram6/ONERAM6_gradsmooth.cfg b/TestCases/grad_smooth/oneram6/ONERAM6_gradsmooth.cfg

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* The SU2 Project is maintained by the SU2 Foundation`
`10`	`10`	`* (http://su2foundation.org)`
`11`	`11`	`*`
`12`		`- * Copyright 2012-2019, SU2 Contributors (cf. AUTHORS.md)`
	`12`	`+ * Copyright 2012-2022, SU2 Contributors (cf. AUTHORS.md)`
`13`	`13`	`*`
`14`	`14`	`* SU2 is free software; you can redistribute it and/or`
`15`	`15`	`* modify it under the terms of the GNU Lesser General Public`
Original file line number	Diff line number	Diff line change
`@@ -1761,7 +1761,7 @@ void CVolumetricMovement::UpdateGridCoord_Derivatives(CGeometry *geometry, CConf`
`1761`	`1761`	`}`
`1762`	`1762`	`} else if ((Kind_SU2 == SU2_COMPONENT::SU2_DOT) && !ForwardProjectionDerivative) {`
`1763`	`1763`	`// need to reset here, since we read out the whole vector, but are only interested in boundary derivatives.`
`1764`		`- if (config->GetSmoothGradient() && !ForwardProjectionDerivative) {`
	`1764`	`+ if (config->GetSmoothGradient()) {`
`1765`	`1765`	`for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {`
`1766`	`1766`	`for (iDim = 0; iDim < nDim; iDim++) {`
`1767`	`1767`	`total_index = iPoint*nDim + iDim;`