From 3dcf6f355e1ed8a1f848b8bebe33a952363ab0eb Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 19 Jul 2008 09:02:05 +0000
Subject: [PATCH] *** empty log message ***
---
Geo/GModel.cpp | 12 ++++--------
Geo/GModelIO_MED.cpp | 10 +++-------
configure | 4 ++--
configure.in | 8 ++++----
doc/gmsh.html | 6 +++---
5 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index f79ac22990..b434e9177f 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -223,14 +223,10 @@ void GModel::snapVertices()
std::vector<GEntity*> GModel::getEntities()
{
std::vector<GEntity*> entities;
- for(GModel::viter it = firstVertex(); it != lastVertex(); ++it)
- entities.push_back(*it);
- for(GModel::eiter it = firstEdge(); it != lastEdge(); ++it)
- entities.push_back(*it);
- for(GModel::fiter it = firstFace(); it != lastFace(); ++it)
- entities.push_back(*it);
- for(GModel::riter it = firstRegion(); it != lastRegion(); ++it)
- entities.push_back(*it);
+ 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());
return entities;
}
diff --git a/Geo/GModelIO_MED.cpp b/Geo/GModelIO_MED.cpp
index 0d0ef637e6..e93e562a9d 100644
--- a/Geo/GModelIO_MED.cpp
+++ b/Geo/GModelIO_MED.cpp
@@ -138,7 +138,7 @@ int GModel::readMED(const std::string &name)
MEDversionDonner(&v[0], &v[1], &v[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",
- 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)){
Msg::Error("Cannot read MED file older than V2.2");
return 0;
@@ -394,14 +394,10 @@ int GModel::writeMED(const std::string &name, bool saveAll, double scalingFactor
// connectivity is given in terms of vertex indices)
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
// used during the indexing of the vertices)
- std::vector<GEntity*> entities;
- 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::vector<GEntity*> entities = getEntities();
std::map<GEntity*, int> families;
diff --git a/configure b/configure
index 2aa4f8d8ec..7411648e18 100755
--- a/configure
+++ b/configure
@@ -3499,7 +3499,7 @@ case "$UNAME" in
UNAME="${UNAME}-no-cygwin"
CC="${CC} -mno-cygwin"
CXX="${CXX} -mno-cygwin"
- LINKER="${LINKER} -mno-cygwin -Wl,--stack,16777216"
+ LINKER="${LINKER} -mno-cygwin"
fi
;;
esac
@@ -5850,7 +5850,7 @@ GMSH_LIBS="${GMSH_LIBS} -lm"
case "$UNAME" in
CYGWIN* | MINGW*)
- LINKER="${LINKER} -mwindows"
+ LINKER="${LINKER} -mwindows -Wl,--stack,16777216"
if test "x$enable_cygwin" != "xyes"; then
FLAGS="${FLAGS} -DHAVE_NO_DLL"
fi
diff --git a/configure.in b/configure.in
index 8af2168941..ca1392819a 100644
--- a/configure.in
+++ b/configure.in
@@ -183,9 +183,7 @@ case "$UNAME" in
UNAME="${UNAME}-no-cygwin"
CC="${CC} -mno-cygwin"
CXX="${CXX} -mno-cygwin"
- dnl increase stack size to 16Mb to avoid stack overflows in
- dnl recursive tet classification for large 3D Delaunay grids
- LINKER="${LINKER} -mno-cygwin -Wl,--stack,16777216"
+ LINKER="${LINKER} -mno-cygwin"
fi
;;
esac
@@ -749,7 +747,9 @@ dnl Modify defaults according to OS
case "$UNAME" in
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
FLAGS="${FLAGS} -DHAVE_NO_DLL"
fi
diff --git a/doc/gmsh.html b/doc/gmsh.html
index ef3dff421a..c57621ed3d 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -99,7 +99,7 @@ paper is in preparation, but is not yet ready.
Gmsh is developed by Christophe Geuzaine
(<a href="http://www.ulg.ac.be/">University of Liège</a>) and
Jean-François 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.
<p>
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<
Gmsh is copyright (C) 1997-2008 by C. Geuzaine and J.-F. Remacle and
is distributed under the terms of
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
-external mesh generators).
+License (GPL)</a> (with an <a href="/gmsh/doc/LICENSE.txt">exception</a>
+to allow for easier linking with external mesh generators).
<p>
In short, this means that everyone is free to use Gmsh and to
--
GitLab