From d5fff334b3d680af74e1135fcfe5f17a7f7e7c3d Mon Sep 17 00:00:00 2001
From: Laurent Stainier <laurent.stainier@ec-nantes.fr>
Date: Wed, 27 Apr 2011 14:41:04 +0000
Subject: [PATCH] Fixed bug which led to a memory crash when applying the
plugin to a view with sparse step numbers (in nonlinear transient analyses,
one typically saves results at regular time intervals, corresponding to
arbitrary time step numbers). Application of the plugin results in a view
with dense step numbering, which can still cause difficulties when combined
with another view on which this treatment has not been applied.
---
Plugin/MathEval.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Plugin/MathEval.cpp b/Plugin/MathEval.cpp
index 1fbcd6dfc8..8b1569f2f3 100644
--- a/Plugin/MathEval.cpp
+++ b/Plugin/MathEval.cpp
@@ -200,6 +200,7 @@ PView *GMSH_MathEvalPlugin::execute(PView *view)
for(int nod = 0; nod < numNodes; nod++) out->push_back(y[nod]);
for(int nod = 0; nod < numNodes; nod++) out->push_back(z[nod]);
for(int step = timeBeg; step < timeEnd; step++){
+ if(!data1->hasTimeStep(step)) continue;
int step2 = (otherTimeStep < 0) ? step : otherTimeStep;
for(int nod = 0; nod < numNodes; nod++){
std::vector<double> v(std::max(9, numComp), 0.);
@@ -227,8 +228,10 @@ PView *GMSH_MathEvalPlugin::execute(PView *view)
}
if(timeStep < 0){
- for(int i = firstNonEmptyStep; i < data1->getNumTimeSteps(); i++)
+ for(int i = firstNonEmptyStep; i < data1->getNumTimeSteps(); i++) {
+ if(!data1->hasTimeStep(i)) continue;
data2->Time.push_back(data1->getTime(i));
+ }
}
else
data2->Time.push_back(data1->getTime(timeStep));
--
GitLab