Commit 5f9ff2ca authored by David Moxey's avatar David Moxey

Merge branch 'fix/curved-faces-manifold' into 'master'

Fixes for curved faces generated using a manifold output

See merge request !941
parents 4b602121 b037d5ca
......@@ -39,7 +39,7 @@ v5.0.0
- Added in sum factorisation version for pyramid expnasions and orthogonal
expansion in pyramids (!750)
- Switch MeshGraph to use factory pattern and add HDF5 geometry support (!900,
!904)
!904, !941)
- Restructure the low energy preconditioner to handle pyramidic and variable
p expansions (!920)
- Remove requirement for modmetis, switch to SCOTCH by default (!899)
......
......@@ -294,7 +294,17 @@ void TriGeom::v_FillGeom()
const int offset = 3 + i * (nEdgePts - 2);
NekDouble maxDist = 0.0;
if (m_eorient[i] == StdRegions::eForwards)
// Account for different ordering of nodal coordinates
// vs. Cartesian ordering of element.
StdRegions::Orientation orient = m_eorient[i];
if (i == 2)
{
orient = orient == StdRegions::eForwards ?
StdRegions::eBackwards : StdRegions::eForwards;
}
if (orient == StdRegions::eForwards)
{
for (j = 0; j < nEdgePts - 2; ++j)
{
......
......@@ -268,6 +268,7 @@ void InputNekpp::Process()
{
EdgeSharedPtr edg = eIdMap[geomIt->GetGlobalID()];
E->SetVolumeNodes(edg->m_edgeNodes);
E->SetCurveType(edg->m_curveType);
}
if (dim > 1)
......@@ -285,6 +286,7 @@ void InputNekpp::Process()
{
FaceSharedPtr fac = fIdMap[geomIt->GetGlobalID()];
E->SetVolumeNodes(fac->m_faceNodes);
E->SetCurveType(fac->m_curveType);
}
}
......
......@@ -383,7 +383,7 @@ void OutputNekpp::TransferCurves(MeshGraphSharedPtr graph)
for(int i = 0; i < ns.size(); i++)
{
PointGeomSharedPtr vert = MemoryManager<PointGeom>::AllocateSharedPtr(
m_mesh->m_expDim, edgecnt, ns[i]->m_x, ns[i]->m_y, ns[i]->m_z);
m_mesh->m_spaceDim, edgecnt, ns[i]->m_x, ns[i]->m_y, ns[i]->m_z);
curve->m_points.push_back(vert);
}
......@@ -407,7 +407,7 @@ void OutputNekpp::TransferCurves(MeshGraphSharedPtr graph)
for(int i = 0; i < ns.size(); i++)
{
PointGeomSharedPtr vert = MemoryManager<PointGeom>::AllocateSharedPtr(
m_mesh->m_expDim, facecnt, ns[i]->m_x, ns[i]->m_y, ns[i]->m_z);
m_mesh->m_spaceDim, facecnt, ns[i]->m_x, ns[i]->m_y, ns[i]->m_z);
curve->m_points.push_back(vert);
}
......@@ -432,7 +432,7 @@ void OutputNekpp::TransferCurves(MeshGraphSharedPtr graph)
for(int i = 0; i < ns.size(); i++)
{
PointGeomSharedPtr vert = MemoryManager<PointGeom>::AllocateSharedPtr(
m_mesh->m_expDim, facecnt, ns[i]->m_x, ns[i]->m_y, ns[i]->m_z);
m_mesh->m_spaceDim, facecnt, ns[i]->m_x, ns[i]->m_y, ns[i]->m_z);
curve->m_points.push_back(vert);
}
......
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