constification, remove legacy python FSI

Author: pcarruscag

Common/include/CConfig.hpp

@@ -657,7 +657,7 @@ class CConfig {
   nMarker_ZoneInterface,              /*!< \brief Number of markers in the zone interface. */
   nMarker_Plotting,                   /*!< \brief Number of markers to plot. */
   nMarker_Analyze,                    /*!< \brief Number of markers to analyze. */
-  nMarker_Moving,                     /*!< \brief Number of markers in motion (DEFORMING, MOVING_WALL, or FLUID_STRUCTURE). */
+  nMarker_Moving,                     /*!< \brief Number of markers in motion (DEFORMING, MOVING_WALL). */
   nMarker_PyCustom,                   /*!< \brief Number of markers that are customizable in Python. */
   nMarker_DV,                         /*!< \brief Number of markers affected by the design variables. */
   nMarker_WallFunctions;              /*!< \brief Number of markers for which wall functions must be applied. */
@@ -667,7 +667,7 @@ class CConfig {
   *Marker_Plotting,                   /*!< \brief Markers to plot. */
   *Marker_Analyze,                    /*!< \brief Markers to analyze. */
   *Marker_ZoneInterface,              /*!< \brief Markers in the FSI interface. */
-  *Marker_Moving,                     /*!< \brief Markers in motion (DEFORMING, MOVING_WALL, or FLUID_STRUCTURE). */
+  *Marker_Moving,                     /*!< \brief Markers in motion (DEFORMING, MOVING_WALL). */
   *Marker_PyCustom,                   /*!< \brief Markers that are customizable in Python. */
   *Marker_DV,                         /*!< \brief Markers affected by the design variables. */
   *Marker_WallFunctions;              /*!< \brief Markers for which wall functions must be applied. */

Common/include/option_structure.hpp

@@ -176,7 +176,6 @@ enum ENUM_MAIN_SOLVER {
   INC_NAVIER_STOKES =5,             /*!< \brief Definition of the incompressible Navier-Stokes' solver. */
   INC_RANS = 6,                     /*!< \brief Definition of the incompressible Reynolds-averaged Navier-Stokes' (RANS) solver. */
   HEAT_EQUATION = 7,                /*!< \brief Definition of the finite volume heat solver. */
-  FLUID_STRUCTURE_INTERACTION = 8,  /*!< \brief Definition of a FSI solver. */
   FEM_ELASTICITY = 9,               /*!< \brief Definition of a FEM solver. */
   ADJ_EULER = 10,                   /*!< \brief Definition of the continuous adjoint Euler's solver. */
   ADJ_NAVIER_STOKES = 11,           /*!< \brief Definition of the continuous adjoint Navier-Stokes' solver. */
@@ -231,7 +230,6 @@ static const MapType<string, ENUM_MAIN_SOLVER> Solver_Map = {
   MakePair("DISC_ADJ_FEM_RANS", DISC_ADJ_FEM_RANS)
   MakePair("DISC_ADJ_FEM_NS", DISC_ADJ_FEM_NS)
   MakePair("DISC_ADJ_FEM", DISC_ADJ_FEM)
-  MakePair("FLUID_STRUCTURE_INTERACTION", FLUID_STRUCTURE_INTERACTION)
   MakePair("TEMPLATE_SOLVER", TEMPLATE_SOLVER)
   MakePair("MULTIPHYSICS", MULTIPHYSICS)
 };
@@ -699,7 +697,6 @@ enum ENUM_SURFACEMOVEMENT {
   MOVING_WALL = 2,               /*!< \brief Simulation with moving wall. */
   AEROELASTIC = 3,               /*!< \brief Simulation with aeroelastic motion. */
   AEROELASTIC_RIGID_MOTION = 4,  /*!< \brief Simulation with rotation and aeroelastic motion. */
-  FLUID_STRUCTURE = 5,           /*!< \brief Fluid structure deformation. */
   EXTERNAL = 6,                  /*!< \brief Simulation with external motion. */
   EXTERNAL_ROTATION = 7,         /*!< \brief Simulation with external rotation motion. */
 };
@@ -708,7 +705,6 @@ static const MapType<string, ENUM_SURFACEMOVEMENT> SurfaceMovement_Map = {
   MakePair("MOVING_WALL", MOVING_WALL)
   MakePair("AEROELASTIC_RIGID_MOTION", AEROELASTIC_RIGID_MOTION)
   MakePair("AEROELASTIC", AEROELASTIC)
-  MakePair("FLUID_STRUCTURE", FLUID_STRUCTURE)
   MakePair("EXTERNAL", EXTERNAL)
   MakePair("EXTERNAL_ROTATION", EXTERNAL_ROTATION)
 };

Common/src/CConfig.cpp

@@ -3114,13 +3114,6 @@ void CConfig::SetnZone(){
 
   }
 
-  /*--- Temporary fix until Multizone Disc. Adj. solver is ready ---- */
-
-  if (Kind_Solver == FLUID_STRUCTURE_INTERACTION){
-
-    nZone = GetnZone(Mesh_FileName, Mesh_FileFormat);
-
-  }
 }
 
 void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_izone, unsigned short val_nDim) {
@@ -3563,11 +3556,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     }
   }
 
