Commit 857d9c4a authored by Chris Cantwell's avatar Chris Cantwell

Minor tidying up.

parent 31d2b68a
......@@ -128,8 +128,6 @@ namespace Nektar
Array<OneD, NekDouble> OutputLinear(nGlobal, 0.0);
Array<OneD, NekDouble> InputLinear(nGlobal, 0.0);
#if 1
//Apply Low Energy preconditioner
m_lowEnergyPrecon->DoPreconditioner(pInput, OutputLowEnergy);
......@@ -140,24 +138,7 @@ namespace Nektar
m_linSpacePrecon->DoPreconditionerWithNonVertOutput(InputLinear, OutputLinear, tmp);
m_lowEnergyPrecon->DoMultiplybyInverseTransposedTransformationMatrix(OutputLinear,pOutput);
#else
//Transform input from low energy to original basis
m_lowEnergyPrecon->DoMultiplybyInverseTransformationMatrix(pInput, InputLinear);
//Apply linear space preconditioner
m_linSpacePrecon->DoPreconditionerWithNonVertOutput(InputLinear, OutputLinear, NullNekDouble1DArray, tmp);
m_lowEnergyPrecon->DoMultiplybyInverseTransposedTransformationMatrix(OutputLinear,pOutput);
// work out forcing for linear terms.
m_lowEnergyPrecon->DoMultiplybyInverseTransposedTransformationMatrix(tmp,OutputLinear);
//subtrace forcing from linear terms from Low Energy evaluation.
Vmath::Vsub(nGlobal,pInput,1,OutputLinear,1,OutputLinear,1);
//Apply Low Energy preconditioner
m_lowEnergyPrecon->DoPreconditioner(OutputLinear, OutputLowEnergy);
#endif
Vmath::Vadd(nGlobal,pOutput,1,OutputLowEnergy,1,pOutput,1);
}
......
......@@ -48,8 +48,7 @@ namespace Nektar
{
if (pParams.find("OutputFile") == pParams.end())
{
string outname = m_session->GetSessionName();
m_outputFile = outname;
m_outputFile = m_session->GetSessionName();
}
else
{
......
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