Commit 6810b8b2 authored by Spencer Sherwin's avatar Spencer Sherwin

.

parent 83110735
......@@ -314,11 +314,11 @@ namespace Nektar
{
continue;
}
for(j = 0; j < locExpVector.size(); j++)
{
locExpansion = boost::dynamic_pointer_cast<
StdRegions::StdExpansion3D>(
StdRegions::StdExpansion3D>(
locExpVector[locExp.GetOffset_Elmt_Id(j)]);
for(k = 0; k < locExpansion->GetNverts(); k++)
......@@ -427,7 +427,6 @@ namespace Nektar
extraDirEdges.insert(edgeids[i]);
}
/*
// Check between processes if the whole system is singular
int s = (systemSingular ? 1 : 0);
m_comm->AllReduce(s, LibUtilities::ReduceMin);
......@@ -474,7 +473,7 @@ namespace Nektar
vertReorderedGraphVertId[meshVertId] = graphVertId++;
}
}
*/
m_numLocalDirBndCoeffs = nLocDirBndCondDofs + nExtraDirichlet;
firstNonDirGraphVertId = graphVertId;
......
......@@ -129,7 +129,7 @@ namespace Nektar
{
if(m_root)
{
std::cout << "CG iterations made = " << m_totalIterations << " using tolerance of " << m_tolerance << " (bb_inv = " << m_bb_inv << ")"<< std::endl;
std::cout << "CG iterations made = " << m_totalIterations << " using tolerance of " << m_tolerance << " (sqrt(bb_inv) = " << sqrt(m_bb_inv) << ")"<< std::endl;
}
}
}
......@@ -443,8 +443,8 @@ namespace Nektar
// Continue until convergence
while (true)
{
ASSERTL0(k < 20000,
"Exceeded maximum number of iterations (20000)");
ASSERTL0(k < 5000,
"Exceeded maximum number of iterations (5000)");
// Compute new search direction p_k, q_k
p = w + beta * p;
......
......@@ -253,8 +253,8 @@ namespace Nektar
Nektar::LibUtilities::ReduceSum);
// for weird cases make sure normalisation
// is not less than 1e-6
m_bb_inv = (vExchange[0] > 10e6)
// is not less than 1e-12
m_bb_inv = (vExchange[0] > 10e12)
? 1.0
: 1.0/vExchange[0];
}
......
......@@ -511,8 +511,8 @@
<CONDITIONS>
<PARAMETERS>
<P> TimeStep = 1e-4 </P>
<P> FinTime = 0.025 </P>
<P> TimeStep = 1e-4 </P>
<P> FinTime = 0.025 </P>
<P> NumSteps = FinTime/TimeStep </P>
<P> IO_CheckSteps = NumSteps*50 </P>
<P> IO_InfoSteps = 500 </P>
......@@ -520,6 +520,7 @@
<P> omega = 2*PI/T </P>
<P> rho = 1.021E-03 </P>
<P> pext = 0.0 </P>
<P> A1 = 5.983 </P>
<P> A2 = 5.147 </P>
<P> A3 = 1.219 </P>
......@@ -1569,7 +1570,7 @@
<E VAR="beta[31]" VALUE="1567" />
<E VAR="beta[32]" VALUE="806" />
<E VAR="beta[33]" VALUE="569" />
<E VAR="beta[34]" VALUE="227" />
<E VAR="beta[34]" LINEARVARYING VALUE="227" />
<E VAR="beta[35]" VALUE="566" />
<E VAR="beta[36]" VALUE="278" />
<E VAR="beta[37]" VALUE="1181" />
......
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