fixes

Author: pcarruscag

Common/include/grid_movement/CGridMovement.hpp

@@ -55,10 +55,12 @@ class CGridMovement {
   virtual ~CGridMovement(void);
 
   /*!
-   * \brief A pure virtual member.
+   * \brief Set the surface/boundary deformation.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
+   * \return Total deformation applied, which may be less than target if intersection prevention is used.
    */
-  inline virtual void SetSurface_Deformation(CGeometry *geometry, CConfig *config, vector<vector<su2double> >& totalDeformation) { }
-
+  inline virtual vector<vector<su2double> > SetSurface_Deformation(CGeometry *geometry, CConfig *config) {
+    return vector<vector<su2double> >();
+  }
 };

Common/include/grid_movement/CSurfaceMovement.hpp

@@ -210,8 +210,9 @@ class CSurfaceMovement : public CGridMovement {
    * \brief Set the surface/boundary deformation.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
+   * \return Total deformation applied, which may be less than target if intersection prevention is used.
    */
-  void SetSurface_Deformation(CGeometry *geometry, CConfig *config, vector<vector<su2double> >& totaldeformation) override;
+  vector<vector<su2double> > SetSurface_Deformation(CGeometry *geometry, CConfig *config) override;
 
   /*!
    * \brief Compute the parametric coordinates of a grid point using a point inversion strategy

Common/src/grid_movement/CSurfaceMovement.cpp

@@ -39,20 +39,21 @@ CSurfaceMovement::CSurfaceMovement(void) : CGridMovement() {
 
 CSurfaceMovement::~CSurfaceMovement(void) {}
 
-void CSurfaceMovement::SetSurface_Deformation(CGeometry *geometry, CConfig *config,
-                                              vector<vector<su2double> >& totaldeformation) {
+vector<vector<su2double> > CSurfaceMovement::SetSurface_Deformation(CGeometry *geometry, CConfig *config) {
 
   unsigned short iFFDBox, iDV, iLevel, iChild, iParent, jFFDBox, iMarker;
   unsigned short Degree_Unitary [] = {1,1,1}, BSpline_Unitary [] = {2,2,2};
   su2double MaxDiff, Current_Scale, Ratio, New_Scale;
   string FFDBoxTag;
   bool allmoving;
 
-  bool cylindrical = (config->GetFFD_CoordSystem() == CYLINDRICAL);
-  bool spherical   = (config->GetFFD_CoordSystem() == SPHERICAL);
-  bool polar       = (config->GetFFD_CoordSystem() == POLAR);
-  bool cartesian   = (config->GetFFD_CoordSystem() == CARTESIAN);
-  su2double BoundLimit = config->GetOpt_LineSearch_Bound();
+  const bool cylindrical = (config->GetFFD_CoordSystem() == CYLINDRICAL);
+  const bool spherical   = (config->GetFFD_CoordSystem() == SPHERICAL);
+  const bool polar       = (config->GetFFD_CoordSystem() == POLAR);
+  const bool cartesian   = (config->GetFFD_CoordSystem() == CARTESIAN);
+  const su2double BoundLimit = config->GetOpt_LineSearch_Bound();
+
+  vector<vector<su2double> > totaldeformation;
 
   /*--- Setting the Free Form Deformation ---*/
 
@@ -323,7 +324,9 @@ void CSurfaceMovement::SetSurface_Deformation(CGeometry *geometry, CConfig *conf
             /*--- Set total deformation values in config ---*/
             if (config->GetKind_SU2() == SU2_DEF) {
 
+              totaldeformation.resize(config->GetnDV());
               for (iDV = 0; iDV < config->GetnDV(); iDV++) {
+                totaldeformation[iDV].resize(config->GetnDV_Value(iDV));
                 for (auto iDV_Value = 0u; iDV_Value < config->GetnDV_Value(iDV); iDV_Value++) {
                   totaldeformation[iDV][iDV_Value] = config->GetDV_Value(iDV, iDV_Value);
                 }
@@ -675,6 +678,7 @@ void CSurfaceMovement::SetSurface_Deformation(CGeometry *geometry, CConfig *conf
       cout << "Design Variable not implemented yet" << endl;
   }
 
+  return totaldeformation;
 }
 
 
@@ -705,8 +709,7 @@ void CSurfaceMovement::SetSurface_Derivative(CGeometry *geometry, CConfig *confi
 
   /*--- Run the surface deformation with DV_Value = 0.0 (no deformation at all) ---*/
 
-  auto dummy = vector<vector<su2double> >();
-  SetSurface_Deformation(geometry, config, dummy);
+  SetSurface_Deformation(geometry, config);
 }
 
 void CSurfaceMovement::CopyBoundary(CGeometry *geometry, CConfig *config) {

SU2_DEF/src/SU2_DEF.cpp

@@ -230,12 +230,6 @@ int main(int argc, char *argv[]) {
 
   for (iZone = 0; iZone < nZone; iZone++){
 
-    /*--- Initialize total deformation of design variables to zero ---*/
-    vector<vector<su2double> > TotalDeformation(config_container[iZone]->GetnDV());
-    for (size_t iDV = 0; iDV < TotalDeformation.size(); iDV++) {
-      TotalDeformation[iDV].resize(config_container[iZone]->GetnDV_Value(iDV), 0.0);
-    }
-
     if (config_container[iZone]->GetDesign_Variable(0) != NO_DEFORMATION) {
 
       /*--- Definition of the Class for grid movement ---*/
@@ -283,7 +277,7 @@ int main(int argc, char *argv[]) {
         /*--- Surface grid deformation ---*/
 
         if (rank == MASTER_NODE) cout << "Performing the deformation of the surface grid." << endl;
-        surface_movement[iZone]->SetSurface_Deformation(geometry_container[iZone], config_container[iZone], TotalDeformation);
+        auto TotalDeformation = surface_movement[iZone]->SetSurface_Deformation(geometry_container[iZone], config_container[iZone]);
 
         if (config_container[iZone]->GetDesign_Variable(0) != FFD_SETTING) {
 
@@ -353,7 +347,7 @@ int main(int argc, char *argv[]) {
               /*--- Surface grid deformation ---*/
               if (rank == MASTER_NODE) cout << "Performing the deformation of the surface grid." << endl;
 
-              surface_movement[iZone]->SetSurface_Deformation(geometry_container[iZone], config_container[iZone], TotalDeformation);
+              TotalDeformation = surface_movement[iZone]->SetSurface_Deformation(geometry_container[iZone], config_container[iZone]);
 
               if (rank == MASTER_NODE)
                 cout << endl << "------------------- Volumetric grid deformation (ZONE " << iZone <<") ----------------" << endl;