Commit 0bfd2a2f authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Merge branch 'fix/warnings' of localhost:nektar

parents 612a6e36 33aeb7d2
......@@ -23,9 +23,10 @@ int main(int argc, char *argv[])
int order1,order2, nq1,nq2;
LibUtilities::PointsType Qtype1,Qtype2;
LibUtilities::BasisType btype1,btype2;
LibUtilities::PointsType NodalType;
LibUtilities::ShapeType regionshape;
LibUtilities::BasisType btype1 = LibUtilities::eOrtho_A;
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::PointsType NodalType = LibUtilities::eNodalTriElec;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion2D *E;
Array<OneD, NekDouble> sol;
Array<OneD, NekDouble> coords(8);
......
......@@ -33,9 +33,10 @@ int main(int argc, char *argv[])
int order1,order2, nq1,nq2;
LibUtilities::PointsType Qtype1,Qtype2;
LibUtilities::BasisType btype1,btype2;
LibUtilities::PointsType NodalType;
LibUtilities::ShapeType regionshape;
LibUtilities::BasisType btype1 = LibUtilities::eOrtho_A;
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::PointsType NodalType = LibUtilities::eNodalTriElec;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion2D *E;
Array<OneD, NekDouble> sol,x,y,dx,dy;
Array<OneD, NekDouble> coords(8);
......
......@@ -23,9 +23,10 @@ int main(int argc, char *argv[]){
int order1,order2, nq1,nq2;
LibUtilities::PointsType Qtype1,Qtype2;
LibUtilities::BasisType btype1,btype2;
LibUtilities::PointsType NodalType;
LibUtilities::ShapeType regionshape;
LibUtilities::BasisType btype1 = LibUtilities::eOrtho_A;
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::PointsType NodalType = LibUtilities::eNodalTriElec;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion *E;
Array<OneD, NekDouble> sol;
......
......@@ -36,9 +36,11 @@ int main(int argc, char *argv[]){
int order1,order2,order3, nq1,nq2,nq3;
LibUtilities::PointsType Qtype1,Qtype2,Qtype3;
LibUtilities::BasisType btype1,btype2,btype3;
LibUtilities::PointsType NodalType;
LibUtilities::ShapeType regionshape;
LibUtilities::BasisType btype1 = LibUtilities::eOrtho_A;
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::BasisType btype3 = LibUtilities::eOrtho_C;
LibUtilities::PointsType NodalType = LibUtilities::eNodalTriElec;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion *E;
Array<OneD, NekDouble> sol;
......
......@@ -30,8 +30,9 @@ int main(int argc, char *argv[])
int order1,order2, nq1,nq2;
LibUtilities::PointsType Qtype1,Qtype2;
LibUtilities::BasisType btype1,btype2;
LibUtilities::PointsType NodalType;
LibUtilities::BasisType btype1 = LibUtilities::eOrtho_A;
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::PointsType NodalType = LibUtilities::eNodalTriElec;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion *E;
Array<OneD, NekDouble> sol,dx,dy,x,y;
......
......@@ -57,8 +57,10 @@ int main(int argc, char *argv[]){
int order1,order2,order3, nq1,nq2,nq3;
LibUtilities::PointsType Qtype1,Qtype2,Qtype3;
LibUtilities::BasisType btype1,btype2,btype3;
LibUtilities::ShapeType regionshape;
LibUtilities::BasisType btype1 = LibUtilities::eOrtho_A;
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::BasisType btype3 = LibUtilities::eOrtho_C;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion *E;
Array<OneD, NekDouble> x, y, z, sol, dx, dy, dz;
......
......@@ -327,9 +327,10 @@ namespace Nektar
MPI_Op vOp;
switch (pOp)
{
case ReduceSum: vOp = MPI_SUM; break;
case ReduceMax: vOp = MPI_MAX; break;
case ReduceMin: vOp = MPI_MIN; break;
case ReduceSum:
default: vOp = MPI_SUM; break;
}
int retval = MPI_Allreduce( MPI_IN_PLACE,
&pData,
......@@ -356,9 +357,10 @@ namespace Nektar
MPI_Op vOp;
switch (pOp)
{
case ReduceSum: vOp = MPI_SUM; break;
case ReduceMax: vOp = MPI_MAX; break;
case ReduceMin: vOp = MPI_MIN; break;
case ReduceSum:
default: vOp = MPI_SUM; break;
}
int retval = MPI_Allreduce( MPI_IN_PLACE,
&pData,
......@@ -385,9 +387,10 @@ namespace Nektar
MPI_Op vOp;
switch (pOp)
{
case ReduceSum: vOp = MPI_SUM; break;
case ReduceMax: vOp = MPI_MAX; break;
case ReduceMin: vOp = MPI_MIN; break;
case ReduceSum:
default: vOp = MPI_SUM; break;
}
int retval = MPI_Allreduce( MPI_IN_PLACE,
pData.get(),
......@@ -414,9 +417,10 @@ namespace Nektar
MPI_Op vOp;
switch (pOp)
{
case ReduceSum: vOp = MPI_SUM; break;
case ReduceMax: vOp = MPI_MAX; break;
case ReduceMin: vOp = MPI_MIN; break;
case ReduceSum:
default: vOp = MPI_SUM; break;
}
int retval = MPI_Allreduce( MPI_IN_PLACE,
pData.get(),
......
......@@ -121,13 +121,12 @@ namespace Nektar
TiXmlElement* geometry_tag = pSession->GetElement("NEKTAR/GEOMETRY");
TiXmlAttribute *attr = geometry_tag->FirstAttribute();
int meshDim = 0;
int err = 0;
while (attr)
{
std::string attrName(attr->Name());
if (attrName == "DIM")
{
err = attr->QueryIntValue(&meshDim);
int err = attr->QueryIntValue(&meshDim);
ASSERTL1(err==TIXML_SUCCESS, "Unable to read mesh dimension.");
break;
}
......@@ -817,8 +816,12 @@ namespace Nektar
CompositeMap compositeVector;
GetCompositeList(compositeListStr, compositeVector);
ExpansionType expansion_type_x, expansion_type_y, expansion_type_z;
int num_modes_x, num_modes_y, num_modes_z;
ExpansionType expansion_type_x = eNoExpansionType;
ExpansionType expansion_type_y = eNoExpansionType;
ExpansionType expansion_type_z = eNoExpansionType;
int num_modes_x = 0;
int num_modes_y = 0;
int num_modes_z = 0;
LibUtilities::BasisKeyVector basiskeyvec;
......
......@@ -386,7 +386,7 @@ namespace Nektar
const TriGeom &face1,
const TriGeom &face2)
{
StdRegions::Orientation returnval;
StdRegions::Orientation returnval = StdRegions::eNoOrientation;
int i, j, map[3] = {-1,-1,-1};
NekDouble x, y, z, x1, y1, z1, cx = 0.0, cy = 0.0, cz = 0.0;
......
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