Commit 6eab235c authored by David Moxey's avatar David Moxey
Browse files

Windows fixes

parent c79a9bae
......@@ -479,27 +479,6 @@ namespace Nektar
CalculateBndSystemBandWidth();
if ((m_solnType == eDirectMultiLevelStaticCond ||
m_solnType == eIterativeMultiLevelStaticCond ||
m_solnType == eXxtMultiLevelStaticCond ||
m_solnType == ePETScMultiLevelStaticCond)
&& nGraphVerts)
{
if (m_staticCondLevel < (bottomUpGraph->GetNlevels()-1))
{
Array<OneD, int> vwgts_perm(nGraphVerts);
for(int i = 0; i < nGraphVerts; i++)
{
vwgts_perm[i] = vwgts[perm[i]];
}
bottomUpGraph->ExpandGraphWithVertexWeights(vwgts_perm);
m_nextLevelLocalToGlobalMap = MemoryManager<AssemblyMap>::
AllocateSharedPtr(this, bottomUpGraph);
}
}
cnt = 0;
m_bndCondTraceToGlobalTraceMap = Array<OneD, int>(nbndexp);
for(i = 0; i < bndCondExp.num_elements(); ++i)
......@@ -519,6 +498,27 @@ namespace Nektar
SetUpUniversalDGMap (locExp);
SetUpUniversalTraceMap(locExp, tr, periodicTrace);
if ((m_solnType == eDirectMultiLevelStaticCond ||
m_solnType == eIterativeMultiLevelStaticCond ||
m_solnType == eXxtMultiLevelStaticCond ||
m_solnType == ePETScMultiLevelStaticCond)
&& nGraphVerts)
{
if (m_staticCondLevel < (bottomUpGraph->GetNlevels() - 1))
{
Array<OneD, int> vwgts_perm(nGraphVerts);
for (int i = 0; i < nGraphVerts; i++)
{
vwgts_perm[i] = vwgts[perm[i]];
}
bottomUpGraph->ExpandGraphWithVertexWeights(vwgts_perm);
m_nextLevelLocalToGlobalMap = MemoryManager<AssemblyMap>::
AllocateSharedPtr(this, bottomUpGraph);
}
}
m_hash = hash_range(m_localToGlobalBndMap.begin(),
m_localToGlobalBndMap.end());
}
......
......@@ -357,7 +357,7 @@ namespace Nektar
};
QuadGeomSharedPtr quadgeom;
if (it == m_curvedEdges.end())
if (it == m_curvedFaces.end())
{
quadgeom =
MemoryManager<QuadGeom>::AllocateSharedPtr(
......
......@@ -357,7 +357,7 @@ namespace Nektar
};
QuadGeomSharedPtr quadgeom;
if (it == m_curvedEdges.end())
if (it == m_curvedFaces.end())
{
quadgeom =
MemoryManager<QuadGeom>::AllocateSharedPtr(
......@@ -480,7 +480,7 @@ namespace Nektar
QuadGeomSharedPtr quadgeom;
if (it == m_curvedEdges.end())
if (it == m_curvedFaces.end())
{
quadgeom = MemoryManager<QuadGeom>::AllocateSharedPtr(indx, edges, edgeorient);
}
......
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