Commit 9feb5d09 authored by Spencer Sherwin's avatar Spencer Sherwin
Browse files

Updates from Chris's review

parent 162e4be3
......@@ -177,6 +177,7 @@ INCLUDE (ThirdPartyPETSc)
INCLUDE (ThirdPartyVTK)
INCLUDE (ThirdPartyQT4)
INCLUDE (ThirdPartySMV)
#INCLUDE (ThirdPartyCCM)
INCLUDE (Doxygen)
......
......@@ -5,6 +5,7 @@ SET(MeshConvertHeaders
InputPly.h
InputSem.h
InputSwan.h
InputStar.h
InputStarTec.h
MeshElements.h
Module.h
......@@ -28,6 +29,7 @@ SET(MeshConvertSources
InputPly.cpp
InputSem.cpp
InputSwan.cpp
InputStar.cpp
InputStarTec.cpp
MeshConvert.cpp
MeshElements.cpp
......@@ -60,6 +62,9 @@ IF (NEKTAR_USE_VTK)
ENDIF ()
ENDIF (NEKTAR_USE_VTK)
TARGET_LINK_LIBRARIES(MeshConvert ccmio adf)
# Gmsh tests
ADD_NEKTAR_TEST (Gmsh/CubeAllElements)
ADD_NEKTAR_TEST (Gmsh/CubeHex)
......
......@@ -425,7 +425,7 @@ namespace Nektar
}
void PrismLineFaces(int prismid, map<int, int> &facelist,
static void PrismLineFaces(int prismid, map<int, int> &facelist,
vector<vector<int> > &FacesToPrisms,
vector<vector<int> > &PrismsToFaces,
vector<bool> &PrismDone);
......@@ -644,7 +644,7 @@ namespace Nektar
void PrismLineFaces(int prismid, map<int, int> &facelist,
static void PrismLineFaces(int prismid, map<int, int> &facelist,
vector<vector<int> > &FaceToPrisms,
vector<vector<int> > &PrismToFaces,
vector<bool> &PrismDone)
......
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