Commit 1e631005 authored by Dave Moxey's avatar Dave Moxey

Fix Fekete/Elec inconsistency, CMake issues for OCC, PETSc library issue for Debian 9

parent cc8c8918
......@@ -72,6 +72,7 @@ find_path (PETSC_DIR include/petsc.h
HINTS ENV PETSC_DIR
PATHS
# Debian paths
/usr/lib/petsc
/usr/lib/petscdir/3.5.1 /usr/lib/petscdir/3.5
/usr/lib/petscdir/3.4.2 /usr/lib/petscdir/3.4
/usr/lib/petscdir/3.3 /usr/lib/petscdir/3.2 /usr/lib/petscdir/3.1
......
......@@ -10,7 +10,7 @@ IF(NEKTAR_USE_MESHGEN)
# Try to find installed version of OpenCascade
INCLUDE(FindOCC)
IF (OCE_FOUND)
IF (OCC_FOUND)
SET(BUILD_OCE OFF)
ELSE()
SET(BUILD_OCE ON)
......@@ -22,13 +22,13 @@ IF(NEKTAR_USE_MESHGEN)
IF (THIRDPARTY_BUILD_OCE)
INCLUDE(ExternalProject)
SET(OCE_LIBRARIES_TMP PTKernel TKernel TKMath TKBRep TKIGES TKSTEP TKSTEPAttr
SET(OCC_LIBRARIES_TMP PTKernel TKernel TKMath TKBRep TKIGES TKSTEP TKSTEPAttr
TKSTEP209 TKSTEPBase TKShapeSchema TKGeomBase TKGeomAlgo TKG3d TKG2d
TKXSBase TKPShape TKTopAlgo TKShHealing)
FOREACH(OCE_LIB ${OCE_LIBRARIES_TMP})
LIST(APPEND OCE_LIBRARIES ${TPDIST}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${OCE_LIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
FOREACH(OCC_LIB ${OCC_LIBRARIES_TMP})
LIST(APPEND OCC_LIBRARIES ${TPDIST}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${OCC_LIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
ENDFOREACH()
UNSET(OCE_LIBRARIES_TMP)
UNSET(OCC_LIBRARIES_TMP)
IF(WIN32)
MESSAGE(SEND_ERROR "Cannot currently use OpenCascade with Nektar++ on Windows")
......@@ -68,7 +68,7 @@ IF(NEKTAR_USE_MESHGEN)
INCLUDE_DIRECTORIES(SYSTEM ${TPDIST}/include/oce)
ELSE()
ADD_CUSTOM_TARGET(oce-0.17 ALL)
SET(OPENCASCADE_CONFIG_INCLUDE_DIR ${OCE_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(SYSTEM ${OCE_INCLUDE_DIRS})
SET(OPENCASCADE_CONFIG_INCLUDE_DIR ${OCC_INCLUDE_DIR})
INCLUDE_DIRECTORIES(SYSTEM ${OCC_INCLUDE_DIR})
ENDIF()
ENDIF()
......@@ -94,7 +94,7 @@ ENDIF()
IF(NEKTAR_USE_MESHGEN)
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${TETGEN_LIBRARY})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PUBLIC ${OCE_LIBRARIES})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PUBLIC ${OCC_LIBRARIES})
ADD_DEPENDENCIES(NekMeshUtils oce-0.17 tetgen-1.5)
ENDIF()
......
......@@ -253,7 +253,7 @@ void SurfaceMesh::HOSurf()
LibUtilities::PointsManager()[ekey]->GetPoints(gll);
LibUtilities::PointsKey pkey(m_mesh->m_nummode,
LibUtilities::eNodalTriFekete);
LibUtilities::eNodalTriElec);
Array<OneD, NekDouble> u, v;
int nq = m_mesh->m_nummode;
......
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