Commit 0ba9aee2 authored by Dave Moxey's avatar Dave Moxey
Browse files

Address Douglas' comments, add some regression tests

parent 26282060
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 2D CG with P=7, all BCs, iterative ML, par(3)</description>
<executable>Helmholtz2D</executable>
<parameters>--use-metis -I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<parameters>--use-metis --verbose -I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
......
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 3D CG, hexes, mixed BCs, iterative ML</description>
<executable>Helmholtz3D</executable>
<parameters>--use-metis -I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<parameters>--use-metis --verbose -I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Hex_AllBCs_P6.xml</file>
......
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 3D CG, hexes, mixed BCs, iterative ML, Scotch</description>
<executable>Helmholtz3D</executable>
<parameters>--use-scotch -I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<parameters>--use-scotch --verbose -I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Hex_AllBCs_P6.xml</file>
......
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 3D CG, prisms, Neumann BCs, iterative ML, Par(3), Scotch</description>
<executable>Helmholtz3D</executable>
<parameters>--use-scotch Helmholtz3D_Prism.xml</parameters>
<parameters>--use-scotch --verbose Helmholtz3D_Prism.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Prism.xml</file>
......
......@@ -1398,17 +1398,13 @@ namespace Nektar
}
int level = 1;
AssemblyMapSharedPtr tmp = m_nextLevelLocalToGlobalMap, tmp1;
while (tmp)
AssemblyMapSharedPtr tmp = m_nextLevelLocalToGlobalMap;
while (tmp->m_nextLevelLocalToGlobalMap)
{
tmp1 = tmp;
tmp = tmp->m_nextLevelLocalToGlobalMap;
tmp = tmp->m_nextLevelLocalToGlobalMap;
++level;
}
// Increment by one to obtain number of levels.
++level;
// Print out multi-level static condensation information.
if (n > 1)
{
......@@ -1455,7 +1451,7 @@ namespace Nektar
{
out << "Stats at lowest static cond. level:" << endl;
}
tmp1->PrintStats(out, variable, false);
tmp->PrintStats(out, variable, false);
}
} // namespace
} // namespace
......@@ -2,7 +2,7 @@
<test>
<description>3D channel flow, Tetrahedral elements, P=4, periodic BCs, XxtMultiLevelStaticCond, par(2)</description>
<executable>IncNavierStokesSolver</executable>
<parameters>--use-metis -I GlobalSysSoln=XxtMultiLevelStaticCond Tet_channel_m4_per.xml</parameters>
<parameters>--use-metis --verbose -I GlobalSysSoln=XxtMultiLevelStaticCond Tet_channel_m4_per.xml</parameters>
<processes>2</processes>
<files>
<file description="Session File">Tet_channel_m4_per.xml</file>
......
......@@ -2,7 +2,7 @@
<test>
<description>3D channel flow, Tet elements, par(3), P=8</description>
<executable>IncNavierStokesSolver</executable>
<parameters>--use-metis -I GlobalSysSoln=IterativeMultiLevelStaticCond Tet_channel_m8_par.xml</parameters>
<parameters>--use-metis --verbose -I GlobalSysSoln=IterativeMultiLevelStaticCond Tet_channel_m8_par.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Tet_channel_m8_par.xml</file>
......
Supports Markdown
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