Velocity transfer at fluid-structure interface

Common/include/option_structure.hpp

@@ -2119,7 +2119,6 @@ enum MPI_QUANTITIES {
   MESH_DISPLACEMENTS   ,  /*!< \brief Mesh displacements at the interface. */
   SOLUTION_TIME_N      ,  /*!< \brief Solution at time n. */
   SOLUTION_TIME_N1     ,  /*!< \brief Solution at time n-1. */
-  PRIMITIVE               /*!< \brief Primitive solution communication. */
 };
 
 /*!

SU2_CFD/include/solvers/CFEASolver.hpp

@@ -361,48 +361,40 @@ class CFEASolver : public CSolver {
   /*!
    * \brief Clamped boundary conditions.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   void BC_Clamped(CGeometry *geometry,
-                  CNumerics *numerics,
                   const CConfig *config,
                   unsigned short val_marker) final;
 
   /*!
    * \brief Enforce the solution to be 0 in the clamped nodes - Avoids accumulation of numerical error.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   void BC_Clamped_Post(CGeometry *geometry,
-                       CNumerics *numerics,
                        const CConfig *config,
                        unsigned short val_marker) final;
 
   /*!
    * \brief Symmetry boundary conditions.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   void BC_Sym_Plane(CGeometry *geometry,
-                    CNumerics *numerics,
                     const CConfig *config,
                     unsigned short val_marker) final;
 
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   void BC_DispDir(CGeometry *geometry,
-                  CNumerics *numerics,
                   const CConfig *config,
                   unsigned short val_marker) final;
 
@@ -414,58 +406,39 @@ class CFEASolver : public CSolver {
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   void BC_Normal_Load(CGeometry *geometry,
-                      CNumerics *numerics,
                       const CConfig *config,
                       unsigned short val_marker) final;
 
   /*!
    * \brief Impose a load boundary condition in cartesian coordinates.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   void BC_Dir_Load(CGeometry *geometry,
-                   CNumerics *numerics,
                    const CConfig *config,
                    unsigned short val_marker) final;
 
   /*!
    * \brief Impose a sine-wave load boundary condition in cartesian coordinates.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   inline void BC_Sine_Load(CGeometry *geometry,
-                           CNumerics *numerics,
                            const CConfig *config,
                            unsigned short val_marker) final { }
 
   /*!
    * \brief Impose a damping load.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   void BC_Damper(CGeometry *geometry,
-                 CNumerics *numerics,
                  const CConfig *config,
                  unsigned short val_marker) final;
 
-  /*!
-   * \brief Deformable boundary condition.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_marker - Surface marker where the boundary condition is applied.
-   */
-  void BC_Deforming(CGeometry *geometry,
-                    CNumerics *numerics,
-                    const CConfig *config,
-                    unsigned short val_marker) final;
-
   /*!
    * \brief Iterate using an implicit Newmark solver.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -681,7 +654,7 @@ class CFEASolver : public CSolver {
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Configuration of the problem.
    */
-  void PredictStruct_Displacement(CGeometry *geometry, CConfig *config) final;
+  void PredictStruct_Displacement(CGeometry *geometry, const CConfig *config) final;
 
   /*!
    * \brief Computation of Aitken's coefficient.
@@ -690,15 +663,15 @@ class CFEASolver : public CSolver {
    * \param[in] iOuterIter - Current outer iteration.
    */
   void ComputeAitken_Coefficient(CGeometry *geometry,
-                                 CConfig *config,
+                                 const CConfig *config,
                                  unsigned long iOuterIter) final;
 
   /*!
    * \brief Aitken's relaxation of the solution.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
    */
-  void SetAitken_Relaxation(CGeometry *geometry, CConfig *config) final;
+  void SetAitken_Relaxation(CGeometry *geometry, const CConfig *config) final;
 
   /*!
    * \brief Compute the penalty due to the stiffness increase

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

@@ -1781,7 +1781,7 @@ void CFVMFlowSolverBase<V, FlowRegime>::Pressure_Forces(const CGeometry* geometr
 
     RefTemp = Temperature_Inf;
     RefDensity = Density_Inf;
-    if (dynamic_grid) {
+    if (dynamic_grid && !config->GetFSI_Simulation()) {
       Mach2Vel = sqrt(Gamma * Gas_Constant * RefTemp);
       Mach_Motion = config->GetMach_Motion();
       RefVel2 = (Mach_Motion * Mach2Vel) * (Mach_Motion * Mach2Vel);

SU2_CFD/include/solvers/CMeshSolver.hpp

@@ -88,6 +88,14 @@ class CMeshSolver final : public CFEASolver {
    */
   void ComputeGridVelocity(CGeometry *geometry, CConfig *config);
 
+  /*!
+   * \brief Compute the grid velocity form the velocity at deformable boundary.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] numerics - Description of the numerical method.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void ComputeGridVelocity_FromBoundary(CGeometry **geometry, CNumerics **numerics, CConfig *config);
+
   /*!
    * \brief Update the coarse multigrid levels after the grid movement.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -99,8 +107,18 @@ class CMeshSolver final : public CFEASolver {
    * \brief Check the boundary vertex that are going to be moved.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
+   * \param[in] velocity_transfer - Boolean for deforming displacement or velocity
+   */
+  void SetBoundaryDisplacements(CGeometry *geometry, CConfig *config, bool velocity_transfer);
+
+  /*!
+   * \brief Apply forced displacement boundary conditions.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] val_marker - Index of the marker.
+   * \param[in] velocity - Boolean for deforming displacement or velocity.
    */
