Fixed comments after initial pull request

Author: lennaerttol

Common/include/CConfig.hpp

@@ -108,15 +108,14 @@ class CConfig {
   unsigned short FFD_Blending;    /*!< \brief Kind of FFD Blending function. */
   su2double* FFD_BSpline_Order;   /*!< \brief BSpline order in i,j,k direction. */
   su2double FFD_Tol;              /*!< \brief Tolerance in the point inversion problem. */
-  bool FFD_IntPrev;               /*!< \brief Enables self-intersection prevention procedure within the FFD box. */
-  unsigned short FFD_IntPrev_Iter; /*!< \brief Amount of iterations for FFD box self-intersection prevention procedure. */
-  unsigned short FFD_IntPrev_Depth; /*!< \brief Maximum recursion depth for FFD box self-intersection procedure. */
-  bool ConvexityCheck;            /*!< \brief Enables convexity check on all mesh elements. */
-  unsigned short ConvexityCheck_Iter; /*!< \brief Amount of iterations for convexity check in deformations. */
-  unsigned short ConvexityCheck_Depth; /*!< \brief Maximum recursion depth for convexity check in deformations.*/
-  su2double** TotalDeformation;   /*!< \brief Total deformation of the design variables. */
-  su2double Opt_RelaxFactor;      /*!< \brief Scale factor for the line search. */
-  su2double Opt_LineSearch_Bound; /*!< \brief Bounds for the line search. */
+  bool FFD_IntPrev;                       /*!< \brief Enables self-intersection prevention procedure within the FFD box. */
+  unsigned short FFD_IntPrev_MaxIter;     /*!< \brief Amount of iterations for FFD box self-intersection prevention procedure. */
+  unsigned short FFD_IntPrev_MaxDepth;    /*!< \brief Maximum recursion depth for FFD box self-intersection procedure. */
+  bool ConvexityCheck;                    /*!< \brief Enables convexity check on all mesh elements. */
+  unsigned short ConvexityCheck_MaxIter;  /*!< \brief Amount of iterations for convexity check in deformations. */
+  unsigned short ConvexityCheck_MaxDepth; /*!< \brief Maximum recursion depth for convexity check in deformations.*/
+  su2double Opt_RelaxFactor;              /*!< \brief Scale factor for the line search. */
+  su2double Opt_LineSearch_Bound;         /*!< \brief Bounds for the line search. */
   su2double StartTime;
   bool ContinuousAdjoint,   /*!< \brief Flag to know if the code is solving an adjoint problem. */
   Viscous,                  /*!< \brief Flag to know if the code is solving a viscous problem. */
@@ -8179,70 +8178,25 @@ class CConfig {
   su2double GetFFD_Tol(void) const { return FFD_Tol; }
 
   /*!
-   * \brief Get information about whether to do a check on self-intersections within the FFD box based on value of the Jacobian determinant.
-   * \return <code>TRUE</code> if FFD intersection prevention is active; otherwise <code>FALSE</code>.
+   * \brief Get information about whether to do a check on self-intersections within 
+      the FFD box based on value on the Jacobian determinant.
+   * \param[out] FFD_IntPrev: <code>TRUE</code> if FFD intersection prevention is active; otherwise <code>FALSE</code>.
+   * \param[out] FFD_IntPrev_MaxIter: Maximum number of iterations in the intersection prevention procedure.
+   * \param[out] FFD_IntPrev_MaxDepth: Maximum recursion depth in the intersection prevention procedure.
    */
-  bool GetFFD_IntPrev(void) const { return FFD_IntPrev; }
-
-  /*!
-   * \brief Get the maximum number of iterations in the recursive convexity check procedure in deformation.
-   * \return Maximum number of iterations.
-   */
-  unsigned short GetFFD_IntPrev_Iter(void) const { return FFD_IntPrev_Iter; }
-
-  /*!
-   * \brief Get the maximum recursion depth in the recursive convexity check procedure in deformation.
-   * \return Maximum recursion depth.
-   */
-  unsigned short GetFFD_IntPrev_Depth(void) const { return FFD_IntPrev_Depth; }
+  tuple<bool, unsigned short, unsigned short> GetFFD_IntPrev(void) {
+    return make_tuple(FFD_IntPrev, FFD_IntPrev_MaxIter, FFD_IntPrev_MaxDepth);
+  }
 
   /*!
    * \brief Get information about whether to do a check on convexity of the mesh elements.
-   * \return <code>TRUE</code> if convexity check is active; otherwise <code>FALSE</code>.
-   */
-  bool GetConvexity_Check(void) const { return ConvexityCheck; }
-
-  /*!
-   * \brief Get the maximum number of iterations in the recursive convexity check procedure in deformation.
-   * \return Maximum number of iterations.
-   */
-  unsigned short GetConvexityCheck_Iter(void) const { return ConvexityCheck_Iter; }
-
-  /*!
-   * \brief Get the maximum recursion depth in the recursive convexity check procedure in deformation.
-   * \return Maximum recursion depth.
+   * \param[out] ConvexityCheck: <code>TRUE</code> if convexity check is active; otherwise <code>FALSE</code>.
+   * \param[out] ConvexityCheck_MaxIter: Maximum number of iterations in the convexity check.
+   * \param[out] ConvexityCheck_MaxDepth: Maximum recursion depth in the convexity check.
    */
-  unsigned short GetConvexityCheck_Depth(void) const { return ConvexityCheck_Depth; }
-
-  /*!
-   * \brief Set the initial values for the total deformation of the design variables.
-   * \param[in] totalDef - total deformation of all design variables
-   */
-  void Initialize_TotalDeformation(su2double** totalDef) { TotalDeformation = totalDef; }
-
-  /*!
-   * \brief Set the total deformation value of each design variable.
-   * \param[in] val_dv - design variable
-   * \param[in] val_ind - index of design variable
-   * \param[in] val - value of deformation magnitude
-   */
-  void SetTotalDeformation(unsigned short val_dv, unsigned short val_ind, su2double val) {TotalDeformation[val_dv][val_ind] = val; }
-
-  /*!
-   * \brief Add a value to the total deformation value of each design variable.
-   * \param[in] val_dv - design variable
-   * \param[in] val_ind - index of design variable
-   * \param[in] val - value of deformation magnitude that is added
-   */
-  void AddTotalDeformation(unsigned short val_dv, unsigned short val_ind, su2double val) {TotalDeformation[val_dv][val_ind] += val; }
-
-  /*!
-   * \brief Get information about the total deformation of the design variables.
-   * \param[in] val_dv - design variable number
-   * \param[in] val_val - design variable number
-   * \return Value of total deformation for one design variable.
-   */
-  su2double GetTotalDeformation(unsigned short val_dv, unsigned short val_val = 0) const { return TotalDeformation[val_dv][val_val]; }
+  tuple<bool, unsigned short, unsigned short> GetConvexityCheck(void) {
+    return make_tuple(ConvexityCheck, ConvexityCheck_MaxIter, ConvexityCheck_MaxDepth);
+  }
 
   /*!
    * \brief Get the scale factor for the line search.

Common/include/grid_movement/CSurfaceMovement.hpp

@@ -211,7 +211,7 @@ class CSurfaceMovement : public CGridMovement {
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
    */
-  void SetSurface_Deformation(CGeometry *geometry, CConfig *config) override;
+  void SetSurface_Deformation(CGeometry *geometry, CConfig *config, su2double** totaldeformation = nullptr);
 
   /*!
    * \brief Compute the parametric coordinates of a grid point using a point inversion strategy
@@ -268,6 +268,15 @@ class CSurfaceMovement : public CGridMovement {
    */
   void GetCartesianCoordCP(CGeometry *geometry, CConfig *config, CFreeFormDefBox *FFDBoxParent, CFreeFormDefBox *FFDBoxChild);
 
+  /*!
+   * \brief Apply the design variables to the control point position
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] FFDBox - Array with all the free forms FFDBoxes of the computation.
+   * \param[in] iFFDBox - Index of FFD box.
+   */
+  void ApplyDesignVariables(CGeometry *geometry, CConfig *config, CFreeFormDefBox **FFDBox, unsigned short iFFDBox);
+
   /*!
    * \brief Recompute the cartesian coordinates using the control points position.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -485,15 +494,6 @@ class CSurfaceMovement : public CGridMovement {
    */
   void SetSurface_Derivative(CGeometry *geometry, CConfig *config);
 
-  /*!
-   * \brief Set magnitude of the deformation of all design variables
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] deformationFactor - Remaining amount of original deformation (between 0 and 1).
-   * \param[in] totalDeformation_initial - Initial deformation magnitude of all design variables.
-   */
-  void SetDeformationMagnitude(CGeometry *geometry, CConfig *config, su2double deformationFactor, su2double** totalDeformation_initial);
-
   /*!
    * \brief Calculate the determinant of the Jacobian matrix for the FFD problem.
    * \param[in] geometry - Geometrical definition of the problem.

Common/src/CConfig.cpp

@@ -2607,19 +2607,19 @@ void CConfig::SetConfig_Options() {
   addBoolOption("FFD_INTPREV", FFD_IntPrev, NO);
 
   /* DESCRIPTION: Number of total iterations in the convexity check procedure */
-  addUnsignedShortOption("FFD_INTPREV_ITER", FFD_IntPrev_Iter, 10);
+  addUnsignedShortOption("FFD_INTPREV_ITER", FFD_IntPrev_MaxIter, 10);
 
   /* DESCRIPTION: Recursion depth in the FFD self-intersection prevention */
-  addUnsignedShortOption("FFD_INTPREV_DEPTH", FFD_IntPrev_Depth, 3);
+  addUnsignedShortOption("FFD_INTPREV_DEPTH", FFD_IntPrev_MaxDepth, 3);
 
   /* DESCRIPTION: Convexity check on all mesh elements */
   addBoolOption("CONVEXITY_CHECK", ConvexityCheck, NO);
 
   /* DESCRIPTION: Number of total iterations in the convexity check procedure */
-  addUnsignedShortOption("CONVEXITY_CHECK_ITER", ConvexityCheck_Iter, 10);
+  addUnsignedShortOption("CONVEXITY_CHECK_ITER", ConvexityCheck_MaxIter, 10);
 
   /* DESCRIPTION: Recursion depth in the FFD self-intersection prevention */
-  addUnsignedShortOption("CONVEXITY_CHECK_DEPTH", ConvexityCheck_Depth, 3);
+  addUnsignedShortOption("CONVEXITY_CHECK_DEPTH", ConvexityCheck_MaxDepth, 3);
 
   /* DESCRIPTION: Definition of the FFD boxes */
   addFFDDefOption("FFD_DEFINITION", nFFDBox, CoordFFDBox, TagFFDBox);