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

*** empty log message ***

parent 491f8325
No related branches found
No related tags found
No related merge requests found
...@@ -223,14 +223,10 @@ void GModel::snapVertices() ...@@ -223,14 +223,10 @@ void GModel::snapVertices()
std::vector<GEntity*> GModel::getEntities() std::vector<GEntity*> GModel::getEntities()
{ {
std::vector<GEntity*> entities; std::vector<GEntity*> entities;
for(GModel::viter it = firstVertex(); it != lastVertex(); ++it) entities.insert(entities.end(), vertices.begin(), vertices.end());
entities.push_back(*it); entities.insert(entities.end(), edges.begin(), edges.end());
for(GModel::eiter it = firstEdge(); it != lastEdge(); ++it) entities.insert(entities.end(), faces.begin(), faces.end());
entities.push_back(*it); entities.insert(entities.end(), regions.begin(), regions.end());
for(GModel::fiter it = firstFace(); it != lastFace(); ++it)
entities.push_back(*it);
for(GModel::riter it = firstRegion(); it != lastRegion(); ++it)
entities.push_back(*it);
return entities; return entities;
} }
......
...@@ -138,7 +138,7 @@ int GModel::readMED(const std::string &name) ...@@ -138,7 +138,7 @@ int GModel::readMED(const std::string &name)
MEDversionDonner(&v[0], &v[1], &v[2]); MEDversionDonner(&v[0], &v[1], &v[2]);
MEDversionLire(fid, &vf[0], &vf[1], &vf[2]); MEDversionLire(fid, &vf[0], &vf[1], &vf[2]);
Msg::Info("Reading MED file V%d.%d.%d using MED library V%d.%d.%d", Msg::Info("Reading MED file V%d.%d.%d using MED library V%d.%d.%d",
vf[0], vf[1], vf[2], v[0], v[1], v[2]); vf[0], vf[1], vf[2], v[0], v[1], v[2]);
if(vf[0] < 2 || (vf[0] == 2 && vf[1] < 2)){ if(vf[0] < 2 || (vf[0] == 2 && vf[1] < 2)){
Msg::Error("Cannot read MED file older than V2.2"); Msg::Error("Cannot read MED file older than V2.2");
return 0; return 0;
...@@ -394,14 +394,10 @@ int GModel::writeMED(const std::string &name, bool saveAll, double scalingFactor ...@@ -394,14 +394,10 @@ int GModel::writeMED(const std::string &name, bool saveAll, double scalingFactor
// connectivity is given in terms of vertex indices) // connectivity is given in terms of vertex indices)
indexMeshVertices(saveAll); indexMeshVertices(saveAll);
// fill a vector containing all the geometrical entities in the // get a vector containing all the geometrical entities in the
// model (the ordering of the entities must be the same as the one // model (the ordering of the entities must be the same as the one
// used during the indexing of the vertices) // used during the indexing of the vertices)
std::vector<GEntity*> entities; std::vector<GEntity*> entities = getEntities();
entities.insert(entities.end(), vertices.begin(), vertices.end());
entities.insert(entities.end(), edges.begin(), edges.end());
entities.insert(entities.end(), faces.begin(), faces.end());
entities.insert(entities.end(), regions.begin(), regions.end());
std::map<GEntity*, int> families; std::map<GEntity*, int> families;
......
...@@ -3499,7 +3499,7 @@ case "$UNAME" in ...@@ -3499,7 +3499,7 @@ case "$UNAME" in
UNAME="${UNAME}-no-cygwin" UNAME="${UNAME}-no-cygwin"
CC="${CC} -mno-cygwin" CC="${CC} -mno-cygwin"
CXX="${CXX} -mno-cygwin" CXX="${CXX} -mno-cygwin"
LINKER="${LINKER} -mno-cygwin -Wl,--stack,16777216" LINKER="${LINKER} -mno-cygwin"
fi fi
;; ;;
esac esac
...@@ -5850,7 +5850,7 @@ GMSH_LIBS="${GMSH_LIBS} -lm" ...@@ -5850,7 +5850,7 @@ GMSH_LIBS="${GMSH_LIBS} -lm"
case "$UNAME" in case "$UNAME" in
CYGWIN* | MINGW*) CYGWIN* | MINGW*)
LINKER="${LINKER} -mwindows" LINKER="${LINKER} -mwindows -Wl,--stack,16777216"
if test "x$enable_cygwin" != "xyes"; then if test "x$enable_cygwin" != "xyes"; then
FLAGS="${FLAGS} -DHAVE_NO_DLL" FLAGS="${FLAGS} -DHAVE_NO_DLL"
fi fi
......
...@@ -183,9 +183,7 @@ case "$UNAME" in ...@@ -183,9 +183,7 @@ case "$UNAME" in
UNAME="${UNAME}-no-cygwin" UNAME="${UNAME}-no-cygwin"
CC="${CC} -mno-cygwin" CC="${CC} -mno-cygwin"
CXX="${CXX} -mno-cygwin" CXX="${CXX} -mno-cygwin"
dnl increase stack size to 16Mb to avoid stack overflows in LINKER="${LINKER} -mno-cygwin"
dnl recursive tet classification for large 3D Delaunay grids
LINKER="${LINKER} -mno-cygwin -Wl,--stack,16777216"
fi fi
;; ;;
esac esac
...@@ -749,7 +747,9 @@ dnl Modify defaults according to OS ...@@ -749,7 +747,9 @@ dnl Modify defaults according to OS
case "$UNAME" in case "$UNAME" in
CYGWIN* | MINGW*) CYGWIN* | MINGW*)
LINKER="${LINKER} -mwindows" dnl increase stack size to 16Mb to avoid stack overflows in
dnl recursive tet classification for large 3D Delaunay grids
LINKER="${LINKER} -mwindows -Wl,--stack,16777216"
if test "x$enable_cygwin" != "xyes"; then if test "x$enable_cygwin" != "xyes"; then
FLAGS="${FLAGS} -DHAVE_NO_DLL" FLAGS="${FLAGS} -DHAVE_NO_DLL"
fi fi
......
...@@ -99,7 +99,7 @@ paper is in preparation, but is not yet ready. ...@@ -99,7 +99,7 @@ paper is in preparation, but is not yet ready.
Gmsh is developed by Christophe Geuzaine Gmsh is developed by Christophe Geuzaine
(<a href="http://www.ulg.ac.be/">University of Li&egrave;ge</a>) and (<a href="http://www.ulg.ac.be/">University of Li&egrave;ge</a>) and
Jean-Franois Remacle (<a href="http://www.ucl.ac.be/">Catholic Jean-Franois Remacle (<a href="http://www.ucl.ac.be/">Catholic
University of Louvain</a>). The <a href="doc/CREDITS.txt">CREDITS</a> University of Louvain</a>). The <a href="/gmsh/doc/CREDITS.txt">CREDITS</a>
file has more information. file has more information.
<p> <p>
Please use <a HREF="mailto:gmsh@geuz.org">gmsh@geuz.org</a> to send Please use <a HREF="mailto:gmsh@geuz.org">gmsh@geuz.org</a> to send
...@@ -158,8 +158,8 @@ We need your help to build a <a href="/gmsh/wiki/FrontPage">library of examples< ...@@ -158,8 +158,8 @@ We need your help to build a <a href="/gmsh/wiki/FrontPage">library of examples<
Gmsh is copyright (C) 1997-2008 by C. Geuzaine and J.-F. Remacle and Gmsh is copyright (C) 1997-2008 by C. Geuzaine and J.-F. Remacle and
is distributed under the terms of is distributed under the terms of
the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public
License (GPL)</a> (with an exception to allow for easier linking with License (GPL)</a> (with an <a href="/gmsh/doc/LICENSE.txt">exception</a>
external mesh generators). to allow for easier linking with external mesh generators).
<p> <p>
In short, this means that everyone is free to use Gmsh and to In short, this means that everyone is free to use Gmsh and to
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment