Commit aac80c9a authored by Dave Moxey's avatar Dave Moxey

Merge branch 'fix/MeshPartition' into 'master'

Fix/mesh partition

See merge request !923
parents 1727dab5 76857b6a
......@@ -34,9 +34,11 @@ v5.0.0
- Fix mac OSX on buildbots (!876)
- Fix error from (!826) (!876)
- Fix minor bug in ARPACK thirdparty build cmake (!874)
- Switch MeshGraph to use factory pattern and add HDF5 geometry support (!900,
!904)
- Switch MeshGraph to use factory pattern and add HDF5 geometry support
(!900, !904)
- Fix bug in MeshPartition.cpp which caused incorrect array access when
WeightPartitions was used in parallel (!923)
**NekMesh**:
- Add feature to read basic 2D geo files as CAD (!731)
- Add periodic boundary condition meshing in 2D (!733)
......
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 3D CG, prisms, Neumann BCs, iterative ML, Par(3)</description>
<executable>Helmholtz3D</executable>
<parameters>--use-metis Helmholtz3D_Prism.xml</parameters>
<parameters>--use-metis -I WeightPartitions=Boundary Helmholtz3D_Prism.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Prism.xml</file>
......
......@@ -369,15 +369,16 @@ void MeshPartition::ReadExpansions()
// construct mapping (elmt id, field name) -> nummodes
map<int, CompositeSharedPtr> &compMap =
m_meshgraph->GetComposites();
for (auto &i : compMap)
{
for (int i = 0; i < composite.size(); ++i)
{
for (int j = 0; j < fieldName.size(); j++)
{
for (int k = 0; k < i.second->m_geomVec.size(); k++)
for (int k = 0; k < compMap[composite[i]]->m_geomVec.size(); k++)
{
int elid = i.second->m_geomVec[k]->GetGlobalID();
int elid = compMap[composite[i]]->m_geomVec[k]->GetGlobalID();
m_expansions[elid][fieldName[j]] = nummodes;
m_shape[elid] = i.second->m_geomVec[k]->GetShapeType();
m_shape[elid] = compMap[composite[i]]->m_geomVec[k]->GetShapeType();
}
}
}
......
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