Commit 2d0a10c0 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Cleaned up code.

parent c3923ac4
......@@ -137,7 +137,6 @@ namespace Nektar
NekMatrix<NekMatrix< DataType, InnerMatrixType>, ScaledMatrixTag>::CreateWrapper(const boost::shared_ptr<NekMatrix<NekMatrix< DataType, InnerMatrixType>, ScaledMatrixTag> >& rhs)
{
return boost::shared_ptr<ThisType>(new ThisType(*rhs));
//return boost::shared_ptr<ThisType>(new NekMatrix<NekMatrix< DataType, InnerMatrixType>, ScaledMatrixTag>(*rhs));
}
......
......@@ -1036,7 +1036,6 @@ namespace Nektar
Array<OneD,int> sign;
StdRegions::VarCoeffMap varcoeffs;
//varcoeffs[StdRegions::eVarCoeffPrimative] = primCoeffs;
varcoeffs[StdRegions::eVarCoeffMass] = primCoeffs;
LocalRegions::MatrixKey mkey(StdRegions::eMass,StdRegions::eSegment, *edgeExp, StdRegions::NullConstFactorMap, varcoeffs);
......@@ -1159,7 +1158,6 @@ namespace Nektar
Array<OneD,int> sign;
StdRegions::VarCoeffMap varcoeffs;
//varcoeffs[StdRegions::eVarCoeffPrimative] = primCoeffs;
varcoeffs[StdRegions::eVarCoeffMass] = primCoeffs;
LocalRegions::MatrixKey mkey(StdRegions::eMass,StdRegions::eSegment, *edgeExp, StdRegions::NullConstFactorMap, varcoeffs);
......
......@@ -978,7 +978,6 @@ namespace Nektar
Array<OneD, int> sign;
StdRegions::VarCoeffMap varcoeffs;
//varcoeffs[StdRegions::eVarCoeffPrimative] = primCoeffs;
varcoeffs[StdRegions::eVarCoeffMass] = primCoeffs;
StdRegions::ExpansionType expType =
......
......@@ -1681,7 +1681,6 @@ namespace Nektar
returnval = MemoryManager<DNekScalBlkMat>::AllocateSharedPtr(nblks, nblks, exp_size, exp_size); //Really need a constructor which takes Arrays
NekDouble factor = 1.0;
MatrixStorage AMatStorage = eFULL;
//MatrixStorage AMatStorage = eUPPER_TRIANGULAR;
switch(mkey.GetMatrixType())
{
......
......@@ -868,12 +868,10 @@ namespace Nektar
{
// Do matrix multiply locally
m_locToGloMap->GlobalToLocalBnd(pInput, m_wsp);
#if 1
NekVector<NekDouble> loc(nLocal, m_wsp, eWrapper);
loc = (*m_schurCompl)*loc;
#else
#endif
m_locToGloMap->AssembleBnd(m_wsp, pOutput);
}
}
......
......@@ -138,11 +138,11 @@ namespace Nektar
if (m_fields[0]->GetBndConditions()[n]->GetUserDefined() != SpatialDomains::eNoUserDefined)
{
if (m_fields[0]->GetBndConditions()[n]->GetUserDefined() != SpatialDomains::eTimeDependent)
{
{
if(m_fields[0]->GetBndConditions()[n]->GetUserDefined() != SpatialDomains::eRadiation)
{
if(m_fields[0]->GetBndConditions()[n]->GetUserDefined() != SpatialDomains::eI)
{
{
SpatialDomains::BndUserDefinedType btype = m_fields[0]->GetBndConditions()[n]->GetUserDefined();
ASSERTL0(false,"Unknown USERDEFINEDTYPE boundary condition");
}
......
......@@ -409,34 +409,6 @@ namespace Nektar
int nqtot = m_fields[0]->GetTotPoints();
Timer timer;
#if 0
timer.Start();
for(int k = 0; k < 1000; ++k)
{
m_fields[0]->IProductWRTBase(m_fields[0]->GetPhys(),
m_fields[0]->UpdateCoeffs());
}
timer.Stop();
cout << "\t 1000 Iprods : "<< timer.TimePerTest(1) << endl;
#endif
#if 0
timer.Start();
Array<OneD, NekDouble> out (m_fields[0]->GetTotPoints());
Array<OneD, NekDouble> out1(m_fields[0]->GetTotPoints());
Array<OneD, NekDouble> out2(m_fields[0]->GetTotPoints());
for(int k = 0; k < 10000; ++k)
{
m_fields[0]->PhysDeriv(out,out1,out2);
}
timer.Stop();
cout << "\t 10000 Physderiv : "<< timer.TimePerTest(1) << endl;
exit(1);
#endif
timer.Start();
// evaluate convection terms
......@@ -549,20 +521,6 @@ namespace Nektar
// Solve Helmholtz system and put in Physical space
timer.Start();
#if 0
Array<OneD, NekDouble> Save(ncoeffs);
Vmath::Vcopy(ncoeffs,m_fields[0]->GetCoeffs(),1,Save,1);
for(int k = 0; k < 200; ++k)
{
SetBoundaryConditions(time);
m_fields[0]->HelmSolve(F[0], m_fields[0]->UpdateCoeffs(), NullFlagList, factors);
Vmath::Vcopy(ncoeffs,Save,1,m_fields[0]->UpdateCoeffs(),1);
}
timer.Stop();
cout << "\t 200 V_solve : "<< timer.TimePerTest(1) << endl;
exit(1);
#endif
for(i = 0; i < m_nConvectiveFields; ++i)
{
m_fields[i]->HelmSolve(F[i], m_fields[i]->UpdateCoeffs(), NullFlagList, factors);
......
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