Commit c7683d43 authored by Kilian Lackhove's avatar Kilian Lackhove
Browse files

Merge branch 'fix/warnings-gcc' into 'master'

Fix gcc warnings

See merge request !902
parents cdcb46c1 5a597918
......@@ -2430,7 +2430,6 @@ namespace Nektar
}
else if(mkey.ConstFactorExists(eFactorSVVDGKerDiffCoeff)) // Rodrigo/Mansoor's DG Kernel
{
NekDouble cutoff = mkey.GetConstFactor(eFactorSVVCutoffRatio);
NekDouble SvvDiffCoeff =
mkey.GetConstFactor(eFactorSVVDGKerDiffCoeff)*
mkey.GetConstFactor(eFactorSVVDiffCoeff);
......
......@@ -2053,7 +2053,6 @@ namespace Nektar
}
else if(mkey.ConstFactorExists(eFactorSVVDGKerDiffCoeff)) // Rodrigo/Mansoor's DG Kernel
{
NekDouble cutoff = mkey.GetConstFactor(eFactorSVVCutoffRatio);
NekDouble SvvDiffCoeff =
mkey.GetConstFactor(eFactorSVVDGKerDiffCoeff)*
mkey.GetConstFactor(eFactorSVVDiffCoeff);
......
......@@ -1962,7 +1962,6 @@ namespace Nektar
}
else if(mkey.ConstFactorExists(eFactorSVVDGKerDiffCoeff)) // Rodrigo/Mansoor's DG Kernel
{
NekDouble cutoff = mkey.GetConstFactor(eFactorSVVCutoffRatio);
NekDouble SvvDiffCoeff =
mkey.GetConstFactor(eFactorSVVDGKerDiffCoeff)*
mkey.GetConstFactor(eFactorSVVDiffCoeff);
......
......@@ -1581,7 +1581,6 @@ namespace Nektar
}
else if(mkey.ConstFactorExists(eFactorSVVDGKerDiffCoeff)) // Rodrigo/mansoor's DG kernel
{
NekDouble cutoff = mkey.GetConstFactor(eFactorSVVCutoffRatio);
NekDouble SvvDiffCoeff =
mkey.GetConstFactor(eFactorSVVDGKerDiffCoeff)*
mkey.GetConstFactor(eFactorSVVDiffCoeff);
......
......@@ -2094,7 +2094,6 @@ namespace Nektar
}
else if(mkey.ConstFactorExists(eFactorSVVDGKerDiffCoeff)) // Rodrigo/Mansoor's DG Kernel
{
NekDouble cutoff = mkey.GetConstFactor(eFactorSVVCutoffRatio);
NekDouble SvvDiffCoeff =
mkey.GetConstFactor(eFactorSVVDGKerDiffCoeff)*
mkey.GetConstFactor(eFactorSVVDiffCoeff);
......
......@@ -1390,7 +1390,6 @@ namespace Nektar
int qb = m_base[1]->GetNumPoints();
int nmodes_a = m_base[0]->GetNumModes();
int nmodes_b = m_base[1]->GetNumModes();
int nmodes = min(nmodes_a,nmodes_b);
// Declare orthogonal basis.
LibUtilities::PointsKey pa(qa,m_base[0]->GetPointsType());
......@@ -1427,7 +1426,6 @@ namespace Nektar
}
else if(mkey.ConstFactorExists(eFactorSVVDGKerDiffCoeff)) // Rodrigo/mansoor's DG kernel
{
NekDouble cutoff = mkey.GetConstFactor(eFactorSVVCutoffRatio);
NekDouble SvvDiffCoeff =
mkey.GetConstFactor(eFactorSVVDGKerDiffCoeff)*
mkey.GetConstFactor(eFactorSVVDiffCoeff);
......
......@@ -696,13 +696,13 @@ namespace Nektar
*(exp3D->GetGeom3D()->GetEdge(i)->GetVertex(1))));
}
NekDouble p;
int p = 0;
for(int i = 0; i < 3; ++i)
{
p = max(p,exp3D->GetBasisNumModes(i)-1.0);
p = max(p,exp3D->GetBasisNumModes(i)-1);
}
diffcoeff[e] *= h/p;
diffcoeff[e] *= h/p;
}
}
else
......@@ -719,13 +719,13 @@ namespace Nektar
*(exp2D->GetGeom2D()->GetEdge(i)->GetVertex(1))));
}
NekDouble p;
int p = 0;
for(int i = 0; i < 2; ++i)
{
p = max(p,exp2D->GetBasisNumModes(i)-1.0);
p = max(p,exp2D->GetBasisNumModes(i)-1);
}
diffcoeff[e] *= h/p;
diffcoeff[e] *= h/p;
}
}
}
......
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