Commit ca67e008 authored by Chris Cantwell's avatar Chris Cantwell

Merge branch 'fix/warnings' of localhost:nektar

parents 7158dc32 536ed99c
......@@ -1535,7 +1535,7 @@ namespace Nektar
bool reverseOrdering = false;
bool signChange = false;
int IdxRange [3][2];
int IdxRange [3][2] = {{0,0},{0,0},{0,0}};
switch(eid)
{
......@@ -1830,8 +1830,8 @@ namespace Nektar
GetBasisType(1),
GetBasisType(2)};
int nummodesA;
int nummodesB;
int nummodesA = 0;
int nummodesB = 0;
// Determine the number of modes in face directions A & B based
// on the face index given.
......
......@@ -1244,17 +1244,14 @@ namespace Nektar
int nummodesA,
int nummodesB)
{
const LibUtilities::BasisType bType0 = GetEdgeBasisType(0);
const LibUtilities::BasisType bType1 = GetEdgeBasisType(1);
const LibUtilities::BasisType bType2 = GetEdgeBasisType(4);
ASSERTL1(bType0 == bType1,
ASSERTL1(GetEdgeBasisType(0) == GetEdgeBasisType(1),
"Method only implemented if BasisType is identical"
"in x and y directions");
ASSERTL1(bType0 == LibUtilities::eModified_A &&
bType2 == LibUtilities::eModified_B,
ASSERTL1(GetEdgeBasisType(0) == LibUtilities::eModified_A &&
GetEdgeBasisType(4) == LibUtilities::eModified_B,
"Method only implemented for Modified_A BasisType"
"(x and y direction) and Modified_B BasisType (z direction)");
"(x and y direction) and Modified_B BasisType (z "
"direction)");
int i, j, p, q, r, nFaceCoeffs, idx = 0;
......
......@@ -920,14 +920,15 @@ namespace Nektar
const int nummodes2 = m_base[2]->GetNumModes();
//int nummodesA, nummodesB, P, Q;
const LibUtilities::BasisType bType0 = GetEdgeBasisType(0);
const LibUtilities::BasisType bType1 = GetEdgeBasisType(1);
const LibUtilities::BasisType bType2 = GetEdgeBasisType(4);
ASSERTL1( (bType0==bType1),
"Method only implemented if BasisType is indentical in x and y directions");
ASSERTL1( (bType0==LibUtilities::eModified_A) && (bType1==LibUtilities::eModified_A) && (bType2==LibUtilities::eModified_C),
"Method only implemented for Modified_A BasisType (x and y direction) and Modified_C BasisType (z direction)");
ASSERTL1( GetEdgeBasisType(0) == GetEdgeBasisType(1),
"Method only implemented if BasisType is indentical in "
"x and y directions");
ASSERTL1( GetEdgeBasisType(0) == LibUtilities::eModified_A &&
GetEdgeBasisType(1) == LibUtilities::eModified_A &&
GetEdgeBasisType(4) == LibUtilities::eModified_C,
"Method only implemented for Modified_A BasisType (x "
"and y direction) and Modified_C BasisType (z "
"direction)");
bool isQuad = true;
......
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