Commit d3d172cd by Chris Cantwell

Merge branch 'fix/cardiac-conductivities' of /opt/gitlab/repositories/nektar

parents 6d32b93e 87299be8
 ... ... @@ -364,8 +364,23 @@ namespace Nektar } } /** * @brief Determines if a point specified in global coordinates is * located within this tetrahedral geometry. */ bool HexGeom::v_ContainsPoint( const Array &gloCoord, NekDouble tol) { Array locCoord(GetCoordim(),0.0); return v_ContainsPoint(gloCoord,locCoord,tol); } bool HexGeom::v_ContainsPoint( const Array &gloCoord, Array &locCoord, NekDouble tol) { ASSERTL1(gloCoord.num_elements() == 3, "Three dimensional geometry expects three coordinates."); ... ... @@ -396,11 +411,11 @@ namespace Nektar } } Array stdCoord(GetCoordim(),0.0); v_GetLocCoords(gloCoord, stdCoord); if (stdCoord[0] >= -(1+tol) && stdCoord[0] <= 1+tol && stdCoord[1] >= -(1+tol) && stdCoord[1] <= 1+tol && stdCoord[2] >= -(1+tol) && stdCoord[2] <= 1+tol) v_GetLocCoords(gloCoord, locCoord); if (locCoord[0] >= -(1+tol) && locCoord[0] <= 1+tol && locCoord[1] >= -(1+tol) && locCoord[1] <= 1+tol && locCoord[2] >= -(1+tol) && locCoord[2] <= 1+tol) { return true; } ... ...
 ... ... @@ -73,6 +73,10 @@ namespace Nektar virtual bool v_ContainsPoint( const Array &gloCoord, NekDouble tol = 0.0); virtual bool v_ContainsPoint( const Array &gloCoord, Array &locCoord, NekDouble tol = 0.0); virtual int v_GetNumVerts() const; virtual int v_GetNumEdges() const; virtual int v_GetNumFaces() const; ... ...