-  void SetBoundaryDisplacements(CGeometry *geometry, CNumerics *numerics, CConfig *config);
+  void BC_Deforming(CGeometry *geometry, const CConfig *config, unsigned short val_marker, bool velocity);
 
 public:
   /*!

SU2_CFD/include/solvers/CSolver.hpp

@@ -817,48 +817,40 @@ class CSolver {
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   inline virtual void BC_Clamped(CGeometry *geometry,
-                                 CNumerics *numerics,
                                  const CConfig *config,
                                  unsigned short val_marker) { }
 
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   inline virtual void BC_Clamped_Post(CGeometry *geometry,
-                                      CNumerics *numerics,
                                       const CConfig *config,
                                       unsigned short val_marker) { }
 
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   inline virtual void BC_Sym_Plane(CGeometry *geometry,
-                                   CNumerics *numerics,
                                    const CConfig *config,
                                    unsigned short val_marker) { }
 
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   inline virtual void BC_DispDir(CGeometry *geometry,
-                                 CNumerics *numerics,
                                  const CConfig *config,
                                  unsigned short val_marker) { }
 
@@ -877,64 +869,44 @@ class CSolver {
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   inline virtual void BC_Normal_Load(CGeometry *geometry,
-                                     CNumerics *numerics,
                                      const CConfig *config,
                                      unsigned short val_marker) { }
 
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   inline virtual void BC_Dir_Load(CGeometry *geometry,
-                                  CNumerics *numerics,
                                   const CConfig *config,
                                   unsigned short val_marker) { }
 
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
 
   inline virtual void BC_Sine_Load(CGeometry *geometry,
-                                   CNumerics *numerics,
                                    const CConfig *config,
                                    unsigned short val_marker) { }
 
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   inline virtual void BC_Damper(CGeometry *geometry,
-                                CNumerics *numerics,
                                 const CConfig *config,
                                 unsigned short val_marker) { }
 
-  /*!
-   * \brief A virtual member.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] numerics - Description of the numerical method.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_marker - Surface marker where the boundary condition is applied.
-   */
-  inline virtual void BC_Deforming(CGeometry *geometry,
-                                   CNumerics *numerics,
-                                   const CConfig *config,
-                                   unsigned short val_marker) { }
-
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -3440,7 +3412,7 @@ class CSolver {
    * \param[in] config - Definition of the problem.
    */
   inline virtual void PredictStruct_Displacement(CGeometry *geometry,
-                                                 CConfig *config) { }
+                                                 const CConfig *config) { }
 
   /*!
    * \brief A virtual member.
@@ -3449,7 +3421,7 @@ class CSolver {
    * \param[in] iOuterIter - Current outer iteration.
    */
   inline virtual void ComputeAitken_Coefficient(CGeometry *geometry,
-                                                CConfig *config,
+                                                const CConfig *config,
                                                 unsigned long iOuterIter) { }
 
   /*!
@@ -3458,7 +3430,7 @@ class CSolver {
    * \param[in] config - Definition of the particular problem.
    */
   inline virtual void SetAitken_Relaxation(CGeometry *geometry,
-                                           CConfig *config) { }
+                                           const CConfig *config) { }
 
   /*!
    * \brief Loads the solution from the restart file.

SU2_CFD/include/variables/CFEAVariable.hpp

@@ -53,6 +53,7 @@ class CFEAVariable : public CVariable {
 
   MatrixType Solution_Pred;         /*!< \brief Predictor of the solution for FSI purposes */
   MatrixType Solution_Pred_Old;     /*!< \brief Predictor of the solution at time n for FSI purposes */
+  MatrixType Solution_Vel_Pred;     /*!< \brief Predictor of the velocity solution for FSI purposes */
 
   MatrixType Reference_Geometry;    /*!< \brief Reference solution for optimization problems */
 
@@ -251,6 +252,13 @@ class CFEAVariable : public CVariable {
    */
   inline su2double *GetSolution_Accel_time_n(unsigned long iPoint) final { return Solution_Accel_time_n[iPoint]; }
 
+  /*!
+   * \brief Set the value of the solution velocity predictor.
+   */
+  inline void SetSolution_Vel_Pred(unsigned long iPoint) final {
+    for (unsigned long iVar = 0; iVar < nVar; iVar++) Solution_Vel_Pred(iPoint,iVar) = Solution_Vel(iPoint,iVar);
+  }
+
   /*!
    * \brief Set the value of the old solution.
    * \param[in] val_solution_pred - Pointer to the residual vector.
@@ -259,6 +267,12 @@ class CFEAVariable : public CVariable {
     for (unsigned long iVar = 0; iVar < nVar; iVar++) Solution_Pred(iPoint,iVar) = val_solution_pred[iVar];
   }
 
+  /*!
+   * \brief Get the velocity solution.
+   * \return Pointer to velocity solution vector.
+   */
+  inline const su2double *GetSolution_Vel_Pred(unsigned long iPoint) const final { return Solution_Vel_Pred[iPoint]; }
+
   /*!
    * \brief Get the solution at time n.
    * \return Pointer to the solution (at time n) vector.