Commit 4be22850 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Fix for static cond solve with initial guess.

Removed nDirBndDofs condition.
parent 06d53f0f
......@@ -154,5 +154,17 @@ namespace DBUtils
}
}
template<class T> void NormGlobalVector(
const int n,
Array<OneD, const T> &in,
std::ostream &out,
MultiRegions::AssemblyMapSharedPtr &map)
{
Array<OneD, NekDouble> vExchange(1);
Array<OneD, int> m_map = map->GetGlobalToUniversalMapUnique();
vExchange[0] = Vmath::Dot2(n, in, in, m_map);
map->GetComm()->AllReduce(vExchange, Nektar::LibUtilities::ReduceSum);
out << "Norm: " << vExchange[0] << endl;
}
}
#endif
......@@ -197,8 +197,7 @@ namespace Nektar
if(pLocToGloMap->GetPreconType() != MultiRegions::eLowEnergy)
{
// construct boundary forcing
if( nIntDofs && ((nDirBndDofs) && (!dirForcCalculated)
&& (atLastLevel)) )
if( nIntDofs && ((!dirForcCalculated) && (atLastLevel)) )
{
DNekScalBlkMat &BinvD = *m_BinvD;
DNekScalBlkMat &SchurCompl = *m_schurCompl;
......@@ -208,15 +207,14 @@ namespace Nektar
V_LocBnd = BinvD*F_Int + SchurCompl*V_LocBnd;
}
else if((nDirBndDofs) && (!dirForcCalculated)
&& (atLastLevel))
else if((!dirForcCalculated) && (atLastLevel))
{
//include dirichlet boundary forcing
DNekScalBlkMat &SchurCompl = *m_schurCompl;
pLocToGloMap->GlobalToLocalBnd(V_GlobBnd,V_LocBnd);
V_LocBnd = SchurCompl*V_LocBnd;
}
else
else
{
DNekScalBlkMat &BinvD = *m_BinvD;
V_LocBnd = BinvD*F_Int;
......@@ -316,14 +314,12 @@ namespace Nektar
DNekScalBlkMat &R = *m_RBlk;
DNekScalBlkMat &BinvD = *m_BinvD;
if( nIntDofs && ((nDirBndDofs) && (!dirForcCalculated)
&& (atLastLevel)) )
if( nIntDofs && ((!dirForcCalculated) && (atLastLevel)) )
{
pLocToGloMap->GlobalToLocalBnd(V_GlobBnd,V_LocBnd);
V_LocBnd = BinvD*F_Int+ S1*V_LocBnd;
}
else if((nDirBndDofs) && (!dirForcCalculated)
&& (atLastLevel))
else if((!dirForcCalculated) && (atLastLevel))
{
pLocToGloMap->GlobalToLocalBnd(V_GlobBnd,V_LocBnd);
V_LocBnd = S1*V_LocBnd;
......
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