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

fix merge of cad system

parent 2ab7682b
...@@ -156,7 +156,7 @@ public: ...@@ -156,7 +156,7 @@ public:
/* /*
* @brief locates a point in the parametric space * @brief locates a point in the parametric space
*/ */
NekDouble loct(Array<OneD, NekDouble> xyz); virtual NekDouble loct(Array<OneD, NekDouble> xyz) = 0;
protected: protected:
......
...@@ -87,7 +87,7 @@ NekDouble CADCurveOCE::loct(Array<OneD, NekDouble> xyz) ...@@ -87,7 +87,7 @@ NekDouble CADCurveOCE::loct(Array<OneD, NekDouble> xyz)
ShapeAnalysis_Curve sac; ShapeAnalysis_Curve sac;
gp_Pnt p; gp_Pnt p;
NekDouble d = sac.Project(m_c,loc,1e-8 ,p,t); sac.Project(m_c,loc,1e-8 ,p,t);
if(p.Distance(loc) > 1e-5) if(p.Distance(loc) > 1e-5)
{ {
......
...@@ -69,6 +69,7 @@ public: ...@@ -69,6 +69,7 @@ public:
virtual Array<OneD, NekDouble> D2(NekDouble t); virtual Array<OneD, NekDouble> D2(NekDouble t);
virtual NekDouble tAtArcLength(NekDouble s); virtual NekDouble tAtArcLength(NekDouble s);
virtual Array<OneD, NekDouble> GetMinMax(); virtual Array<OneD, NekDouble> GetMinMax();
virtual NekDouble loct(Array<OneD, NekDouble> xyz);
void Initialise(int i, TopoDS_Shape in) void Initialise(int i, TopoDS_Shape in)
{ {
......
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