Skip to content
Snippets Groups Projects
Commit 2bcacf23 authored by Jonathan Lambrechts's avatar Jonathan Lambrechts
Browse files

dg : oups, 2 bugs in the previous commit

parent e9522f01
No related branches found
No related tags found
No related merge requests found
...@@ -556,7 +556,7 @@ void dgGroupCollection::buildGroupsOfInterfaces() ...@@ -556,7 +556,7 @@ void dgGroupCollection::buildGroupsOfInterfaces()
if (!groupStart->isFullGhost(*this)) { if (!groupStart->isFullGhost(*this)) {
std::vector<dgMiniInterface> group(groupStart, groupEnd); std::vector<dgMiniInterface> group(groupStart, groupEnd);
if (groupStart->connections.size() == 1) { if (groupStart->connections.size() == 1) {
_boundaryGroups.push_back (new dgGroupOfFaces (*this, group, pOrder) ); _faceGroups.push_back (new dgGroupOfFaces (*this, group, pOrder) );
} else { } else {
_faceGroups.push_back (new dgGroupOfFaces (*this, group, pOrder) ); _faceGroups.push_back (new dgGroupOfFaces (*this, group, pOrder) );
} }
...@@ -1193,8 +1193,6 @@ dgGroupCollection::~dgGroupCollection() ...@@ -1193,8 +1193,6 @@ dgGroupCollection::~dgGroupCollection()
delete _elementGroups[i]; delete _elementGroups[i];
for (int i=0; i< _faceGroups.size(); i++) for (int i=0; i< _faceGroups.size(); i++)
delete _faceGroups[i]; delete _faceGroups[i];
for (int i=0; i< _boundaryGroups.size(); i++)
delete _boundaryGroups[i];
for (int i=0; i< _ghostGroups.size(); i++) for (int i=0; i< _ghostGroups.size(); i++)
delete _ghostGroups[i]; delete _ghostGroups[i];
} }
......
...@@ -219,7 +219,6 @@ class dgGroupCollection { ...@@ -219,7 +219,6 @@ class dgGroupCollection {
GModel *_model; GModel *_model;
std::vector<dgGroupOfElements*> _elementGroups; //volume std::vector<dgGroupOfElements*> _elementGroups; //volume
std::vector<dgGroupOfFaces*> _faceGroups; //interface std::vector<dgGroupOfFaces*> _faceGroups; //interface
std::vector<dgGroupOfFaces*> _boundaryGroups; //boundary
std::vector<dgGroupOfElements*> _ghostGroups; //ghost volume std::vector<dgGroupOfElements*> _ghostGroups; //ghost volume
//{group,id} of the elements to send to each partition for a scatter operation //{group,id} of the elements to send to each partition for a scatter operation
......
...@@ -112,8 +112,10 @@ dgRungeKuttaMultirate::dgRungeKuttaMultirate(dgGroupCollection* gc,dgConservatio ...@@ -112,8 +112,10 @@ dgRungeKuttaMultirate::dgRungeKuttaMultirate(dgGroupCollection* gc,dgConservatio
} }
for(int iGroup=0;iGroup<gc->getNbFaceGroups();iGroup++){ for(int iGroup=0;iGroup<gc->getNbFaceGroups();iGroup++){
dgGroupOfFaces *gf=gc->getFaceGroup(iGroup); dgGroupOfFaces *gf=gc->getFaceGroup(iGroup);
/*if(gf->getNbGroupOfConnections()!=2)
continue;*/
for(int i=0;i<gf->getNbGroupOfConnections();i++){ for(int i=0;i<gf->getNbGroupOfConnections();i++){
const dgGroupOfElements *ge = &gf->getGroupOfConnections(0).getGroupOfElements(); const dgGroupOfElements *ge = &gf->getGroupOfConnections(i).getGroupOfElements();
if(ge->getIsInnerMultirateBuffer()){ if(ge->getIsInnerMultirateBuffer()){
_innerBufferGroupsOfElements[ge->getMultirateExponent()].second.push_back(gf); _innerBufferGroupsOfElements[ge->getMultirateExponent()].second.push_back(gf);
} }
...@@ -124,6 +126,23 @@ dgRungeKuttaMultirate::dgRungeKuttaMultirate(dgGroupCollection* gc,dgConservatio ...@@ -124,6 +126,23 @@ dgRungeKuttaMultirate::dgRungeKuttaMultirate(dgGroupCollection* gc,dgConservatio
} }
} }
} }
/*for(int iGroup=0;iGroup<gc->getNbFaceGroups();iGroup++){
dgGroupOfFaces *gf=gc->getFaceGroup(iGroup);
if(gf->getNbGroupOfConnections()!=1)
continue;
const dgGroupOfElements *ge[1];
ge[0]=&gf->getGroupOfConnections(0).getGroupOfElements();
for(int i=0;i<1;i++){
if(ge[i]->getIsInnerMultirateBuffer()){
_innerBufferGroupsOfElements[ge[i]->getMultirateExponent()].second.push_back(gf);
}
else if(ge[i]->getIsOuterMultirateBuffer()){
_outerBufferGroupsOfElements[ge[i]->getMultirateExponent()].second.push_back(gf);
}else{
_bulkGroupsOfElements[ge[i]->getMultirateExponent()].second.push_back(gf);
}
}
}*/
// Removing duplicate entries // Removing duplicate entries
for(int iExp=0;iExp<=_maxExponent;iExp++){ for(int iExp=0;iExp<=_maxExponent;iExp++){
std::vector<dgGroupOfFaces*>*v[3]; std::vector<dgGroupOfFaces*>*v[3];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment