Commit 955fced9 authored by Michael Turner's avatar Michael Turner

chris' comments

parent 4517b882
......@@ -20,7 +20,7 @@ IF(NEKTAR_USE_OCC)
EXTERNALPROJECT_ADD(
opencascade-6.8
PREFIX ${TPSRC}
URL http://ae-nektar.ae.ic.ac.uk/~mt4313/OCC680osx64.tgz
URL ${TPURL}/OCC680osx64.tgz
URL_MD5 626292523b0691304f0fa271989fbc44
STAMP_DIR ${TPBUILD}/stamp
BINARY_DIR ${TPBUILD}/opencascade-6.8
......@@ -39,7 +39,7 @@ IF(NEKTAR_USE_OCC)
EXTERNALPROJECT_ADD(
opencascade-6.8
PREFIX ${TPSRC}
URL http://ae-nektar.ae.ic.ac.uk/~mt4313/OCC680lin64.tgz
URL ${TPURL}/OCC680lin64.tgz
URL_MD5 d655b6f50998bb9600e081907c247793
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
......@@ -48,7 +48,7 @@ IF(NEKTAR_USE_OCC)
UPDATE_COMMAND ""
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND cp -a ${TPSRC}/opencascade-6.8/i686/lib/. ${TPDIST}/lib/ COMMAND cp -a ${TPSRC}/opencascade-6.8/i686/inc/. ${TPDIST}/include/
INSTALL_COMMAND cp -a ${TPSRC}/opencascade-6.8/lib/. ${TPDIST}/lib/ COMMAND cp -a ${TPSRC}/opencascade-6.8/inc/. ${TPDIST}/include/
)
LINK_DIRECTORIES(${TPDIST}/lib)
INCLUDE_DIRECTORIES(SYSTEM ${TPDIST}/include)
......
......@@ -53,8 +53,11 @@ namespace Nektar
static const NekDouble kNekSqrtTol = 1.0e-16;
static const NekDouble kNekIterativeTol = 1e-09;
static const NekDouble kNekSparseNonZeroTol = 1e-16;
//toleranecs for mesh generation and cad handling
static const NekDouble GeomTol = 1E-3;
static const NekDouble CoinTol = 1E-6;
}
} //end of namespace
#endif
......@@ -29,7 +29,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// Description: cad object surfcae methods.
// Description: cad object surface methods.
//
////////////////////////////////////////////////////////////////////////////////
......@@ -85,7 +85,8 @@ Array<OneD, NekDouble> CADSurf::locuv(Array<OneD, NekDouble> p)
uvr[0] = ui;
uvr[1] = vi;
ASSERTL1(projection.Distance(1) < 1E-3, "large locuv distance");
ASSERTL1(projection.Distance(1) < NekConstants::GeomTol,
"large locuv distance");
return uvr;
}
......
......@@ -126,28 +126,28 @@ SET(FoundationHeaders
SET(FoundationSources
./Foundations/Basis.cpp
./Foundations/BLPoints.cpp
./Foundations/FourierPoints.cpp
./Foundations/FourierSingleModePoints.cpp
./Foundations/GaussPoints.cpp
./Foundations/Graph.cpp
./Foundations/InterpCoeff.cpp
./Foundations/Interp.cpp
./Foundations/ManagerAccess.cpp
./Foundations/BLPoints.cpp
./Foundations/FourierPoints.cpp
./Foundations/FourierSingleModePoints.cpp
./Foundations/GaussPoints.cpp
./Foundations/Graph.cpp
./Foundations/InterpCoeff.cpp
./Foundations/Interp.cpp
./Foundations/ManagerAccess.cpp
./Foundations/NodalPrismEvenlySpaced.cpp
./Foundations/NodalTetElec.cpp
./Foundations/NodalTetElec.cpp
./Foundations/NodalTetEvenlySpaced.cpp
./Foundations/NodalTriElec.cpp
./Foundations/NodalTriElec.cpp
./Foundations/NodalTriEvenlySpaced.cpp
./Foundations/NodalTriFekete.cpp
./Foundations/NodalUtil.cpp
./Foundations/NodalTriFekete.cpp
./Foundations/NodalUtil.cpp
./Foundations/PhysGalerkinProject.cpp
./Foundations/Points.cpp
./Foundations/PolyEPoints.cpp
./Foundations/Points.cpp
./Foundations/PolyEPoints.cpp
)
SET(InterpreterHeaders
./Interpreter/AnalyticExpressionEvaluator.hpp
./Interpreter/AnalyticExpressionEvaluator.hpp
)
SET(InterpreterSources
......@@ -155,11 +155,11 @@ SET(InterpreterSources
)
SET(KernelHeaders
./Kernel/kernel.h
./Kernel/kernel.h
)
SET(KernelSources
./Kernel/kernel.cpp
./Kernel/kernel.cpp
)
SET(LinearAlgebraHeaders
......@@ -235,20 +235,20 @@ IF(NEKTAR_USING_SMV)
ENDIF(NEKTAR_USING_SMV)
SET(MemoryHeaders
./Memory/ThreadSpecificPool.hpp
./Memory/NekMemoryManager.hpp
./Memory/ThreadSpecificPool.hpp
./Memory/NekMemoryManager.hpp
)
SET(MemorySources
./Memory/ThreadSpecificPool.cpp
./Memory/ThreadSpecificPool.cpp
)
SET(PolyLibHeaders
./Polylib/Polylib.h
./Polylib/Polylib.h
)
SET(PolylibSources
./Polylib/Polylib.cpp
./Polylib/Polylib.cpp
)
SET(TimeIntegrationHeaders
......@@ -315,21 +315,21 @@ SOURCE_GROUP("FFT Headers" FILES ${FFTHeaders})
SOURCE_GROUP("FFT Sources" FILES ${FFTSources})
IF(NEKTAR_USE_OCC)
SET(CADSystemSources
./CADSystem/CADSystem.cpp
SET(CADSystemSources
./CADSystem/CADSystem.cpp
./CADSystem/CADCurve.cpp
./CADSystem/CADSurf.cpp
)
)
SET(CADSystemHeaders
./CADSystem/CADSystem.h
SET(CADSystemHeaders
./CADSystem/CADSystem.h
./CADSystem/CADCurve.h
./CADSystem/CADSurf.h
./CADSystem/OpenCascade.h
)
)
SOURCE_GROUP("CAD System Headers" FILES ${CADSystemHeaders})
SOURCE_GROUP("CAD System Sources" FILES ${CADSystemSources})
SOURCE_GROUP("CAD System Headers" FILES ${CADSystemHeaders})
SOURCE_GROUP("CAD System Sources" FILES ${CADSystemSources})
ENDIF(NEKTAR_USE_OCC)
......@@ -337,16 +337,16 @@ SOURCE_GROUP("Base" FILES ${BaseHeaders})
SET(LibUtilityHeaders
${MemoryHeaders}
${BasicUtilsHeaders}
${ExpressionTemplates}
${PolyLibHeaders}
${BasicUtilsHeaders}
${ExpressionTemplates}
${PolyLibHeaders}
${CommunicationHeaders}
${FoundationHeaders}
${CADSystemHeaders}
${LinearAlgebraHeaders}
${BasicConstHeaders}
${InterpreterHeaders}
${KernelHeaders}
${FoundationHeaders}
${CADSystemHeaders}
${LinearAlgebraHeaders}
${BasicConstHeaders}
${InterpreterHeaders}
${KernelHeaders}
${TimeIntegrationHeaders}
${FFTHeaders}
${BaseHeaders}
......@@ -378,11 +378,7 @@ ADD_DEFINITIONS(-DLIB_UTILITIES_EXPORTS)
ADD_NEKTAR_LIBRARY(LibUtilities lib ${NEKTAR_LIBRARY_TYPE} ${LibUtilitySources} ${LibUtilityHeaders})
IF(NEKTAR_USE_OCC)
ADD_DEPENDENCIES(LibUtilities modmetis-5.1.0 boost tinyxml-2.6.2 zlib-1.2.7 opencascade-6.8)
ELSE()
ADD_DEPENDENCIES(LibUtilities modmetis-5.1.0 boost tinyxml-2.6.2 zlib-1.2.7)
ENDIF()
ADD_DEPENDENCIES(LibUtilities modmetis-5.1.0 boost tinyxml-2.6.2 zlib-1.2.7)
### Libraries needed specifically by LibUtilities ###
......@@ -486,6 +482,7 @@ IF(NEKTAR_USE_OCC)
SET(OCC_DEF LIN LININTEL HAVE_WOK_CONFIG_H HAVE_CONFIG_H CSFDB)
SET_TARGET_PROPERTIES(LibUtilities PROPERTIES COMPILE_DEFINITIONS "${OCC_DEF}")
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${OCC_LIBS})
ADD_DEPENDENCIES(LibUtilities opencascade-6.8)
ENDIF(NEKTAR_USE_OCC)
INSTALL(FILES ${ExpressionTemplates} DESTINATION ${NEKTAR_INCLUDE_DIR}/ExpressionTemplates COMPONENT dev)
......
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