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

OptHOM : remove 2 invalid read

parent 465022b8
Branches
Tags
No related merge requests found
...@@ -81,6 +81,7 @@ CTX::CTX() ...@@ -81,6 +81,7 @@ CTX::CTX()
mesh.numSubEdges = 0; mesh.numSubEdges = 0;
mesh.colorCarousel = 0; mesh.colorCarousel = 0;
mesh.ignorePartBound = 0; mesh.ignorePartBound = 0;
mesh.saveTri = 1;
color.mesh.tangents = color.mesh.tetrahedron = color.mesh.triangle = 0; color.mesh.tangents = color.mesh.tetrahedron = color.mesh.triangle = 0;
color.mesh.prism = color.mesh.pyramid = color.mesh.hexahedron = 0; color.mesh.prism = color.mesh.pyramid = color.mesh.hexahedron = 0;
color.mesh.tangents = color.mesh.line = color.mesh.quadrangle = 0; color.mesh.tangents = color.mesh.line = color.mesh.quadrangle = 0;
......
...@@ -154,8 +154,9 @@ class polynomialBasis ...@@ -154,8 +154,9 @@ class polynomialBasis
double dfv[1256][3]; double dfv[1256][3];
dfm.resize (coefficients.size1(), coord.size1() * 3, false); dfm.resize (coefficients.size1(), coord.size1() * 3, false);
int ii = 0; int ii = 0;
int dimCoord = coord.size2();
for (int iPoint=0; iPoint< coord.size1(); iPoint++) { for (int iPoint=0; iPoint< coord.size1(); iPoint++) {
df(coord(iPoint,0), coord(iPoint, 1), coord(iPoint, 2), dfv); df(coord(iPoint,0), dimCoord > 1 ? coord(iPoint, 1) : 0., dimCoord > 2 ? coord(iPoint, 2) : 0., dfv);
for (int i = 0; i < coefficients.size1(); i++) { for (int i = 0; i < coefficients.size1(); i++) {
dfm(i, iPoint * 3 + 0) = dfv[i][0]; dfm(i, iPoint * 3 + 0) = dfv[i][0];
dfm(i, iPoint * 3 + 1) = dfv[i][1]; dfm(i, iPoint * 3 + 1) = dfv[i][1];
......
...@@ -297,9 +297,10 @@ void Mesh::distSqToStraight(std::vector<double> &dSq) ...@@ -297,9 +297,10 @@ void Mesh::distSqToStraight(std::vector<double> &dSq)
for (int i = 0; i < nV1; ++i) { for (int i = 0; i < nV1; ++i) {
sxyz[_el2V[iEl][i]] = _vert[_el2V[iEl][i]]->point(); sxyz[_el2V[iEl][i]] = _vert[_el2V[iEl][i]]->point();
} }
int dim = lagrange->points.size2();
for (int i = nV1; i < nV; ++i) { for (int i = nV1; i < nV; ++i) {
double f[256]; double f[256];
lagrange1->f(lagrange->points(i, 0), lagrange->points(i, 1), lagrange->points(i, 2), f); lagrange1->f(lagrange->points(i, 0), dim > 1 ? lagrange->points(i, 1) : 0., dim > 2 ? lagrange->points(i, 2) : 0., f);
for (int j = 0; j < nV1; ++j) for (int j = 0; j < nV1; ++j)
sxyz[_el2V[iEl][i]] += sxyz[_el2V[iEl][j]] * f[j]; sxyz[_el2V[iEl][i]] += sxyz[_el2V[iEl][j]] * f[j];
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment