research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[1D] Fixed infinite loops in grid refinement / pruning

Browse source 
Improved determination of the conditions under which points can be removed
without violating the 'ratio' constraint. Previously, required points were being
removed from the grid.
This commit is contained in:
Ray Speth 2013-03-05 17:02:56 +00:00
parent 68b129eb96
commit 3a53ae3660
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/oneD/refine.cpp
View file

@ -134,19 +134,37 @@ int Refiner::analyze(size_t n, const doublereal* z,
}
}
// Refine based on properties of the grid itself
for (size_t j = 1; j < n-1; j++) {
// Add a new point if the ratio with left interval is too large
if (dz[j] > m_ratio*dz[j-1]) {
m_loc[j] = 1;
m_c["point "+int2str(j)] = 1;
m_keep[j-1] = 1;
m_keep[j] = 1;
m_keep[j+1] = 1;
m_keep[j+2] = 1;
}
// Add a point if the ratio with right interval is too large
if (dz[j] < dz[j-1]/m_ratio) {
m_loc[j-1] = 1;
m_c["point "+int2str(j-1)] = 1;
m_keep[j-2] = 1;
m_keep[j-1] = 1;
m_keep[j] = 1;
m_keep[j+1] = 1;
}
if (j > 1 && z[j+1]-z[j] > m_ratio * dz[j-2]) {
// Keep the point if removing would make the ratio with the left
// interval too large.
if (j > 1 && z[j+1]-z[j-1] > m_ratio * dz[j-2]) {
m_keep[j] = 1;
}
if (j < n-2 && z[j+1]-z[j] > m_ratio * dz[j+1]) {
// Keep the point if removing would make the ratio with the right
// interval too large.
if (j < n-2 && z[j+1]-z[j-1] > m_ratio * dz[j+1]) {
m_keep[j] = 1;
}