Commit 0d84c491 authored by Sergey Yakovlev's avatar Sergey Yakovlev

Reorderings reverted to the way they were (CuthillMcKee only for

DirectStaticCond)
Input file was fixed
parent 245f9871
......@@ -1283,6 +1283,7 @@ namespace Nektar
{
case eDirectFullMatrix:
case eIterativeFull:
case eIterativeStaticCond:
case eXxtFullMatrix:
case eXxtStaticCond:
{
......@@ -1290,7 +1291,6 @@ namespace Nektar
}
break;
case eDirectStaticCond:
case eIterativeStaticCond:
{
CuthillMckeeReordering(boostGraphObj,perm,iperm);
}
......
......@@ -1224,6 +1224,7 @@ namespace Nektar
{
case eDirectFullMatrix:
case eIterativeFull:
case eIterativeStaticCond:
case eXxtFullMatrix:
case eXxtStaticCond:
{
......@@ -1231,7 +1232,6 @@ namespace Nektar
}
break;
case eDirectStaticCond:
case eIterativeStaticCond:
{
CuthillMckeeReordering(boostGraphObj,perm,iperm);
}
......
......@@ -428,12 +428,12 @@ namespace Nektar
{
case eDirectFullMatrix:
case eIterativeFull:
case eIterativeStaticCond:
{
NoReordering(boostGraphObj,perm,iperm);
break;
}
case eDirectStaticCond:
case eIterativeStaticCond:
{
CuthillMckeeReordering(boostGraphObj,perm,iperm);
break;
......@@ -850,6 +850,7 @@ namespace Nektar
break;
}
case eDirectMultiLevelStaticCond:
case eIterativeMultiLevelStaticCond:
{
MultiLevelBisectionReordering(boostGraphObj,perm,iperm,
bottomUpGraph);
......
......@@ -14,12 +14,6 @@
<!--These composites must be defined in the geometry file.-->
<BOUNDARYREGIONS>
<B ID="0"> C[1-4] </B>
<!--
<B ID="0"> C[1] </B>
<B ID="1"> C[2] </B>
<B ID="2"> C[3] </B>
<B ID="3"> C[4] </B>
-->
</BOUNDARYREGIONS>
<!--The region numbers below correspond to the regions specified in the
......@@ -28,24 +22,10 @@
<REGION REF="0">
<D VAR="u" VALUE="sin(w*PI*x)*sin(w*PI*y)" />
</REGION>
<!--
<REGION REF="0">
<D VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
</REGION>
<REGION REF="1">
<D VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
</REGION>
<REGION REF="2">
<D VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
</REGION>
<REGION REF="3">
<D VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
</REGION>
-->
</BOUNDARYCONDITIONS>
<FUNCTION NAME="Forcing">
<E VAR="u" VALUE="-(Lambda + 2*w*w*PI*PI)*sin(PI*x)*sin(PI*y)" />
<E VAR="u" VALUE="-(Lambda + 2*w*w*PI*PI)*sin(w*PI*x)*sin(w*PI*y)" />
</FUNCTION>
<FUNCTION NAME="ExactSolution">
......
......@@ -278,8 +278,6 @@ int main(int argc, char *argv[])
//--------------------------------------------
// Calculate L_inf error
Sol = MemoryManager<MultiRegions::ContField2D>::AllocateSharedPtr(*Exp);
NekDouble L2Error = Exp->L2 (Exp->GetPhys(), sol);
NekDouble LinfError = Exp->Linf(Exp->GetPhys(), sol);
......
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