Commit 2307d9db authored by Spencer Sherwin's avatar Spencer Sherwin

Tidy up suggestions from Dave

parent 42c7bd38
......@@ -317,33 +317,6 @@ namespace Nektar
}
#if 0
void PyrExp::v_IProductWRTBase(
const Array<OneD, const NekDouble> &inarray,
Array<OneD, NekDouble> &outarray)
{
int nquad0 = m_base[0]->GetNumPoints();
int nquad1 = m_base[1]->GetNumPoints();
int nquad2 = m_base[2]->GetNumPoints();
Array<OneD, const NekDouble> jac = m_metricinfo->GetJac(GetPointsKeys());
Array<OneD, NekDouble> tmp(nquad0*nquad1*nquad2);
// multiply inarray with Jacobian
if(m_metricinfo->GetGtype() == SpatialDomains::eDeformed)
{
Vmath::Vmul(nquad0*nquad1*nquad2,&jac[0],1,(NekDouble*)&inarray[0],1,&tmp[0],1);
}
else
{
Vmath::Smul(nquad0*nquad1*nquad2,jac[0],(NekDouble*)&inarray[0],1,&tmp[0],1);
}
StdPyrExp::v_IProductWRTBase(tmp,outarray);
}
#endif
/**
* @brief Calculates the inner product \f$ I_{pqr} = (u,
* \partial_{x_i} \phi_{pqr}) \f$.
......
......@@ -671,13 +671,6 @@ namespace Nektar
int nq = GetTotPoints();
Array<OneD, NekDouble> tmp(nq);
static int cnt = 0;
cnt++;
if(cnt == 84)
{
std::cout << "Start" << std::endl;
}
v_BwdTrans(inarray,tmp);
if(mkey.HasVarCoeff(eVarCoeffMass))
......
......@@ -1954,7 +1954,13 @@ namespace Nektar
{
if(j + k >= cutoff || i + k >= cutoff)
{
orthocoeffs[cnt] *= (SvvDiffCoeff*exp(-(i+k-nmodes)*(i+k-nmodes)/((NekDouble)((i+k-cutoff+epsilon)*(i+k-cutoff+epsilon))))*exp(-(j-nmodes)*(j-nmodes)/((NekDouble)((j-cutoff+epsilon)*(j-cutoff+epsilon)))));
orthocoeffs[cnt] *=
(SvvDiffCoeff*exp(-(i+k-nmodes)*(i+k-nmodes)/
((NekDouble)((i+k-cutoff+epsilon)*
(i+k-cutoff+epsilon))))*
exp(-(j-nmodes)*(j-nmodes)/
((NekDouble)((j-cutoff+epsilon)*
(j-cutoff+epsilon)))));
}
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