Skip to content
Snippets Groups Projects
Commit 93a3106e authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

better safeguards in getExternalData

parent 498428f7
No related branches found
No related tags found
No related merge requests found
...@@ -697,7 +697,6 @@ bool PViewDataGModel::skipElement(int step, int ent, int ele, bool checkVisibili ...@@ -697,7 +697,6 @@ bool PViewDataGModel::skipElement(int step, int ent, int ele, bool checkVisibili
stepData<double> *sd = _steps[step]; stepData<double> *sd = _steps[step];
if(!_steps[step]->getNumData()) return true; if(!_steps[step]->getNumData()) return true;
MElement *e = _getElement(step, ent, ele); MElement *e = _getElement(step, ent, ele);
if(!e) return true;
if(checkVisibility && !e->getVisibility()) return true; if(checkVisibility && !e->getVisibility()) return true;
if(_type == NodeData){ if(_type == NodeData){
for(int i = 0; i < getNumNodes(step, ent, ele); i++) for(int i = 0; i < getNumNodes(step, ent, ele); i++)
......
...@@ -120,7 +120,9 @@ static bool getExternalValues(PView *p, int index, int ient, int iele, ...@@ -120,7 +120,9 @@ static bool getExternalValues(PView *p, int index, int ient, int iele,
if(index < 0 || index >= (int)PView::list.size()) return false; if(index < 0 || index >= (int)PView::list.size()) return false;
PView *p2 = PView::list[index]; PView *p2 = PView::list[index];
PViewData *data2 = p2->getData(); PViewData *data2 = p2->getData(true); // use adaptive data if available
if(iele >= data2->getNumElements(opt->timeStep, ient)) return false;
if(!data2->skipElement(opt->timeStep, ient, iele) && if(!data2->skipElement(opt->timeStep, ient, iele) &&
data2->getNumNodes(opt->timeStep, ient, iele) == numNodes){ data2->getNumNodes(opt->timeStep, ient, iele) == numNodes){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment