Cleanup and document the multigrid agglomeration strategy #1372
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request fixes 7 alerts when merging cb9fce3 into 5ce84cc - view on LGTM.com fixed alerts:
|
|
This pull request fixes 7 alerts when merging c4f27dc into 6338bff - view on LGTM.com fixed alerts:
|
WallyMaier
approved these changes
Oct 1, 2021
TobiKattmann
reviewed
Oct 4, 2021
| @@ -264,7 +263,7 @@ class CGeometry { | |||
| /*! | |||
| * \brief Constructor of the class. | |||
| */ | |||
| CGeometry(void); | |||
There was a problem hiding this comment.
Fun Fact, there are 1475 (void) in SU2_CFD and Common ... We/I could make them go extinct (if we are ok with some possible minor merge conflicts in other peoples PR's )
| */ | ||
| CMultiGridGeometry(CGeometry **geometry, CConfig *config_container, unsigned short iMesh); | ||
|
|
||
| private: |
There was a problem hiding this comment.
👍 looks like all methods were public before
|
|
||
| /*! | ||
| * \brief Determine if a 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, CGeometry *fine_grid, CConfig *config); | ||
| bool GeometricalCheck(unsigned long iPoint, const CGeometry *fine_grid, const CConfig *config) const; |
There was a problem hiding this comment.
Maybe with that amount of changes clang-format could have been a thing. (Again pointer-Alignment is the rat here)
Comment on lines
-43
to
-60
| unsigned long iPoint, Index_CoarseCV, iElem, iVertex, iteration, nVertexS, nVertexR, | ||
| nBufferS_Vector, nBufferR_Vector, iParent, jVertex,Local_nPointCoarse, Local_nPointFine, Global_nPointCoarse, Global_nPointFine, | ||
| *Buffer_Receive_Parent = nullptr, *Buffer_Send_Parent = nullptr, *Buffer_Receive_Children = nullptr, *Buffer_Send_Children = nullptr, | ||
| *Parent_Remote = nullptr, *Children_Remote = nullptr, *Parent_Local = nullptr, *Children_Local = nullptr; | ||
| short marker_seed; | ||
| bool agglomerate_seed = true; | ||
| unsigned short nChildren, iNode, counter, iMarker, jMarker, priority, MarkerS, MarkerR, *nChildren_MPI; | ||
| vector<unsigned long> Suitable_Indirect_Neighbors, Aux_Parent; | ||
| vector<unsigned long>::iterator it; | ||
|
|
||
| unsigned short nMarker_Max = config->GetnMarker_Max(); | ||
|
|
||
| unsigned short *copy_marker = new unsigned short [nMarker_Max]; | ||
|
|
||
| #ifdef HAVE_MPI | ||
| int send_to, receive_from; | ||
| SU2_MPI::Status status; | ||
| #endif |
| // unsigned long iPointFree = nPointDomain-1; | ||
| // iCoarsePoint = 0; | ||
| // | ||
| // do { |
There was a problem hiding this comment.
haven't seen a do - while in quite some time.
Good to get rid of those commented code blocks
Comment on lines
+1083
to
+1087
| wall_temperature.fine_grid = fine_grid; | ||
| wall_temperature.marker = val_marker; | ||
| wall_temperature.target = CustomBoundaryTemperature[val_marker]; | ||
|
|
||
| SetMultiGridWallQuantity(fine_grid, val_marker, wall_temperature); |
There was a problem hiding this comment.
Nice cut-paste-specialize
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
In trying to understand the algorithm a little better I also tried to improve the documentation and clean up some redundancy.
PR Checklist