mirror of
https://github.com/NGSolve/netgen.git
synced 2025-01-13 06:30:34 +05:00
Merge branch 'master' into mesh_only_one_domain
This commit is contained in:
commit
8870108846
@ -172,7 +172,6 @@ if (USE_GUI)
|
|||||||
get_filename_component(MY_LIB_DIR ${TK_LIBRARY} DIRECTORY)
|
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}/tcl8.6" DESTINATION lib COMPONENT netgen )
|
||||||
install( DIRECTORY "${MY_LIB_DIR}/tk8.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 )
|
install( DIRECTORY "${MY_LIB_DIR}/../bin" DESTINATION . COMPONENT netgen )
|
||||||
add_definitions(-DTOGL_WGL)
|
add_definitions(-DTOGL_WGL)
|
||||||
else(WIN32)
|
else(WIN32)
|
||||||
|
@ -344,6 +344,7 @@ namespace netgen
|
|||||||
default:
|
default:
|
||||||
PrintSysError ("Element2d::SetType, illegal type ", int(typ));
|
PrintSysError ("Element2d::SetType, illegal type ", int(typ));
|
||||||
}
|
}
|
||||||
|
is_curved = (np >= 4);
|
||||||
}
|
}
|
||||||
///
|
///
|
||||||
int GetNP() const { return np; }
|
int GetNP() const { return np; }
|
||||||
|
@ -441,8 +441,7 @@ namespace netgen
|
|||||||
// External access to the mesh generation functions within the OCC
|
// External access to the mesh generation functions within the OCC
|
||||||
// subsystem (Not sure if this is the best way to implement this....!!)
|
// subsystem (Not sure if this is the best way to implement this....!!)
|
||||||
extern int OCCGenerateMesh (OCCGeometry & occgeometry, shared_ptr<Mesh> & mesh,
|
extern int OCCGenerateMesh (OCCGeometry & occgeometry, shared_ptr<Mesh> & mesh,
|
||||||
MeshingParameters & mparam,
|
MeshingParameters & mparam);
|
||||||
int perfstepsstart, int perfstepsend);
|
|
||||||
|
|
||||||
extern void OCCSetLocalMeshSize(OCCGeometry & geom, Mesh & mesh);
|
extern void OCCSetLocalMeshSize(OCCGeometry & geom, Mesh & mesh);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user