ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-12 22:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mesh_only_one_domain

Browse Source
This commit is contained in:
Christopher Lackner 2016-12-09 16:36:50 +01:00
commit 8870108846
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -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)

1
libsrc/meshing/meshtype.hpp
View File

@ -344,6 +344,7 @@ namespace netgen
default:
PrintSysError ("Element2d::SetType, illegal type ", int(typ));
}
is_curved = (np >= 4);
}
///
int GetNP() const { return np; }

3
libsrc/occ/occgeom.hpp
View File

@ -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> & mesh,
MeshingParameters & mparam,
int perfstepsstart, int perfstepsend);
MeshingParameters & mparam);
extern void OCCSetLocalMeshSize(OCCGeometry & geom, Mesh & mesh);