diff --git a/CMakeLists.txt b/CMakeLists.txt index d2766638..e6df0df2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,7 +172,6 @@ if (USE_GUI) get_filename_component(MY_LIB_DIR ${TK_LIBRARY} DIRECTORY) install( DIRECTORY "${MY_LIB_DIR}/tcl8.6" DESTINATION lib COMPONENT netgen ) install( DIRECTORY "${MY_LIB_DIR}/tk8.6" DESTINATION lib COMPONENT netgen ) - install( DIRECTORY "${MY_LIB_DIR}/tix8.4.3" DESTINATION lib COMPONENT netgen ) install( DIRECTORY "${MY_LIB_DIR}/../bin" DESTINATION . COMPONENT netgen ) add_definitions(-DTOGL_WGL) else(WIN32) diff --git a/libsrc/meshing/meshtype.hpp b/libsrc/meshing/meshtype.hpp index dfdf889a..3703c6b6 100644 --- a/libsrc/meshing/meshtype.hpp +++ b/libsrc/meshing/meshtype.hpp @@ -344,6 +344,7 @@ namespace netgen default: PrintSysError ("Element2d::SetType, illegal type ", int(typ)); } + is_curved = (np >= 4); } /// int GetNP() const { return np; } diff --git a/libsrc/occ/occgeom.hpp b/libsrc/occ/occgeom.hpp index 9e79c2a1..ca74b5b0 100644 --- a/libsrc/occ/occgeom.hpp +++ b/libsrc/occ/occgeom.hpp @@ -441,8 +441,7 @@ namespace netgen // External access to the mesh generation functions within the OCC // subsystem (Not sure if this is the best way to implement this....!!) extern int OCCGenerateMesh (OCCGeometry & occgeometry, shared_ptr & mesh, - MeshingParameters & mparam, - int perfstepsstart, int perfstepsend); + MeshingParameters & mparam); extern void OCCSetLocalMeshSize(OCCGeometry & geom, Mesh & mesh);