Skip to content
Snippets Groups Projects
Commit 08d636cc authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix embed

parent c75852c4
No related branches found
No related tags found
No related merge requests found
// $Id: GModel.cpp,v 1.95 2008-07-08 12:43:25 geuzaine Exp $ // $Id: GModel.cpp,v 1.96 2008-07-10 14:35:39 geuzaine Exp $
// //
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
// //
...@@ -131,8 +131,10 @@ void GModel::destroyMeshCaches() ...@@ -131,8 +131,10 @@ void GModel::destroyMeshCaches()
{ {
_vertexVectorCache.clear(); _vertexVectorCache.clear();
_vertexMapCache.clear(); _vertexMapCache.clear();
#if !defined(HAVE_GMSH_EMBEDDED)
if(_octree) Octree_Delete(_octree); if(_octree) Octree_Delete(_octree);
_octree = 0; _octree = 0;
#endif
} }
GRegion *GModel::getRegionByTag(int n) const GRegion *GModel::getRegionByTag(int n) const
......
# $Id: Makefile,v 1.493 2008-07-10 13:29:23 geuzaine Exp $ # $Id: Makefile,v 1.494 2008-07-10 14:35:39 geuzaine Exp $
# #
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
# #
...@@ -102,8 +102,8 @@ uninstall-lib: ...@@ -102,8 +102,8 @@ uninstall-lib:
rm -rf ${libdir}/libGmsh${LIBSUFFIX}${LIBEXT} rm -rf ${libdir}/libGmsh${LIBSUFFIX}${LIBEXT}
embed: embed:
@if [ -r ../getdp2/contrib/gmsh/Makefile ]; then \ @if [ -r ../getdp/contrib/gmsh/Makefile ]; then \
rsync -av ${GMSH_EMBEDDED} ../getdp2/contrib/gmsh;\ rsync -av ${GMSH_EMBEDDED} ../getdp/contrib/gmsh;\
fi fi
variables: configure variables: configure
......
...@@ -12,6 +12,7 @@ public: ...@@ -12,6 +12,7 @@ public:
hide_unselected = 0; hide_unselected = 0;
geom.tolerance = 1.e-6; geom.tolerance = 1.e-6;
mesh.reverse_all_normals = 1; mesh.reverse_all_normals = 1;
mesh.second_order_experimental = 0;
pick_elements = 0; pick_elements = 0;
} }
double lc; double lc;
...@@ -22,6 +23,7 @@ public: ...@@ -22,6 +23,7 @@ public:
} geom; } geom;
struct{ struct{
int reverse_all_normals; int reverse_all_normals;
int second_order_experimental;
} mesh; } mesh;
unsigned int PACK_COLOR(int,int,int,int){ return 0; } unsigned int PACK_COLOR(int,int,int,int){ return 0; }
int UNPACK_RED(unsigned int){ return 0; } int UNPACK_RED(unsigned int){ return 0; }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment