Multiphysics interpolation new features and improvements

Common/include/CConfig.hpp

@@ -605,16 +605,17 @@ class CConfig {
   su2double Min_Beta_RoeTurkel,     /*!< \brief Minimum value of Beta for the Roe-Turkel low Mach preconditioner. */
   Max_Beta_RoeTurkel;               /*!< \brief Maximum value of Beta for the Roe-Turkel low Mach preconditioner. */
   unsigned long GridDef_Nonlinear_Iter;  /*!< \brief Number of nonlinear increments for grid deformation. */
-  unsigned short Deform_Stiffness_Type;  /*!< \brief Type of element stiffness imposed for FEA mesh deformation. */
+  unsigned short Deform_StiffnessType;   /*!< \brief Type of element stiffness imposed for FEA mesh deformation. */
   bool Deform_Mesh;                      /*!< \brief Determines whether the mesh will be deformed. */
   bool Deform_Output;                    /*!< \brief Print the residuals during mesh deformation to the console. */
   su2double Deform_Tol_Factor;       /*!< \brief Factor to multiply smallest volume for deform tolerance (0.001 default) */
   su2double Deform_Coeff;            /*!< \brief Deform coeffienct */
   su2double Deform_Limit;            /*!< \brief Deform limit */
   unsigned short FFD_Continuity;     /*!< \brief Surface continuity at the intersection with the FFD */
   unsigned short FFD_CoordSystem;    /*!< \brief Define the coordinates system */
-  su2double Deform_ElasticityMod,
-  Deform_PoissonRatio;               /*!< \brief Young's Modulus and poisson ratio for volume deformation stiffness model */
+  su2double Deform_ElasticityMod,    /*!< \brief Young's modulus for volume deformation stiffness model */
+  Deform_PoissonRatio,               /*!< \brief Poisson's ratio for volume deformation stiffness model */
+  Deform_StiffLayerSize;             /*!< \brief Size of the layer of highest stiffness for wall distance-based mesh stiffness */
   bool Visualize_Surface_Def;        /*!< \brief Flag to visualize the surface deformacion in SU2_DEF. */
   bool Visualize_Volume_Def;         /*!< \brief Flag to visualize the volume deformation in SU2_DEF. */
   bool FFD_Symmetry_Plane;           /*!< \brief FFD symmetry plane. */
@@ -988,9 +989,11 @@ class CConfig {
   unsigned short Pred_Order;              /*!< \brief Order of the predictor for FSI applications. */
   unsigned short Kind_Interpolation;         /*!< \brief type of interpolation to use for FSI applications. */
   bool ConservativeInterpolation;            /*!< \brief Conservative approach for non matching mesh interpolation. */
+  unsigned short NumNearestNeighbors;        /*!< \brief Number of neighbors used for Nearest Neighbor interpolation. */
   unsigned short Kind_RadialBasisFunction;   /*!< \brief type of radial basis function to use for radial basis FSI. */
   bool RadialBasisFunction_PolynomialOption; /*!< \brief Option of whether to include polynomial terms in Radial Basis Function Interpolation or not. */
-  su2double RadialBasisFunction_Parameter;   /*!< \brief Radial basis function parameter. */
+  su2double RadialBasisFunction_Parameter;   /*!< \brief Radial basis function parameter (radius). */
+  su2double RadialBasisFunction_PruneTol;    /*!< \brief Tolerance to prune the RBF interpolation matrix. */
   bool Prestretch;                           /*!< \brief Read a reference geometry for optimization purposes. */
   string Prestretch_FEMFileName;             /*!< \brief File name for reference geometry. */
   string FEA_FileName;              /*!< \brief File name for element-based properties. */
@@ -3460,27 +3463,27 @@ class CConfig {
   unsigned short GetMarker_All_ZoneInterface(unsigned short val_marker) const { return Marker_All_ZoneInterface[val_marker]; }
 
   /*!
-     * \brief Get the MixingPlane interface information for a marker <i>val_marker</i>.
-     * \param[in] val_marker value of the marker on the grid.
-     * \return 0 if is not part of the MixingPlane Interface and greater than 1 if it is part.
-     */
+   * \brief Get the MixingPlane interface information for a marker <i>val_marker</i>.
+   * \param[in] val_marker value of the marker on the grid.
+   * \return 0 if is not part of the MixingPlane Interface and greater than 1 if it is part.
+   */
   unsigned short GetMarker_All_MixingPlaneInterface(unsigned short val_marker) const { return Marker_All_MixingPlaneInterface[val_marker]; }
 
-    /*!
-     * \brief Get the Turbomachinery information for a marker <i>val_marker</i>.
-     * \param[in] val_marker value of the marker on the grid.
-     * \return 0 if is not part of the Turbomachinery and greater than 1 if it is part.
-     */
+  /*!
+   * \brief Get the Turbomachinery information for a marker <i>val_marker</i>.
+   * \param[in] val_marker value of the marker on the grid.
+   * \return 0 if is not part of the Turbomachinery and greater than 1 if it is part.
+   */
   unsigned short GetMarker_All_Turbomachinery(unsigned short val_marker) const { return Marker_All_Turbomachinery[val_marker]; }
 
-    /*!
-     * \brief Get the Turbomachinery flag information for a marker <i>val_marker</i>.
-     * \param[in] val_marker value of the marker on the grid.
-     * \return 0 if is not part of the Turbomachinery, flag INFLOW or OUTFLOW if it is part.
-     */
+  /*!
+   * \brief Get the Turbomachinery flag information for a marker <i>val_marker</i>.
+   * \param[in] val_marker value of the marker on the grid.
+   * \return 0 if is not part of the Turbomachinery, flag INFLOW or OUTFLOW if it is part.
+   */
   unsigned short GetMarker_All_TurbomachineryFlag(unsigned short val_marker) const { return Marker_All_TurbomachineryFlag[val_marker]; }
 
-    /*!
+  /*!
    * \brief Get the number of FSI interface markers <i>val_marker</i>.
    * \param[in] void.
    * \return Number of markers belonging to the FSI interface.
@@ -4103,7 +4106,12 @@ class CConfig {
    * \brief Get the type of stiffness to impose for FEA mesh deformation.
    * \return type of stiffness to impose for FEA mesh deformation.
    */
-  unsigned short GetDeform_Stiffness_Type(void) const { return Deform_Stiffness_Type; }
+  unsigned short GetDeform_Stiffness_Type(void) const { return Deform_StiffnessType; }
+
+  /*!
+   * \brief Get the size of the layer of highest stiffness for wall distance-based mesh stiffness.
+   */
+  su2double GetDeform_StiffLayerSize(void) const { return Deform_StiffLayerSize; }
 
   /*!
    * \brief Creates a tecplot file to visualize the volume deformation deformation made by the DEF software.
@@ -8787,6 +8795,16 @@ class CConfig {
    */
   su2double GetRadialBasisFunctionParameter(void) const { return RadialBasisFunction_Parameter; }
 
+  /*!
+   * \brief Get the tolerance used to prune the interpolation matrix (making it sparser).
+   */
+  su2double GetRadialBasisFunctionPruneTol(void) const { return RadialBasisFunction_PruneTol; }
+
+  /*!
+   * \brief Get the number of donor points to use in Nearest Neighbor interpolation.
+   */
+  unsigned short GetNumNearestNeighbors(void) const { return NumNearestNeighbors; }
+
   /*!
    * \brief Get the kind of inlet face interpolation function to use.
    */

Common/include/geometry/dual_grid/CVertex.hpp

@@ -37,26 +37,23 @@
  */
 class CVertex : public CDualGrid {
 protected:
-  unsigned long *Nodes; /*!< \brief Vector to store the global nodes of an element. */
-  su2double *Normal;      /*!< \brief Normal coordinates of the element and its center of gravity. */
-  su2double Aux_Var;      /*!< \brief Auxiliar variable defined only on the surface. */
-  su2double CartCoord[3];   /*!< \brief Vertex cartesians coordinates. */
-  su2double VarCoord[3];    /*!< \brief Used for storing the coordinate variation due to a surface modification. */
-  su2double *VarRot;   /*!< \brief Used for storing the rotation variation due to a surface modification. */
-  long PeriodicPoint[5];      /*!< \brief Store the periodic point of a boundary (iProcessor, iPoint) */
-  bool ActDisk_Perimeter;     /*!< \brief Identify nodes at the perimeter of the actuator disk */
-  short Rotation_Type;      /*!< \brief Type of rotation associated with the vertex (MPI and periodic) */
+  unsigned long Nodes[1];        /*!< \brief Vector to store the global nodes of an element. */
+  su2double Normal[3];           /*!< \brief Normal coordinates of the element and its center of gravity. */
+  su2double Aux_Var;             /*!< \brief Auxiliar variable defined only on the surface. */
+  su2double CartCoord[3];        /*!< \brief Vertex cartesians coordinates. */
+  su2double VarCoord[3];         /*!< \brief Used for storing the coordinate variation due to a surface modification. */
+  su2double *VarRot;             /*!< \brief Used for storing the rotation variation due to a surface modification. */
+  long PeriodicPoint[5];         /*!< \brief Store the periodic point of a boundary (iProcessor, iPoint) */
+  bool ActDisk_Perimeter;        /*!< \brief Identify nodes at the perimeter of the actuator disk */
+  short Rotation_Type;           /*!< \brief Type of rotation associated with the vertex (MPI and periodic) */
   unsigned long Normal_Neighbor; /*!< \brief Index of the closest neighbor. */
-  unsigned long *Donor_Points; /*!< \brief indices of donor points for interpolation across zones */
-  unsigned long *Donor_Proc; /*!< \brief indices of donor processor for interpolation across zones in parallel */
-  unsigned long Donor_Elem;   /*!< \brief Store the donor element for interpolation across zones/ */
-  unsigned short Donor_Face;  /*!<\brief Store the donor face (w/in donor element) for interpolation across zones */
-  su2double Basis_Function[3]; /*!< \brief Basis function values for interpolation across zones. */
-  su2double *Donor_Coeff; /*!\brief Store a list of coefficients corresponding to the donor points. */
-  unsigned short nDonor_Points; /*!\brief Number of points in Donor_Points; at least there will be one donor point (if the mesh is matching)*/
+  unsigned long *Donor_Points;   /*!< \brief indices of donor points for interpolation across zones */
+  unsigned long *Donor_Proc;     /*!< \brief indices of donor processor for interpolation across zones in parallel */
+  su2double Basis_Function[3];   /*!< \brief Basis function values for interpolation across zones. */
+  su2double *Donor_Coeff;        /*!< \brief Store a list of coefficients corresponding to the donor points. */
+  unsigned short nDonor_Points;  /*!< \brief Number of points in Donor_Coeff. */
 
 public:
-
   /*!
    * \brief Constructor of the class.
    * \param[in] val_point - Node of the vertex.
@@ -113,6 +110,11 @@ class CVertex : public CDualGrid {
    */
   inline su2double *GetNormal(void) override { return Normal; }
 
+  /*!
+   * \brief Get the ith component of the normal.
+   */
+  inline su2double GetNormal(unsigned short iDim) const { return Normal[iDim]; }
+
   /*!
    * \brief Initialize normal vector.
    */
@@ -308,30 +310,6 @@ class CVertex : public CDualGrid {
    */
   inline bool GetActDisk_Perimeter(void) const { return ActDisk_Perimeter; }
 
-  /*!
-   * \brief Set the donor element of a vertex for interpolation across zones.
-   * \param[in] val_donorelem - donor element index.
-   */
-  inline void SetDonorElem(long val_donorelem) { Donor_Elem = val_donorelem; }
-
-  /*!
-   * \brief Get the donor element of a vertex for interpolation across zones.
-   * \return Value of the donor element of a vertex.
-   */
-  inline long GetDonorElem(void) const { return Donor_Elem; }
-
-  /*!
-   * \brief Set the donor face of a vertex for interpolation across zones.
-   * \param[in] val_donorface- donor face index (w/in donor elem).
-   */
-  inline void SetDonorFace(unsigned short val_donorface) { Donor_Face = val_donorface; }
-
-  /*!
-   * \brief Get the donor face of a vertex for interpolation across zones.
-   * \return Value of the donor face index (w/in donor elem).
-   */
-  inline unsigned short GetDonorFace(void) const { return Donor_Face; }
-
   /*!
    * \brief Set the finite element basis functions needed for interpolation.
    * \param[in] val_node - a node index of the owner element.
@@ -358,17 +336,6 @@ class CVertex : public CDualGrid {
    */
   inline unsigned long GetNormal_Neighbor(void) const { return Normal_Neighbor; }
 
-  /*!
-   * \brief Increment the number of donor points by 1.
-   */
-  inline void IncrementnDonor(void) {nDonor_Points++;}
-
-  /*!
-   * \brief Set the value of nDonor_Points
-   * \param[in] nDonor - the number of donor points
-   */
-  inline void SetnDonorPoints(unsigned short nDonor) {nDonor_Points = nDonor;}
-
   /*!
    * \brief Return the value of nDonor_Points
    * \return nDonor - the number of donor points
@@ -419,9 +386,9 @@ class CVertex : public CDualGrid {
 
   /*!
    * \brief Allocate memory based on how many donor points need to be stored.
-   * Uses nDonor_Points
+   * \param[in] nDonor - the number of donor points
    */
-  void Allocate_DonorInfo(void);
+  void Allocate_DonorInfo(unsigned short nDonor);
 
   /*!
    * \brief Get the rotation variation

Common/include/geometry/elements/CElement.hpp

@@ -7,7 +7,7 @@
  *
  * SU2 Project Website: https://su2code.github.io
  *
- * The SU2 Project is maintained by the SU2 Foundation 
+ * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
  * Copyright 2012-2020, SU2 Contributors (cf. AUTHORS.md)
@@ -627,6 +627,26 @@ class CQUAD4 final : public CElementWithKnownSizes<4,4,2> {
    */
   CQUAD4();
 
+  /*!
+   * \brief Shape functions (Ni) evaluated at point Xi,Eta.
+   */
+  inline static void ShapeFunctions(su2double Xi, su2double Eta, su2double* Ni) {
+    Ni[0] = 0.25*(1.0-Xi)*(1.0-Eta);
+    Ni[1] = 0.25*(1.0+Xi)*(1.0-Eta);
+    Ni[2] = 0.25*(1.0+Xi)*(1.0+Eta);
+    Ni[3] = 0.25*(1.0-Xi)*(1.0+Eta);
+  }
+
+  /*!
+   * \brief Shape function Jacobian (dNi) evaluated at point Xi,Eta.
+   */
+  inline static void ShapeFunctionJacobian(su2double Xi, su2double Eta, su2double dNi[][2]) {
+    dNi[0][0] = -0.25*(1.0-Eta);  dNi[0][1] = -0.25*(1.0-Xi);
+    dNi[1][0] =  0.25*(1.0-Eta);  dNi[1][1] = -0.25*(1.0+Xi);
+    dNi[2][0] =  0.25*(1.0+Eta);  dNi[2][1] =  0.25*(1.0+Xi);
+    dNi[3][0] = -0.25*(1.0+Eta);  dNi[3][1] =  0.25*(1.0-Xi);
+  }
+
   /*!
    * \brief Compute the value of the area of the element.
    * \param[in] mode - Type of coordinates to consider in the computation.