Commit 7d8b960f authored by Dave Moxey's avatar Dave Moxey
Browse files

Missing items from previous commit.

parent 9263d431
......@@ -233,9 +233,14 @@ IF( WIN32 )
ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_IOSTREAMS_DYN_LINK -DBOOST_THREAD_DYN_LINK)
ENDIF( )
# Set up include directories
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${LOKI_INCLUDE_DIR} ${TINYXML_BASE})
# Set up include directories. Include work-around for -isystem for CMake (see
# bug 0010837) to avoid unnecessary compiler warnings for third-party libs.
IF (APPLE)
SET(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
ENDIF (APPLE)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${LOKI_INCLUDE_DIR} ${TINYXML_BASE})
INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
# Build active components
......
......@@ -501,10 +501,6 @@ namespace Nektar
ASSERTL0(false,
"Parallel transposition not implemented yet for "
"3D-Homo-2D approach.");
int num_dofs = inarray.num_elements();
int num_points_per_line = num_dofs /
(m_num_points_per_proc[0]*m_num_points_per_proc[1]);
}
else
{
......
......@@ -269,7 +269,6 @@ namespace Nektar
{
int i;
int order_f = FaceExp->GetNcoeffs();
int nquad_f = FaceExp->GetNumPoints(0)*FaceExp->GetNumPoints(1);
Array<OneD, NekDouble> coeff(order_f);
StdRegions::IndexMapKey ikey(
......
......@@ -368,9 +368,7 @@ namespace Nektar
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();
const int nqtot = GetTotPoints();
Array<OneD, const NekDouble> jac = m_metricinfo->GetJac();
Array<OneD, NekDouble> tmp(nqtot);
......
......@@ -178,7 +178,7 @@ namespace Nektar
if(j != IDs.num_elements())
{
m_outputPlane == j;
m_outputPlane = j;
procList[i] = vRank;
}
}
......
......@@ -46,8 +46,8 @@ namespace Nektar
Geometry::Geometry():
m_coordim(0),
m_state(eNotFilled),
m_geomFactorsState(eNotFilled),
m_state(eNotFilled),
m_geomShapeType(eNoGeomShapeType),
m_globalID(-1)
{
......@@ -55,8 +55,8 @@ namespace Nektar
Geometry::Geometry(const int coordim):
m_coordim(coordim),
m_state(eNotFilled),
m_geomFactorsState(eNotFilled),
m_state(eNotFilled),
m_geomShapeType(eNoGeomShapeType),
m_globalID(-1)
{
......
......@@ -142,7 +142,7 @@ namespace Nektar
//Interpolate derivative metric at Lcoords
der1_x = m_xmap[0]->PhysEvaluate(Lcoords, D1Dx);
der2_x = m_xmap[0]->PhysEvaluate(Lcoords, D1Dy);
der3_z = m_xmap[0]->PhysEvaluate(Lcoords, D1Dz);
der3_x = m_xmap[0]->PhysEvaluate(Lcoords, D1Dz);
der1_y = m_xmap[1]->PhysEvaluate(Lcoords, D2Dx);
der2_y = m_xmap[1]->PhysEvaluate(Lcoords, D2Dy);
der3_y = m_xmap[1]->PhysEvaluate(Lcoords, D2Dz);
......@@ -234,7 +234,6 @@ namespace Nektar
if (m_geomFactorsState != ePtsFilled)
{
GeomType Gtype = eRegular;
GeomShapeType GSType = eQuadrilateral;
v_FillGeom();
......
......@@ -2880,6 +2880,8 @@ namespace Nektar
case eModifiedQuadPlus2:
quadoffset = 3;
break;
default:
break;
}
switch(type)
......
......@@ -657,7 +657,6 @@ namespace Nektar
{
if(GetGtype() == eRegular)
{
int i;
NekDouble coords2 = (m_coordim == 3)? coords[2]: 0.0;
VertexComponent dv1, dv2, norm, orth1, orth2;
VertexComponent xin(m_coordim,0,coords[0],coords[1],coords2);
......
......@@ -313,7 +313,6 @@ namespace Nektar
if (m_geomFactorsState != ePtsFilled)
{
SpatialDomains::GeomType gType = eRegular;
const SpatialDomains::GeomType kDeformedType = eDeformed;
SegGeom::v_FillGeom();
......
......@@ -350,7 +350,7 @@ namespace Nektar
eta_x = m_base[0]->GetZ();
eta_z = m_base[2]->GetZ();
int i, j, k;
int i, k;
bool Do_1 = (out_dxi1.num_elements() > 0)? true:false;
bool Do_3 = (out_dxi3.num_elements() > 0)? true:false;
......
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