Merge pull request #1300 from su2code/feature_pysu2_DEF

Refactorization of SU2 Grid Deformation for Python
su2code · Feb 12, 2023 · 58cf2d4 · 58cf2d4
2 parents 98507bc + 5f15454
commit 58cf2d4
Show file tree

Hide file tree

Showing 34 changed files with 3,227 additions and 2,293 deletions.
diff --git a/Common/include/geometry/primal_grid/CPrimalGrid.hpp b/Common/include/geometry/primal_grid/CPrimalGrid.hpp
@@ -30,6 +30,7 @@
 
 #include <iostream>
 #include <vector>
+#include <limits>
 #include <cstdlib>
 #include <limits>
 #include <memory>

diff --git a/Common/include/grid_movement/CSurfaceMovement.hpp b/Common/include/grid_movement/CSurfaceMovement.hpp
@@ -443,7 +443,7 @@ class CSurfaceMovement : public CGridMovement {
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] val_mesh_filename - Name of the grid output file.
    */
-  void WriteFFDInfo(CSurfaceMovement **surface_movement, CGeometry **geometry, CConfig **config);
+  void WriteFFDInfo(CSurfaceMovement **surface_movement, CGeometry ****geometry, CConfig **config);
 
   /*!
    * \brief Get information about if there is a complete FFDBox definition, or it is necessary to

diff --git a/Common/src/grid_movement/CSurfaceMovement.cpp b/Common/src/grid_movement/CSurfaceMovement.cpp
@@ -4672,7 +4672,7 @@ void CSurfaceMovement::MergeFFDInfo(CGeometry *geometry, CConfig *config) {
 
 }
 
-void CSurfaceMovement::WriteFFDInfo(CSurfaceMovement** surface_movement, CGeometry **geometry, CConfig **config) {
+void CSurfaceMovement::WriteFFDInfo(CSurfaceMovement** surface_movement, CGeometry ****geometry, CConfig **config) {
 
 
   unsigned short iOrder, jOrder, kOrder, iFFDBox, iCornerPoints, iParentFFDBox, iChildFFDBox, iZone;
@@ -4683,13 +4683,13 @@ void CSurfaceMovement::WriteFFDInfo(CSurfaceMovement** surface_movement, CGeomet
 
   bool polar = (config[ZONE_0]->GetFFD_CoordSystem() == POLAR);
 
-  unsigned short nDim = geometry[ZONE_0]->GetnDim();
+  unsigned short nDim = geometry[ZONE_0][INST_0][MESH_0]->GetnDim();
 
   for (iZone = 0; iZone < config[ZONE_0]->GetnZone(); iZone++){
 
     /*--- Merge the parallel FFD info ---*/
 
-    surface_movement[iZone]->MergeFFDInfo(geometry[iZone], config[iZone]);
+    surface_movement[iZone]->MergeFFDInfo(geometry[iZone][INST_0][MESH_0], config[iZone]);
 
     if (iZone > 0){
 

diff --git a/SU2_CFD/include/drivers/CDriver.hpp b/SU2_CFD/include/drivers/CDriver.hpp