Commit bb8c3700 authored by Michael Turner's avatar Michael Turner
Browse files

found the weirdness

parent edfaac72
......@@ -310,7 +310,7 @@ void Generator2D::Process()
}
if (m_mesh->m_verbose)
/*if (m_mesh->m_verbose)
{
cout << endl << "\tFace meshing:" << endl << endl;
}
......@@ -326,12 +326,12 @@ void Generator2D::Process()
m_facemeshes[i] = MemoryManager<FaceMesh>::AllocateSharedPtr(
i, m_mesh, m_curvemeshes, 99 + i);
m_facemeshes[i]->Mesh();
}
}*/
////////////////////////////////////
EdgeSet::iterator it;
/*EdgeSet::iterator it;
for (it = m_mesh->m_edgeSet.begin(); it != m_mesh->m_edgeSet.end(); it++)
{
vector<NodeSharedPtr> ns;
......@@ -346,7 +346,7 @@ void Generator2D::Process()
ElementSharedPtr E2 = GetElementFactory().CreateInstance(
LibUtilities::eSegment, conf, ns, tags);
m_mesh->m_element[1].push_back(E2);
}
}*/
ProcessVertices();
......@@ -409,7 +409,7 @@ void Generator2D::MakeBL(int faceid)
NekDouble mag = sqrt(n[0] * n[0] + n[1] * n[1]);
n[0] /= mag;
n[1] /= mag;
Array<OneD, NekDouble> np = es[j]->m_n1->GetCADSurfInfo(faceid);
Array<OneD, NekDouble> np = p1;
np[0] += n[0];
np[1] += n[1];
Array<OneD, NekDouble> loc = es[j]->m_n1->GetLoc();
......@@ -437,7 +437,7 @@ void Generator2D::MakeBL(int faceid)
map<NodeSharedPtr, vector<EdgeSharedPtr> >::iterator it;
for (it = m_nodesToEdge.begin(); it != m_nodesToEdge.end(); it++)
{
Array<OneD, NekDouble> n(3);
Array<OneD, NekDouble> n(3,0.0);
ASSERTL0(it->second.size() == 2,
"wierdness, most likely bl_surfs are incorrect");
Array<OneD, NekDouble> n1 = edgeNormals[it->second[0]->m_id];
......@@ -462,7 +462,6 @@ void Generator2D::MakeBL(int faceid)
n[0] = n[0] * t + it->first->m_x;
n[1] = n[1] * t + it->first->m_y;
n[2] = 0.0;
NodeSharedPtr nn = boost::shared_ptr<Node>(
new Node(m_mesh->m_numNodes++, n[0], n[1], 0.0));
CADSurfSharedPtr s = m_mesh->m_cad->GetSurf(faceid);
......
......@@ -85,14 +85,14 @@ Array<OneD, NekDouble> CADSurfOCE::locuv(Array<OneD, NekDouble> p)
Array<OneD, NekDouble> uvr(2);
gp_Pnt2d p2 = m_sas->ValueOfUV(loc, 1e-3);
gp_Pnt2d p2 = m_sas->ValueOfUV(loc, 1e-8);
uvr[0] = p2.X();
uvr[1] = p2.Y();
gp_Pnt p3 = m_sas->Value(p2);
if (p3.Distance(loc) > 1.0)
if (p3.Distance(loc) > 0.001)
{
cout << "large locuv distance " << p3.Distance(loc) << " " << m_id
cout << "large locuv distance " << p3.Distance(loc)/1000.0 << " " << m_id
<< endl;
}
......@@ -193,7 +193,7 @@ void CADSurfOCE::ProjectTo(Array<OneD, NekDouble> &tp,
ShapeAnalysis_Surface sas(m_s);
sas.SetDomain(m_bounds[0], m_bounds[1], m_bounds[2], m_bounds[3]);
gp_Pnt2d p2 = sas.ValueOfUV(loc, 1e-7);
gp_Pnt2d p2 = sas.ValueOfUV(loc, 1e-8);
gp_Pnt p3 = sas.Value(p2);
......@@ -226,7 +226,7 @@ Array<OneD, NekDouble> CADSurfOCE::N(Array<OneD, NekDouble> uv)
Test(uv);
#endif
BRepLProp_SLProps slp(m_occSurface, 2, 1e-6);
BRepLProp_SLProps slp(m_occSurface, 2, 1e-8);
slp.SetParameters(uv[0], uv[1]);
if (!slp.IsNormalDefined())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment