Skip to content

Commit

Permalink
update agglomeration
Browse files Browse the repository at this point in the history
  • Loading branch information
@bigfooted
bigfooted committed Nov 15, 2024
1 parent a47c0f4 commit f846cbb
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 90 deletions.
6 changes: 3 additions & 3 deletions Common/include/geometry/CMultiGridGeometry.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@

/*!
* \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.
Expand All @@ -49,7 +49,7 @@ class CMultiGridGeometry final : public CGeometry {
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.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/geometry/CMultiGridQueue.hpp
View file
Original file line number Diff 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
136 changes: 50 additions & 86 deletions Common/src/geometry/CMultiGridGeometry.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,13 @@
#include "../../../Common/include/toolboxes/geometry_toolbox.hpp"

CMultiGridGeometry::CMultiGridGeometry(CGeometry* fine_grid, CConfig* config, unsigned short iMesh) : CGeometry() {



nDim = fine_grid->GetnDim(); // Write the number of dimensions of the coarse grid.

/*--- Create a queue system to do the agglomeration
1st) More than two markers ---> Vertices (never agglomerate)
2nd) Two markers ---> Edges (agglomerate if same BC, never agglomerate if different BC)
3rd) One marker ---> Surface (always agglomarate)
4th) No marker ---> Internal Volume (always agglomarate) ---*/
3rd) One marker ---> Surface (always agglomerate)
4th) No marker ---> Internal Volume (always agglomerate) ---*/

/*--- Set a marker to indicate indirect agglomeration, for quads and hexs,
i.e. consider up to neighbors of neighbors of neighbors.
Expand Down Expand Up @@ -100,53 +97,46 @@ CMultiGridGeometry::CMultiGridGeometry(CGeometry* fine_grid, CConfig* config, un

/*--- For a particular point in the fine grid we save all the markers
that are in that point ---*/
//short counter2 = 1;

for (auto jMarker = 0u; jMarker < fine_grid->GetnMarker() && counter < 3; jMarker++) {
if (fine_grid->nodes->GetVertex(iPoint, jMarker) != -1) {
copy_marker[counter] = jMarker;
counter++;

if (jMarker != iMarker) {
marker_seed.push_back(jMarker);
//counter2++;
}

}
}

/*--- To agglomerate a vertex it must have only one physical bc!!
This can be improved. If there is only a marker, it is a good
candidate for agglomeration ---*/
/*--- Valley -> Interior : never
* Valley -> Valley : conditional
* Valley -> Ridge : never ---*/

/*--- Valley -> Valley : conditionally allowed when both points are on the same marker. ---*/
/*--- ! Note that in the case of MPI SEND_RECEIVE markers, we might need other conditions ---*/
if (counter == 1) {
agglomerate_seed = true;

/*--- Euler walls can be curved and agglomerating them leads to difficulties ---*/
//if (config->GetMarker_All_KindBC(marker_seed[0]) == EULER_WALL) agglomerate_seed = false;
//if (config->GetMarker_All_KindBC(marker_seed[0]) == EULER_WALL)
// agglomerate_seed = false;
}

/*--- If there are two markers, we will agglomerate if any of the
markers is SEND_RECEIVE ---*/
/*--- Ridge -> Interior : never
* Ridge -> Valley : never
* Ridge -> Ridge : conditional. Conditional means should be on the same marker. ---*/

if (counter == 2) {
agglomerate_seed = ((config->GetMarker_All_KindBC(copy_marker[0]) == SEND_RECEIVE) ||
(config->GetMarker_All_KindBC(copy_marker[1]) == SEND_RECEIVE)
||
(config->GetMarker_All_KindBC(copy_marker[0]) ==
config->GetMarker_All_KindBC(copy_marker[1])) );
//agglomerate_seed = (config->GetMarker_All_KindBC(copy_marker[0]) == SEND_RECEIVE) ||
// (config->GetMarker_All_KindBC(copy_marker[1]) == SEND_RECEIVE);

/* --- Euler walls can also not be agglomerated when the point has 2 markers ---*/
//if ((config->GetMarker_All_KindBC(copy_marker[0]) == EULER_WALL) ||
// (config->GetMarker_All_KindBC(copy_marker[1]) == EULER_WALL)) {
// agglomerate_seed = false;
agglomerate_seed = true;
//}

Check notice

Code scanning / CodeQL

Commented-out code Note

This comment appears to contain commented-out code.
}

/*--- Corner -> Any: never agglomerate ---*/
/*--- If there are more than 2 markers, the agglomeration will be discarded ---*/

if (counter > 2) agglomerate_seed = false;
Expand All @@ -157,7 +147,6 @@ CMultiGridGeometry::CMultiGridGeometry(CGeometry* fine_grid, CConfig* config, un
/*--- Now we do a sweep over all the nodes that surround the seed point ---*/

for (auto CVPoint : fine_grid->nodes->GetPoints(iPoint)) {

/*--- The new point can be agglomerated ---*/

if (SetBoundAgglomeration(CVPoint, marker_seed, fine_grid, config)) {
Expand Down Expand Up @@ -493,15 +482,18 @@ CMultiGridGeometry::CMultiGridGeometry(CGeometry* fine_grid, CConfig* config, un
SetGlobal_nPointDomain(Global_nPointCoarse);

if (iMesh != MESH_0) {
const su2double factor = 1.5;
//const su2double factor = 1.5; //nijso: too high
const su2double factor = 1.0;
const su2double Coeff = pow(su2double(Global_nPointFine) / Global_nPointCoarse, 1.0 / nDim);
const su2double CFL = factor * config->GetCFL(iMesh - 1) / Coeff;
config->SetCFL(iMesh, CFL);
}

const su2double ratio = su2double(Global_nPointFine) / su2double(Global_nPointCoarse);

if (((nDim == 2) && (ratio < 2.5)) || ((nDim == 3) && (ratio < 2.5))) {
//if (((nDim == 2) && (ratio < 2.5)) || ((nDim == 3) && (ratio < 2.5))) {
// nijso: too high for very small test meshes.
if (((nDim == 2) && (ratio < 2.0)) || ((nDim == 3) && (ratio < 2.0))) {
config->SetMGLevels(iMesh - 1);
} else if (rank == MASTER_NODE) {
PrintingToolbox::CTablePrinter MGTable(&std::cout);
Expand Down Expand Up @@ -535,11 +527,9 @@ bool CMultiGridGeometry::SetBoundAgglomeration(unsigned long CVPoint, vector<sho

if ((!fine_grid->nodes->GetAgglomerate(CVPoint)) && (fine_grid->nodes->GetDomain(CVPoint)) &&
(GeometricalCheck(CVPoint, fine_grid, config))) {

/*--- If the point belongs to a boundary, its type must be compatible with the seed marker. ---*/

if (fine_grid->nodes->GetBoundary(CVPoint)) {

/*--- Identify the markers of the vertex that we want to agglomerate ---*/

// count number of markers on the agglomeration candidate
Expand All @@ -552,87 +542,61 @@ bool CMultiGridGeometry::SetBoundAgglomeration(unsigned long CVPoint, vector<sho
}
}

//count again the markers on the seed
// for (auto jMarker = 0u; jMarker < fine_grid->GetnMarker() && counter < 3; jMarker++) {
// if (fine_grid->nodes->GetVertex(iPoint, jMarker) != -1) {
// copy_marker[counter] = jMarker;
// counter++;
// }
// }

/*--- The basic condition is that the agglomerated vertex must have the same physical marker,
but eventually a send-receive condition ---*/

/*--- Only one marker in the vertex that is going to be agglomerated ---*/
/*--- Ridge(2) -> Valley(1) : never
* Valley -> Valley(1) : conditional (should be same marker) ---*/
if ((counter == 1) && (marker_seed.size() == 1)) {

/*--- Valley -> Valley: only if of the same type---*/
if (counter == 1) {
/*--- We agglomerate if there is only one marker and it is the same marker as the seed marker ---*/
// note that this should be the same marker id, not just the same marker type
// !!!! note that when the seed has 2 markers, we have a problem.
if (copy_marker[0] == marker_seed[0]) agglomerate_CV = true;

if ((marker_seed.size()==1) && (copy_marker[0] == marker_seed[0])) agglomerate_CV = true;

/*--- If there is only one marker, but the marker is the SEND_RECEIVE ---*/
// Nijso: that means the child is an mpi interface in the interior -> do NOT agglomerate unless the
// marker of the seed is also SEND_RECEIVE
else if (config->GetMarker_All_KindBC(copy_marker[0]) == SEND_RECEIVE) {
//agglomerate_CV = true;
agglomerate_CV = false;
}

//if (config->GetMarker_All_KindBC(copy_marker[0]) == SEND_RECEIVE) {
// agglomerate_CV = true;
//}

Check notice

Code scanning / CodeQL

Commented-out code Note

This comment appears to contain commented-out code.

//if ((config->GetMarker_All_KindBC(marker_seed[0]) == SYMMETRY_PLANE) ||
// (config->GetMarker_All_KindBC(marker_seed[0]) == EULER_WALL)) {
// if (config->GetMarker_All_KindBC(copy_marker[0]) == SEND_RECEIVE) {
// agglomerate_CV = false;
// }
// if (config->GetMarker_All_KindBC(copy_marker[0]) == SEND_RECEIVE) {
// agglomerate_CV = false;
// }
//}

Check notice

Code scanning / CodeQL

Commented-out code Note

This comment appears to contain commented-out code.
}

/*--- If there are two markers in the vertex that is going to be agglomerated ---*/
/*--- ridge(2) -> ridge(2): conditionally allow (same marker)
* ridge -> valley : never (seed has 1 marker)
* ridge -> corner : never (seed has >2 marker )
*---*/
if ((counter == 2) && (marker_seed.size() == 2)) {
/*--- Ridge -> Ridge: only if of the same type (same marker ID) ---*/
if (counter == 2) {

// check if the seed also has 2 markers
if (marker_seed.size() == 2) {
// now check if the seed is on the same 2 marker ID's (note that if we allow that they are of the same
// marker type, we need to check that the alignement of the markers is correct as well. better not go there.)
if ( ((marker_seed[0] = copy_marker[0]) && (marker_seed[1] = copy_marker[1])) ||
((marker_seed[0] = copy_marker[1]) && (marker_seed[1] = copy_marker[0])) ) {
agglomerate_CV = true;
}
}
/*--- First we verify that the seed is a physical boundary ---*/

if (config->GetMarker_All_KindBC(marker_seed[0]) != SEND_RECEIVE) {
// if (config->GetMarker_All_KindBC(marker_seed[0]) != SEND_RECEIVE) {
// /*--- Then we check that one of the markers is equal to the seed marker, and the other is send/receive ---*/

/*--- Then we check that one of the markers is equal to the seed marker, and the other is send/receive ---*/

if (((copy_marker[0] == marker_seed[0]) && (config->GetMarker_All_KindBC(copy_marker[1]) == SEND_RECEIVE)) ||
((config->GetMarker_All_KindBC(copy_marker[0]) == SEND_RECEIVE) && (copy_marker[1] == marker_seed[0]))) {
agglomerate_CV = true;
}
else
/*--- check that ridges are equal on seed and on child ---*/
if ((config->GetMarker_All_KindBC(copy_marker[0]) == config->GetMarker_All_KindBC(copy_marker[1]))
&&
(config->GetMarker_All_KindBC(marker_seed[0]) == config->GetMarker_All_KindBC(marker_seed[1]))
) {
cout << "ridges can be agglomerated" << endl;
agglomerate_CV = true;
}
}
// if (((copy_marker[0] == marker_seed[0]) && (config->GetMarker_All_KindBC(copy_marker[1]) == SEND_RECEIVE)) ||
// ((config->GetMarker_All_KindBC(copy_marker[0]) == SEND_RECEIVE) && (copy_marker[1] == marker_seed[0]))) {
agglomerate_CV = false;
// agglomerate_CV = true;
// }
// }

Check notice

Code scanning / CodeQL

Commented-out code Note

This comment appears to contain commented-out code.
}
}
/*--- If the element belongs to the domain, it is always agglomerated. ---*/
/*--- any marker -> interior : never agglomerate ---*/
/*--- If the element belongs to the domain, it is never agglomerated. ---*/
/*--- Any -> Interior : disallowed ---*/
else {

// only agglomerate internal nodes with mpi nodes
//if (config->GetMarker_All_KindBC(marker_seed[0]) == SEND_RECEIVE)
// agglomerate_CV = true;
//else
agglomerate_CV = false;

// actually, for symmetry (and possibly other cells) we only agglomerate cells that are on the marker
// at this point, the seed was on the boundary and the CV was not. so we check if the seed is a symmetry
//if ((config->GetMarker_All_KindBC(marker_seed[0]) == SYMMETRY_PLANE) ||
// (config->GetMarker_All_KindBC(marker_seed[0]) == EULER_WALL)) {
// agglomerate_CV = false;
//}
}
}

Expand Down
1 change: 1 addition & 0 deletions SU2_CFD/src/solvers/CSolverFactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ CSolver* CSolverFactory::CreateSubSolver(SUB_SOLVER_TYPE kindSolver, CSolver **s
case SUB_SOLVER_TYPE::TURB_SST:
genericSolver = CreateTurbSolver(kindTurbModel, solver, geometry, config, iMGLevel, false);
metaData.integrationType = INTEGRATION_TYPE::SINGLEGRID;
//metaData.integrationType = INTEGRATION_TYPE::MULTIGRID;

Check notice

Code scanning / CodeQL

Commented-out code Note

This comment appears to contain commented-out code.
break;
case SUB_SOLVER_TYPE::TEMPLATE:
genericSolver = new CTemplateSolver(geometry, config);
Expand Down

0 comments on commit f846cbb

Please sign in to comment.