Fix multigrid agglomeration #2712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

bigfooted wants to merge 52 commits into develop from fix_MG_part_1

+1,082 −505

Common/include/CConfig.hpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -488,7 +488,7 @@ class CConfig {
  
      unsigned short **DegreeFFDBox;      /*!< \brief Degree of the FFD boxes. */

      string *FFDTag;                     /*!< \brief Parameters of the design variable. */

      string *TagFFDBox;                  /*!< \brief Tag of the FFD box. */

      unsigned short GeometryMode;        /*!< \brief Gemoetry mode (analysis or gradient computation). */

      unsigned short GeometryMode;        /*!< \brief Geometry mode (analysis or gradient computation). */

      unsigned short MGCycle;             /*!< \brief Kind of multigrid cycle. */

      unsigned short FinestMesh;          /*!< \brief Finest mesh for the full multigrid approach. */

      unsigned short nFFD_Fix_IDir,

    @@ -2912,7 +2912,7 @@ class CConfig {
  
      unsigned short GetFinestMesh(void) const { return FinestMesh; }

      /*!

       * \brief Get the kind of multigrid (V or W).

       * \brief Get the kind of multigrid (V, W or FULLMG).

       * \note This variable is used in a recursive way to perform the different kind of cycles

       * \return 0 or 1 depending of we are dealing with a V or W cycle.

       */

Common/include/geometry/CMultiGridGeometry.hpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,36 +28,37 @@ @@
     #pragma once
     #include "CGeometry.hpp"
+    class CMultiGridQueue;
     /*!
      * \class CMultiGridGeometry
-     * \brief Class for defining the multigrid geometry, the main delicated part is the
+     * \brief Class for defining the multigrid geometry, the main delegated part is the
      *        agglomeration stage, which is done in the declaration.
      * \author F. Palacios
      */
     class CMultiGridGeometry final : public CGeometry {
      private:
       /*!
-       * \brief Determine if a CVPoint van be agglomerated, if it have the same marker point as the seed.
+       * \brief Determine if a CVPoint can be agglomerated, if it has the same marker point as the seed.
        * \param[in] CVPoint - Control volume to be agglomerated.
        * \param[in] marker_seed - Marker of the seed.
        * \param[in] fine_grid - Geometrical definition of the problem.
        * \param[in] config - Definition of the particular problem.
        * \return <code>TRUE</code> or <code>FALSE</code> depending if the control volume can be agglomerated.
        */
-      bool SetBoundAgglomeration(unsigned long CVPoint, short marker_seed, const CGeometry* fine_grid,
+      bool SetBoundAgglomeration(unsigned long CVPoint, vector<short> marker_seed, const CGeometry* fine_grid,
                                  const CConfig* config) const;
       /*!
-       * \brief Determine if a can be agglomerated using geometrical criteria.
+       * \brief Determine if a Point can be agglomerated using geometrical criteria.
        * \param[in] iPoint - Seed point.
        * \param[in] fine_grid - Geometrical definition of the problem.
        * \param[in] config - Definition of the particular problem.
        */
       bool GeometricalCheck(unsigned long iPoint, const CGeometry* fine_grid, const CConfig* config) const;
       /*!
-       * \brief Determine if a CVPoint van be agglomerated, if it have the same marker point as the seed.
+       * \brief Determine if a CVPoint can be agglomerated, if it has the same marker point as the seed.
        * \param[out] Suitable_Indirect_Neighbors - List of Indirect Neighbours that can be agglomerated.
        * \param[in] iPoint - Seed point.
        * \param[in] Index_CoarseCV - Index of agglomerated point.
@@ Expand All / @@ -66,6 +67,15 @@ class CMultiGridGeometry final : public CGeometry { @@
       void SetSuitableNeighbors(vector<unsigned long>& Suitable_Indirect_Neighbors, unsigned long iPoint,
                                 unsigned long Index_CoarseCV, const CGeometry* fine_grid) const;
+      /*!
+       * \brief Compute local curvature at a boundary vertex on Euler wall.
+       * \param[in] fine_grid - Fine grid geometry.
+       * \param[in] iPoint - Point index.
+       * \param[in] iMarker - Marker index.
+       * \return Maximum angle (in degrees) between this vertex normal and adjacent vertex normals.
+       */
+      su2double ComputeLocalCurvature(const CGeometry* fine_grid, unsigned long iPoint, unsigned short iMarker) const;
      public:
       /*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
       using CGeometry::SetBoundControlVolume;
@@ Expand Down @@

Common/include/geometry/CMultiGridQueue.hpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -93,7 +93,7 @@ class CMultiGridQueue { @@
       void IncrPriorityCV(unsigned long incrPoint);
       /*!
-       * \brief Increase the priority of the CV.
+       * \brief Reduce the priority of the CV.
        * \param[in] redPoint - Index of the control volume.
        */
       void RedPriorityCV(unsigned long redPoint);
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix multigrid agglomeration #2712

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Fix multigrid agglomeration #2712

Are you sure you want to change the base?

Fix multigrid agglomeration #2712

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!