Skip to content
Snippets Groups Projects
Commit 708d1ff8 authored by Gauthier Becker's avatar Gauthier Becker
Browse files

Fix bugs

Fragmentation in progress
parent 4961ef50
No related branches found
No related tags found
No related merge requests found
......@@ -166,7 +166,7 @@ double MElement::getVolume()
double vol = 0.;
for (int i = 0; i < npts; i++){
vol += getJacobianDeterminant(pts[i].pt[0], pts[i].pt[1], pts[i].pt[2])
* pts[i].weight;
* pts[i].weight;
}
return vol;
}
......@@ -547,19 +547,19 @@ double MElement::integrateCirc(double val[], int edge, int pOrder, int order)
Msg::Error("No edge %d for this element", edge);
return 0;
}
std::vector<MVertex*> v;
getEdgeVertices(edge, v);
MElementFactory f;
int type = getLineType(getPolynomialOrder());
MElement* ee = f.create(type, v);
double intv[3];
for(int i = 0; i < 3; i++){
intv[i] = ee->integrate(&val[i], pOrder, 3, order);
}
}
delete ee;
double t[3] = {v[1]->x() - v[0]->x(), v[1]->y() - v[0]->y(), v[1]->z() - v[0]->z()};
norme(t);
double result;
......@@ -582,7 +582,7 @@ double MElement::integrateFlux(double val[], int face, int pOrder, int order)
case TYPE_TET : type = getTriangleType(getPolynomialOrder()); break;
case TYPE_QUA : type = getQuadType(getPolynomialOrder()); break;
case TYPE_HEX : type = getQuadType(getPolynomialOrder()); break;
case TYPE_PYR :
case TYPE_PYR :
if(face < 4) type = getTriangleType(getPolynomialOrder());
else type = getQuadType(getPolynomialOrder());
break;
......@@ -1131,7 +1131,7 @@ MElement *MElement::copy(std::map<int, MVertex*> &vertexMap,
newParent = it->second;
parent = newParent;
}
MElementFactory factory;
MElement *newEl = factory.create(eType, vmv, getNum(), _partition, ownsParent(), parent);
......
......@@ -80,13 +80,13 @@ class MElement
verts.resize(N);
for(int i = 0; i < N; i++) verts[i] = getVertex(i);
}
virtual void setVertex(int num, MVertex *v)
virtual void setVertex(int num, MVertex *v)
{
Msg::Error("Vertex set not supported for this element");
}
// give an MVertex as input and get its local number
virtual void getVertexInfo(const MVertex *vertex, int &ithVertex) const
virtual void getVertexInfo(const MVertex *vertex, int &ithVertex) const
{
Msg::Error("Vertex information not available for this element");
}
......@@ -188,7 +188,7 @@ class MElement
// otherwise get the minimum radius of all the circles/spheres
// tangent to the most boundaries of the element.
virtual double getInnerRadius(){ return 0.; }
// get the radius of the circumscribed circle/sphere if it exists,
// otherwise get the maximum radius of all the circles/spheres
// tangent to the most boundaries of the element.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment