cleanup

Author: pcarruscag

Common/include/CConfig.hpp

@@ -664,9 +664,11 @@ class CConfig {
   su2double Deform_Coeff;            /*!< \brief Deform coeffienct */
   su2double Deform_Limit;            /*!< \brief Deform limit */
   DEFORM_KIND Deform_Kind;           /*!< \brief Type of mesh deformation */
-  bool RBF_DataReduction;            /*!< \brief Determines use of data reduction methods for RBF mesh deformation. */
-  su2double RBF_GreedyTolerance;      /*!< \brief Tolerance used in the greedy data reduction for RBF mesh deformation. */
-  su2double RBF_GreedyCorrectionFactor;   /*!< \brief Correction factor used in the greedy algorithm for RBF mesh deformation. */
+  struct CRBFParam {
+    bool DataReduction;               /*!< \brief Determines use of data reduction methods for RBF mesh deformation. */
+    su2double GreedyTolerance;        /*!< \brief Tolerance used in the greedy data reduction for RBF mesh deformation. */
+    su2double GreedyCorrectionFactor; /*!< \brief Correction factor used in the greedy algorithm for RBF mesh deformation. */
+  } RBFParam;
   unsigned short FFD_Continuity;     /*!< \brief Surface continuity at the intersection with the FFD */
   unsigned short FFD_CoordSystem;    /*!< \brief Define the coordinates system */
   su2double Deform_ElasticityMod,    /*!< \brief Young's modulus for volume deformation stiffness model */
@@ -3486,7 +3488,6 @@ class CConfig {
    */
   void SetMarker_All_Deform_Mesh_Internal(unsigned short val_marker, unsigned short val_deform) { Marker_All_Deform_Mesh_Internal[val_marker] = val_deform; }
 
-
   /*!
    * \brief Set if a in marker <i>val_marker</i> the flow load will be computed/employed.
    * \param[in] val_marker - Index of the marker in which we are interested.
@@ -4382,19 +4383,7 @@ class CConfig {
    * \brief Determines use of data reduction methods for RBF mesh deformation.
    * \return <code>TRUE</code> means that data reduction is used.
    */
-  bool GetRBF_DataReduction(void) const { return RBF_DataReduction; }
-
-  /*!
-   * \brief Determines use of data reduction methods for RBF mesh deformation.
-   * \return <code>TRUE</code> means that data reduction is used.
-   */
-  su2double GetRBF_DataRedTolerance(void) const { return RBF_GreedyTolerance; }
-
-  /*!
-   * \brief Determines use of data reduction methods for RBF mesh deformation.
-   * \return <code>TRUE</code> means that data reduction is used.
-   */
-  su2double GetRBF_DataRedCorrectionFactor(void) const { return RBF_GreedyCorrectionFactor; }
+  const CRBFParam& GetRBFParam(void) const { return RBFParam; }
 
   /*!
    * \brief Get the kind of SU2 software component.

Common/include/grid_movement/CLinearElasticity.hpp

@@ -36,7 +36,6 @@
  * \brief Class for moving the volumetric numerical grid using the linear elasticity analogy.
  * \author F. Palacios, A. Bueno, T. Economon, S. Padron.
  */
-
 class CLinearElasticity final : public CVolumetricMovement {
  protected:
   unsigned short nVar; /*!< \brief Number of variables. */
@@ -75,8 +74,9 @@ class CLinearElasticity final : public CVolumetricMovement {
    * \param[in] Derivative - Compute the derivative (disabled by default). Does not actually deform the grid if enabled.
    */
   void SetVolume_Deformation(CGeometry* geometry, CConfig* config, bool UpdateGeo, bool Derivative,
-                             bool ForwardProjectionDerivative);
+                             bool ForwardProjectionDerivative) override;
 
+ private:
   /*!
    * \brief Update the value of the coordinates after the grid movement.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -228,16 +228,4 @@ class CLinearElasticity final : public CVolumetricMovement {
    * \param[in] config - Definition of the particular problem.
    */
   void SetBoundaryDerivatives(CGeometry* geometry, CConfig* config, bool ForwardProjectionDerivative);
-
-  /*!
-   * \brief Store the number of iterations when moving the mesh.
-   * \param[in] val_nIterMesh - Number of iterations.
-   */
-  inline void Set_nIterMesh(unsigned long val_nIterMesh) { nIterMesh = val_nIterMesh; }
-
-  /*!
-   * \brief Retrieve the number of iterations when moving the mesh.
-   * \param[out] Number of iterations.
-   */
-  inline unsigned long Get_nIterMesh() const { return nIterMesh; }
 };

Common/include/grid_movement/CRadialBasisFunctionInterpolation.hpp

@@ -28,14 +28,12 @@
 #pragma once
 #include "CVolumetricMovement.hpp"
 #include "CRadialBasisFunctionNode.hpp"
-#include "../../include/toolboxes/CSymmetricMatrix.hpp"
 
 /*!
  * \class CRadialBasisFunctionInterpolation
  * \brief Class for moving the volumetric numerical grid using Radial Basis Function interpolation.
  * \author F. van Steen
  */
-
 class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
  protected:
   vector<CRadialBasisFunctionNode*>* ControlNodes = nullptr; /*!< \brief Vector with control nodes*/
@@ -60,7 +58,7 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
   /*!
    * \brief Destructor of the class.
    */
-  ~CRadialBasisFunctionInterpolation(void) override;
+  ~CRadialBasisFunctionInterpolation() override;
 
   /*!
    * \brief Grid deformation using the spring analogy method.
@@ -70,8 +68,9 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
    * \param[in] Derivative - Compute the derivative (disabled by default). Does not actually deform the grid if enabled.
    */
   void SetVolume_Deformation(CGeometry* geometry, CConfig* config, bool UpdateGeo, bool Derivative,
-                             bool ForwardProjectionDerivative);
+                             bool ForwardProjectionDerivative) override;
 
+ private:
   /*!
    * \brief Selecting unique set of boundary nodes based on marker information.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -101,8 +100,7 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
    * \param[in] type - Type of radial basis function.
    * \param[in] radius - Support radius of the radial basis function.
    */
-
-  void SolveRBF_System(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, const su2double radius);
+  void SolveRBFSystem(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, su2double radius);
 
   /*!
    * \brief Obtaining the interpolation coefficients of the control nodes.
@@ -111,8 +109,7 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
    * \param[in] type - Type of radial basis function.
    * \param[in] radius - Support radius of the radial basis function.
    */
-
-  void GetInterpCoeffs(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, const su2double radius);
+  void GetInterpCoeffs(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, su2double radius);
 
   /*!
    * \brief Gathering of all control node coordinates.
@@ -134,7 +131,7 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
    * \param[in] radius - Support radius of the radial basis function.
    * \param[in] invInterpMat - Inverse of the interpolation matrix.
    */
-  void ComputeInterpolationMatrix(CGeometry* geometry, const RADIAL_BASIS& type, const su2double radius,
+  void ComputeInterpolationMatrix(CGeometry* geometry, const RADIAL_BASIS& type, su2double radius,
                                   su2passivematrix& invInterpMat);
 
   /*!
@@ -162,7 +159,7 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
   /*!
    * \brief Compute global number of control nodes.
    */
-  void Get_nCtrlNodesGlobal();
+  void ComputeNCtrlNodesGlobal();
 
   /*!
    * \brief Compute interpolation error.
@@ -173,7 +170,7 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
    * \param[in] maxErrorNodeLocal - Local maximum error node.
    * \param[in] maxErrorLocal - Local maximum error.
    */
-  void GetInterpError(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, const su2double radius,
+  void GetInterpError(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, su2double radius,
                       unsigned long& maxErrorNodeLocal, su2double& maxErrorLocal);
 
   /*!
@@ -185,7 +182,7 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
    * \param[in] iNode - Local node in consideration.
    * \param[in] localError - Local error.
    */
-  void GetNodalError(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, const su2double radius,
+  void GetNodalError(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, su2double radius,
                      unsigned long iNode, su2double* localError);
 
   /*!
@@ -196,7 +193,7 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
    * \param[in] radius - Support radius of the radial basis function.
    * \param[in] internalNodes - Internal nodes.
    */
-  void UpdateGridCoord(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, const su2double radius,
+  void UpdateGridCoord(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, su2double radius,
                        const vector<unsigned long>& internalNodes);
 
   /*!
@@ -206,7 +203,7 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
    * \param[in] radius - Support radius of the radial basis function.
    * \param[in] internalNodes - Internal nodes.
    */
-  void UpdateInternalCoords(CGeometry* geometry, const RADIAL_BASIS& type, const su2double radius,
+  void UpdateInternalCoords(CGeometry* geometry, const RADIAL_BASIS& type, su2double radius,
                             const vector<unsigned long>& internalNodes);
 
   /*!
@@ -216,7 +213,7 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
    * \param[in] type - Type of radial basis function.
    * \param[in] radius - Support radius of the radial basis function.
    */
-  void UpdateBoundCoords(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, const su2double radius);
+  void UpdateBoundCoords(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type, su2double radius);
 
   /*!
    * \brief Apply correction to the nonzero error boundary nodes.
@@ -227,24 +224,4 @@ class CRadialBasisFunctionInterpolation : public CVolumetricMovement {
    */
   void SetCorrection(CGeometry* geometry, CConfig* config, const RADIAL_BASIS& type,
                      const vector<unsigned long>& internalNodes);
-
-  /*!
-   * \brief Custom comparison function, for sorting the CRadialBasisFunctionNode objects based on their index.
-   * \param[in] a - First considered Radial Basis Function Node.
-   * \param[in] b - Second considered Radial Basis Function Node.
-   * \return True if index of a is smaller than index of b.
-   */
-  inline static bool HasSmallerIndex(CRadialBasisFunctionNode* a, CRadialBasisFunctionNode* b) {
-    return a->GetIndex() < b->GetIndex();
-  }
-
-  /*!
-   * \brief Custom equality function, for obtaining a unique set of CRadialBasisFunctionNode objects.
-   * \param[in] a - First considered Radial Basis Function Node.
-   * \param[in] b - Second considered Radial Basis Function Node.
-   * \return True if index of a and b are equal.
-   */
-  inline static bool HasEqualIndex(CRadialBasisFunctionNode* a, CRadialBasisFunctionNode* b) {
-    return a->GetIndex() == b->GetIndex();
-  }
 };

Common/include/grid_movement/CRadialBasisFunctionNode.hpp

@@ -26,15 +26,13 @@
  */
 
 #pragma once
-
-#include "../../../Common/include/geometry/CGeometry.hpp"
+#include "../code_config.hpp"
 
 /*!
  * \class CRadialBasisFunctionNode
  * \brief Class for defining a Radial Basis Function Node
  * \author F. van Steen
  */
-
 class CRadialBasisFunctionNode {
  protected:
   unsigned long idx;         /*!< \brief Global index. */
@@ -50,25 +48,26 @@ class CRadialBasisFunctionNode {
    * \param[in] marker_val - Local marker index.
    * \param[in] vertex_val - Local vertex index.
    */
-  CRadialBasisFunctionNode(unsigned long idx_val, unsigned short marker_val, unsigned long vertex_val);
+  CRadialBasisFunctionNode(unsigned long idx_val, unsigned short marker_val, unsigned long vertex_val)
+      : idx(idx_val), marker_idx(marker_val), vertex_idx(vertex_val) {}
 
   /*!
    * \brief Returns local global index.
    * \return Local node index.
    */
-  inline unsigned long GetIndex() { return idx; }
+  inline unsigned long GetIndex() const { return idx; }
 
   /*!
    * \brief Returns local vertex index.
    * \return Local vertex index.
    */
-  inline unsigned long GetVertex() { return vertex_idx; }
+  inline unsigned long GetVertex() const { return vertex_idx; }
 
   /*!
    * \brief Returns local marker index.
    * \return Local marker index.
    */
-  inline unsigned short GetMarker() { return marker_idx; }
+  inline unsigned short GetMarker() const { return marker_idx; }
 
   /*!
    * \brief Set error of the RBF node.
@@ -84,5 +83,5 @@ class CRadialBasisFunctionNode {
    * \brief Get nodal error.
    * \return Nodal error.
    */
-  inline su2double* GetError() { return error; }
+  inline const su2double* GetError() const { return error; }
 };

Common/src/CConfig.cpp

@@ -2424,12 +2424,12 @@ void CConfig::SetConfig_Options() {
   addUnsignedLongOption("DEFORM_LINEAR_SOLVER_ITER", Deform_Linear_Solver_Iter, 1000);
   /* DESCRIPTION: Type of mesh deformation */
   addEnumOption("DEFORM_KIND", Deform_Kind, Deform_Kind_Map, DEFORM_KIND::ELASTIC);
-  /* DESCRIPTION: Use of data reduction methods for RBF interpolated mesh deformation */
-  addBoolOption("RBF_DATA_REDUCTION", RBF_DataReduction, true);
+  /* DESCRIPTION: Use of data reduction methods for RBF interpolated mesh deformation. */
+  addBoolOption("RBF_DATA_REDUCTION", RBFParam.DataReduction, true);
   /* DESCRIPTION: Tolerance for the data reduction methods used in RBF mesh deformation. */
-  addDoubleOption("RBF_GREEDY_TOLERANCE", RBF_GreedyTolerance, 1E-2);
-  /* DESCRIPTION: Tolerance for the data reduction methods used in RBF mesh deformation. */
-  addDoubleOption("RBF_GREEDY_CORRECTION_FACTOR", RBF_GreedyCorrectionFactor, 1E-2);
+  addDoubleOption("RBF_GREEDY_TOLERANCE", RBFParam.GreedyTolerance, 1E-2);
+  /* DESCRIPTION: Correction factor for the data reduction methods used in RBF mesh deformation. */
+  addDoubleOption("RBF_GREEDY_CORRECTION_FACTOR", RBFParam.GreedyCorrectionFactor, 1E-2);
 
   /*!\par CONFIG_CATEGORY: FEM flow solver definition \ingroup Config*/
   /*--- Options related to the finite element flow solver---*/

Common/src/grid_movement/CLinearElasticity.cpp

@@ -150,7 +150,7 @@ particular, the linear elasticity equations hold only for small deformations. --
 
     /*--- Set number of iterations in the mesh update. ---*/
 
-    Set_nIterMesh(Tot_Iter);
+    nIterMesh = Tot_Iter;
 
     if (rank == MASTER_NODE && Screen_Output) {
       cout << "Non-linear iter.: " << iNonlinear_Iter + 1 << "/" << Nonlinear_Iter << ". Linear iter.: " << Tot_Iter
@@ -191,17 +191,14 @@ void CLinearElasticity::UpdateGridCoord_Derivatives(CGeometry* geometry, CConfig
                                                     bool ForwardProjectionDerivative) {
   unsigned short iDim, iMarker;
   unsigned long iPoint, total_index, iVertex;
-  auto* new_coord = new su2double[3];
 
   SU2_COMPONENT Kind_SU2 = config->GetKind_SU2();
 
   /*--- Update derivatives of the grid coordinates using the solution of the linear system
      after grid deformation (LinSysSol contains the derivatives of the x, y, z displacements). ---*/
   if ((config->GetDirectDiff() == D_DESIGN) && (Kind_SU2 == SU2_COMPONENT::SU2_CFD)) {
     for (iPoint = 0; iPoint < geometry->GetnPoint(); iPoint++) {
-      new_coord[0] = 0.0;
-      new_coord[1] = 0.0;
-      new_coord[2] = 0.0;
+      su2double new_coord[3] = {};
       for (iDim = 0; iDim < nDim; iDim++) {
         total_index = iPoint * nDim + iDim;
         new_coord[iDim] = geometry->nodes->GetCoord(iPoint, iDim);
@@ -240,8 +237,6 @@ void CLinearElasticity::UpdateGridCoord_Derivatives(CGeometry* geometry, CConfig
       }
     }
   }
-
-  delete[] new_coord;
 }
 
 void CLinearElasticity::ComputeSolid_Wall_Distance(CGeometry* geometry, CConfig* config, su2double& MinDistance,