Commit f3f18e1f authored by Dave Moxey's avatar Dave Moxey
Browse files

Fix compile warnings in StdRegions and LocalRegions.

parent ac367231
......@@ -199,7 +199,7 @@ namespace Nektar
inline int GetNumberOfCoefficients(ShapeType shape, std::vector<unsigned int> &modes, int offset)
{
int returnval;
int returnval = 0;
switch(shape)
{
case eSegment:
......
......@@ -483,7 +483,7 @@ namespace Nektar
Array<OneD, NekDouble> &outarray)
{
int nq = GetTotPoints();
StdRegions::MatrixType mtype;
StdRegions::MatrixType mtype = StdRegions::eIProductWRTDerivBase0;
switch(dir)
{
......@@ -2064,7 +2064,7 @@ namespace Nektar
NekDouble jac = (m_metricinfo->GetJac())[0];
Array<TwoD, const NekDouble> gmat
= m_metricinfo->GetGmat();
int dir;
int dir = 0;
switch(mkey.GetMatrixType())
{
......
......@@ -285,7 +285,7 @@ namespace Nektar
Array<OneD, NekDouble> &outarray)
{
int nq = GetTotPoints();
StdRegions::MatrixType mtype;
StdRegions::MatrixType mtype = StdRegions::eIProductWRTDerivBase0;
switch(dir)
{
......
......@@ -1551,7 +1551,7 @@ namespace Nektar
{
NekDouble jac = (m_metricinfo->GetJac())[0];
Array<TwoD, const NekDouble> gmat = m_metricinfo->GetGmat();
int dir;
int dir = 0;
switch(mkey.GetMatrixType())
{
......
......@@ -546,7 +546,7 @@ namespace Nektar
Array<OneD, NekDouble> &outarray)
{
int nq = GetTotPoints();
StdRegions::MatrixType mtype;
StdRegions::MatrixType mtype = StdRegions::eIProductWRTDerivBase0;
switch (dir)
{
......@@ -1953,7 +1953,7 @@ namespace Nektar
NekDouble jac = (m_metricinfo->GetJac())[0];
Array<TwoD, const NekDouble> gmat =
m_metricinfo->GetGmat();
int dir;
int dir = 0;
switch(mkey.GetMatrixType())
{
......@@ -2136,7 +2136,7 @@ namespace Nektar
NekDouble jac = (m_metricinfo->GetJac())[0];
const Array<TwoD, const NekDouble>& gmat =
m_metricinfo->GetGmat();
int dir;
int dir = 0;
switch(mkey.GetMatrixType())
{
......
......@@ -426,7 +426,7 @@ cout<<"deps/dx ="<<inarray_d0[i]<<" deps/dy="<<inarray_d1[i]<<endl;
break;
case LibUtilities::eGauss_Lagrange:
{
int nInteriorDofs = m_ncoeffs;
nInteriorDofs = m_ncoeffs;
offset = 0;
}
break;
......@@ -1508,7 +1508,7 @@ cout<<"deps/dx ="<<inarray_d0[i]<<" deps/dy="<<inarray_d1[i]<<endl;
}
else
{
int dir;
int dir = 0;
switch(mkey.GetMatrixType())
{
case StdRegions::eWeakDeriv0:
......
......@@ -1535,7 +1535,7 @@ namespace Nektar
NekDouble jac = (m_metricinfo->GetJac())[0];
Array<TwoD, const NekDouble> gmat
= m_metricinfo->GetGmat();
int dir;
int dir = 0;
switch(mkey.GetMatrixType())
{
......@@ -1569,8 +1569,8 @@ namespace Nektar
DNekMatSharedPtr WeakDeriv = MemoryManager<DNekMat>
::AllocateSharedPtr(rows,cols);
(*WeakDeriv) = gmat[3*dir][0]*deriv0
+ gmat[3*dir+1][0]*deriv1
+ gmat[3*dir+2][0]*deriv2;
+ gmat[3*dir+1][0]*deriv1
+ gmat[3*dir+2][0]*deriv2;
returnval = MemoryManager<DNekScalMat>
::AllocateSharedPtr(jac,WeakDeriv);
......
......@@ -505,7 +505,7 @@ namespace Nektar
Array<OneD, NekDouble> &outarray)
{
int nq = GetTotPoints();
StdRegions::MatrixType mtype;
StdRegions::MatrixType mtype = StdRegions::eIProductWRTDerivBase0;
switch(dir)
{
......@@ -1336,7 +1336,7 @@ namespace Nektar
{
NekDouble jac = (m_metricinfo->GetJac())[0];
Array<TwoD, const NekDouble> gmat = m_metricinfo->GetGmat();
int dir;
int dir = 0;
switch(mkey.GetMatrixType())
{
case StdRegions::eWeakDeriv0:
......@@ -1489,7 +1489,7 @@ namespace Nektar
{
NekDouble jac = (m_metricinfo->GetJac())[0];
const Array<TwoD, const NekDouble>& gmat = m_metricinfo->GetGmat();
int dir;
int dir = 0;
switch(mkey.GetMatrixType())
{
......
......@@ -304,7 +304,7 @@ namespace Nektar
break;
case LibUtilities::eGauss_Lagrange:
{
int nInteriorDofs = m_ncoeffs;
nInteriorDofs = m_ncoeffs;
offset = 0;
}
break;
......@@ -716,6 +716,7 @@ namespace Nektar
switch(Btype)
{
case LibUtilities::eGLL_Lagrange:
case LibUtilities::eGauss_Lagrange:
case LibUtilities::eChebyshev:
case LibUtilities::eFourier:
for(i = 0 ; i < GetNcoeffs()-2;i++)
......@@ -730,10 +731,6 @@ namespace Nektar
outarray[i] = i+2;
}
break;
case LibUtilities::eGauss_Lagrange:
{
outarray[i] = i;
}
default:
ASSERTL0(0,"Mapping array is not defined for this expansion");
break;
......
......@@ -553,7 +553,7 @@ namespace Nektar
Array<OneD, NekDouble>& outarray)
{
int nq = GetTotPoints();
MatrixType mtype;
MatrixType mtype = eIProductWRTDerivBase0;
switch(dir)
{
......@@ -1282,7 +1282,7 @@ namespace Nektar
GetEdgeBasisType(localVertexId) == LibUtilities::eModified_B,
"Mapping not defined for this type of basis");
int localDOF;
int localDOF = 0;
switch(localVertexId)
{
case 0:
......
Supports Markdown
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