-  if ((nKind_SurfaceMovement > 1) && GetSurface_Movement(FLUID_STRUCTURE)) {
-    SU2_MPI::Error("FSI in combination with moving surfaces is currently not supported.", CURRENT_FUNCTION);
-  }
-
-  if ((nKind_SurfaceMovement != nMarker_Moving) && !GetSurface_Movement(FLUID_STRUCTURE)) {
+  if (nKind_SurfaceMovement != nMarker_Moving) {
     SU2_MPI::Error("Number of KIND_SURFACE_MOVEMENT must match number of MARKER_MOVING", CURRENT_FUNCTION);
   }
 
@@ -5590,7 +5579,6 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
         case RIGID_MOTION:    cout << "rigid mesh motion." << endl; break;
         case MOVING_HTP:      cout << "HTP moving." << endl; break;
         case ROTATING_FRAME:  cout << "rotating reference frame." << endl; break;
-        case FLUID_STRUCTURE: cout << "fluid-structure motion." << endl; break;
         case EXTERNAL:        cout << "externally prescribed motion." << endl; break;
       }
     }
@@ -8302,7 +8290,6 @@ bool CConfig::GetVolumetric_Movement() const {
 
   if (GetSurface_Movement(AEROELASTIC) ||
       GetSurface_Movement(AEROELASTIC_RIGID_MOTION)||
-      GetSurface_Movement(FLUID_STRUCTURE) ||
       GetSurface_Movement(EXTERNAL) ||
       GetSurface_Movement(EXTERNAL_ROTATION)){
     volumetric_movement = true;

SU2_CFD/include/drivers/CDriver.hpp

@@ -428,13 +428,13 @@ class CDriver {
    * \param[in] iVertex - Vertex identifier.
    * \return True if the specified vertex is a halo node.
    */
-  bool IsAHaloNode(unsigned short iMarker, unsigned long iVertex);
+  bool IsAHaloNode(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Get the number of external iterations.
    * \return Number of external iterations.
    */
-  unsigned long GetnTimeIter();
+  unsigned long GetnTimeIter() const;
 
   /*!
    * \brief Get the current external iteration.
@@ -446,31 +446,31 @@ class CDriver {
    * \brief Get the unsteady time step.
    * \return Unsteady time step.
    */
-  passivedouble GetUnsteady_TimeStep();
+  passivedouble GetUnsteady_TimeStep() const;
 
   /*!
    * \brief Get the global index of a vertex on a specified marker.
    * \param[in] iMarker - Marker identifier.
    * \param[in] iVertex - Vertex identifier.
    * \return Vertex global index.
    */
-  unsigned long GetVertexGlobalIndex(unsigned short iMarker, unsigned long iVertex);
+  unsigned long GetVertexGlobalIndex(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Get undeformed coordinates from the mesh solver.
    * \param[in] iMarker - Marker identifier.
    * \param[in] iVertex - Vertex identifier.
    * \return x,y,z coordinates of the vertex.
    */
-  vector<passivedouble> GetInitialMeshCoord(unsigned short iMarker, unsigned long iVertex);
+  vector<passivedouble> GetInitialMeshCoord(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Get the temperature at a vertex on a specified marker.
    * \param[in] iMarker - Marker identifier.
    * \param[in] iVertex - Vertex identifier.
    * \return Temperature of the vertex.
    */
-  passivedouble GetVertexTemperature(unsigned short iMarker, unsigned long iVertex);
+  passivedouble GetVertexTemperature(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Set the temperature of a vertex on a specified marker.
@@ -486,15 +486,15 @@ class CDriver {
    * \param[in] iVertex - Vertex identifier.
    * \return True if the vertex is a halo node.
    */
-  vector<passivedouble> GetVertexHeatFluxes(unsigned short iMarker, unsigned long iVertex);
+  vector<passivedouble> GetVertexHeatFluxes(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Get the wall normal component of the heat flux at a vertex on a specified marker.
    * \param[in] iMarker - Marker identifier.
    * \param[in] iVertex - Vertex identifier.
    * \return Wall normal component of the heat flux at the vertex.
    */
-  passivedouble GetVertexNormalHeatFlux(unsigned short iMarker, unsigned long iVertex);
+  passivedouble GetVertexNormalHeatFlux(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Set the wall normal component of the heat flux at a vertex on a specified marker.
@@ -510,60 +510,59 @@ class CDriver {
    * \param[in] iVertex - Vertex identifier.
    * \return Thermal conductivity at the vertex.
    */
-  passivedouble GetThermalConductivity(unsigned short iMarker, unsigned long iVertex);
+  passivedouble GetThermalConductivity(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Preprocess the inlets via file input for all solvers.
    * \param[in] solver_container - Container vector with all the solutions.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
    */
-  void Inlet_Preprocessing(CSolver ***solver, CGeometry **geometry,
-                                    CConfig *config) const;
+  void Inlet_Preprocessing(CSolver ***solver, CGeometry **geometry, CConfig *config) const;
 
   /*!
    * \brief Get the unit normal (vector) at a vertex on a specified marker.
    * \param[in] iMarker - Marker identifier.
    * \param[in] iVertex - Vertex identifier.
    * \return Unit normal (vector) at the vertex.
    */
-  vector<passivedouble> GetVertexUnitNormal(unsigned short iMarker, unsigned long iVertex);
+  vector<passivedouble> GetVertexUnitNormal(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Get all the boundary markers tags.
    * \return List of boundary markers tags.
    */
-  vector<string> GetAllBoundaryMarkersTag();
+  vector<string> GetAllBoundaryMarkersTag() const;
 
   /*!
    * \brief Get all the deformable boundary marker tags.
    * \return List of deformable boundary markers tags.
    */
-  vector<string> GetAllDeformMeshMarkersTag();
+  vector<string> GetAllDeformMeshMarkersTag() const;
 
   /*!
    * \brief Get all the heat transfer boundary markers tags.
    * \return List of heat transfer boundary markers tags.
    */
-  vector<string> GetAllCHTMarkersTag();
+  vector<string> GetAllCHTMarkersTag() const;
 
   /*!
    * \brief Get all the (subsonic) inlet boundary markers tags.
    * \return List of inlet boundary markers tags.
    */
-  vector<string> GetAllInletMarkersTag();
+  vector<string> GetAllInletMarkersTag() const;
 
   /*!
    * \brief Get all the boundary markers tags with their associated indices.
    * \return List of boundary markers tags with their indices.
    */
-  map<string, int> GetAllBoundaryMarkers();
+  map<string, int> GetAllBoundaryMarkers() const;
 
   /*!
    * \brief Get all the boundary markers tags with their associated types.
    * \return List of boundary markers tags with their types.
    */
-  map<string, string> GetAllBoundaryMarkersType();
+  map<string, string> GetAllBoundaryMarkersType() const;
 
   /*!
    * \brief Set the mesh displacement for the elasticity mesh solver.
@@ -586,7 +585,7 @@ class CDriver {
    * \param[in] iVertex - Vertex identifier.
    * \return Vector of sensitivities.
    */
-  vector<passivedouble> GetMeshDisp_Sensitivity(unsigned short iMarker, unsigned long iVertex);
+  vector<passivedouble> GetMeshDisp_Sensitivity(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Set the load in X direction for the structural solver.
@@ -605,23 +604,23 @@ class CDriver {
    * \param[in] iVertex - Vertex identifier.
    * \return Vector of displacements.
    */
-  vector<passivedouble> GetFEA_Displacements(unsigned short iMarker, unsigned long iVertex);
+  vector<passivedouble> GetFEA_Displacements(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Return the velocities from the FEA Solver.
    * \param[in] iMarker - Marker identifier.
    * \param[in] iVertex - Vertex identifier.
    * \return Vector of velocities.
    */
-  vector<passivedouble> GetFEA_Velocity(unsigned short iMarker, unsigned long iVertex);
+  vector<passivedouble> GetFEA_Velocity(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Return the velocities from the FEA Solver.
    * \param[in] iMarker - Marker identifier.
    * \param[in] iVertex - Vertex identifier.
    * \return Vector of velocities at time n.
    */
-  vector<passivedouble> GetFEA_Velocity_n(unsigned short iMarker, unsigned long iVertex);
+  vector<passivedouble> GetFEA_Velocity_n(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Get the sensitivity of the flow loads for the structural solver.
@@ -631,15 +630,15 @@ class CDriver {
    * \param[in] LoadX - Value of the load in the direction Y.
    * \param[in] LoadX - Value of the load in the direction Z.
    */
-  vector<passivedouble> GetFlowLoad_Sensitivity(unsigned short iMarker, unsigned long iVertex);
+  vector<passivedouble> GetFlowLoad_Sensitivity(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Get the flow load (from the extra step - the repeated methods should be unified once the postprocessing
    * strategy is in place).
    * \param[in] iMarker - Marker identifier.
    * \param[in] iVertex - Vertex identifier.
    */
-  vector<passivedouble> GetFlowLoad(unsigned short iMarker, unsigned long iVertex);
+  vector<passivedouble> GetFlowLoad(unsigned short iMarker, unsigned long iVertex) const;
 
   /*!
    * \brief Set the adjoint of the flow tractions (from the extra step -

SU2_CFD/src/iteration/CIteration.cpp

@@ -34,13 +34,8 @@ void CIteration::SetGrid_Movement(CGeometry** geometry, CSurfaceMovement* surfac
                                   CVolumetricMovement* grid_movement, CSolver*** solver, CConfig* config,
                                   unsigned long IntIter, unsigned long TimeIter) {
   unsigned short Kind_Grid_Movement = config->GetKind_GridMovement();
-  unsigned long nIterMesh;
-  bool stat_mesh = true;
   bool adjoint = config->GetContinuous_Adjoint();
 
-  /*--- Only write to screen if this option is enabled ---*/
-  bool Screen_Output = config->GetDeform_Output();
-
   unsigned short val_iZone = config->GetiZone();
 
   /*--- Perform mesh movement depending on specified type ---*/
@@ -120,32 +115,6 @@ void CIteration::SetGrid_Movement(CGeometry** geometry, CSurfaceMovement* surfac
     }
   }
 
-  if (config->GetSurface_Movement(FLUID_STRUCTURE)) {
-    if (rank == MASTER_NODE && Screen_Output)
-      cout << endl << "Deforming the grid for Fluid-Structure Interaction applications." << endl;
-
-    /*--- Deform the volume grid around the new boundary locations ---*/
-
-    if (rank == MASTER_NODE && Screen_Output) cout << "Deforming the volume grid." << endl;
-    grid_movement->SetVolume_Deformation(geometry[MESH_0], config, true, false);
-
-    nIterMesh = grid_movement->Get_nIterMesh();
-    stat_mesh = (nIterMesh == 0);
-
-    if (!adjoint && !stat_mesh) {
-      if (rank == MASTER_NODE && Screen_Output) cout << "Computing grid velocities by finite differencing." << endl;
-      geometry[MESH_0]->SetGridVelocity(config, TimeIter);
-    } else if (stat_mesh) {
-      if (rank == MASTER_NODE && Screen_Output)
-        cout << "The mesh is up-to-date. Using previously stored grid velocities." << endl;
-    }
-
-    /*--- Update the multigrid structure after moving the finest grid,
-     including computing the grid velocities on the coarser levels. ---*/
-
-    grid_movement->UpdateMultiGrid(geometry, config);
-  }
-
   if (config->GetSurface_Movement(EXTERNAL) || config->GetSurface_Movement(EXTERNAL_ROTATION)) {
     /*--- Apply rigid rotation to entire grid first, if necessary ---*/
 

SU2_CFD/src/iteration/CIterationFactory.cpp

@@ -112,7 +112,7 @@ CIteration* CIterationFactory::CreateIteration(ENUM_MAIN_SOLVER kindSolver, cons
       iteration = new CDiscAdjHeatIteration(config);
       break;
 
-    case NO_SOLVER: case FLUID_STRUCTURE_INTERACTION: case TEMPLATE_SOLVER: case MULTIPHYSICS:
+    case NO_SOLVER: case TEMPLATE_SOLVER: case MULTIPHYSICS:
       SU2_MPI::Error("No iteration found for specified solver.", CURRENT_FUNCTION);
       break;
   }