From fd7e856927dcd75489db6e91453e1b9246a4dca3 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 6 Feb 2008 07:33:49 +0000
Subject: [PATCH] *** empty log message ***

---
 Geo/GFace.cpp                    |  6 +++++-
 Geo/GFace.h                      |  1 -
 Geo/MEdgeHash.h                  | 19 +++++++++++++++++++
 Geo/MFaceHash.h                  | 19 +++++++++++++++++++
 Geo/discreteEdge.h               | 19 +++++++++++++++++++
 Geo/discreteFace.h               | 19 +++++++++++++++++++
 Geo/discreteRegion.h             | 19 +++++++++++++++++++
 Geo/discreteVertex.h             | 19 +++++++++++++++++++
 Geo/gmshVertex.cpp               | 22 +++++++++++++++++++++-
 Makefile                         | 10 +++++-----
 Mesh/meshGFaceOptimize.cpp       | 22 ++++++++++++++++++++++
 Mesh/meshGRegionLocalMeshMod.cpp | 21 +++++++++++++++++++++
 Mesh/qualityMeasures.cpp         | 21 +++++++++++++++++++++
 Mesh/qualityMeasures.h           | 19 +++++++++++++++++++
 Parser/OpenFile.cpp              |  3 +--
 15 files changed, 229 insertions(+), 10 deletions(-)

diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index 47fcef10b4..c50d2e7be4 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -1,4 +1,4 @@
-// $Id: GFace.cpp,v 1.46 2008-02-05 23:34:02 geuzaine Exp $
+// $Id: GFace.cpp,v 1.47 2008-02-06 07:33:49 geuzaine Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -548,6 +548,9 @@ struct graphics_point{
 
 bool GFace::buildSTLTriangulation()
 {
+#if defined(HAVE_GMSH_EMBEDDED)
+  return false;
+#else
   // Build a simple triangulation for surfaces which we know are not
   // trimmed
   if(geomType() != ParametricSurface && geomType() != ProjectionFace)
@@ -597,4 +600,5 @@ bool GFace::buildSTLTriangulation()
   }
   va_geom_triangles->finalize();
   return true;
+#endif
 }
diff --git a/Geo/GFace.h b/Geo/GFace.h
index 4a4c4786b2..9fad466afd 100644
--- a/Geo/GFace.h
+++ b/Geo/GFace.h
@@ -20,7 +20,6 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
-#include <map>
 #include "GEntity.h"
 #include "GPoint.h"
 #include "GEdgeLoop.h"
diff --git a/Geo/MEdgeHash.h b/Geo/MEdgeHash.h
index d799bce8d0..0ba4bcc1f7 100644
--- a/Geo/MEdgeHash.h
+++ b/Geo/MEdgeHash.h
@@ -1,6 +1,25 @@
 #ifndef _MEDGE_HASH_H_
 #define _MEDGE_HASH_H_
 
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
 #include "MEdge.h"
 #include "Hash.h"
 
diff --git a/Geo/MFaceHash.h b/Geo/MFaceHash.h
index 3010460816..a0088a7d45 100644
--- a/Geo/MFaceHash.h
+++ b/Geo/MFaceHash.h
@@ -1,6 +1,25 @@
 #ifndef _MFACE_HASH_H_
 #define _MFACE_HASH_H_
 
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
 #include "MFace.h"
 #include "Hash.h"
 
diff --git a/Geo/discreteEdge.h b/Geo/discreteEdge.h
index 66e8b5997e..666149fea5 100644
--- a/Geo/discreteEdge.h
+++ b/Geo/discreteEdge.h
@@ -1,6 +1,25 @@
 #ifndef _DISCRETE_EDGE_H_
 #define _DISCRETE_EDGE_H_
 
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
 #include "GModel.h"
 #include "GEdge.h"
 
diff --git a/Geo/discreteFace.h b/Geo/discreteFace.h
index af9a3c40ab..d0e29ac0f2 100644
--- a/Geo/discreteFace.h
+++ b/Geo/discreteFace.h
@@ -1,6 +1,25 @@
 #ifndef _DISCRETE_FACE_H_
 #define _DISCRETE_FACE_H_
 
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
 #include "GModel.h"
 #include "GFace.h"
 
diff --git a/Geo/discreteRegion.h b/Geo/discreteRegion.h
index af2a58485a..ba0c9d9a52 100644
--- a/Geo/discreteRegion.h
+++ b/Geo/discreteRegion.h
@@ -1,6 +1,25 @@
 #ifndef _DISCRETE_REGION_H_
 #define _DISCRETE_REGION_H_
 
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
 #include "GRegion.h"
 
 #if !defined(HAVE_GMSH_EMBEDDED)
diff --git a/Geo/discreteVertex.h b/Geo/discreteVertex.h
index a1da63c9cf..8932efbb5d 100644
--- a/Geo/discreteVertex.h
+++ b/Geo/discreteVertex.h
@@ -1,6 +1,25 @@
 #ifndef _DISCRETE_VERTEX_H_
 #define _DISCRETE_VERTEX_H_
 
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
 #include "GModel.h"
 #include "GVertex.h"
 #include "MVertex.h"
diff --git a/Geo/gmshVertex.cpp b/Geo/gmshVertex.cpp
index eb5ee0ecef..23452dfb77 100644
--- a/Geo/gmshVertex.cpp
+++ b/Geo/gmshVertex.cpp
@@ -1,10 +1,30 @@
+// $Id: gmshVertex.cpp,v 1.8 2008-02-06 07:33:49 geuzaine Exp $
+//
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
 #include "GFace.h"
 #include "GEdge.h"
 #include "gmshVertex.h"
 #include "Geo.h"
 #include "GeoInterpolation.h"
 #include "Message.h"
-#include "Context.h"
 
 SPoint2 gmshVertex::reparamOnFace(GFace *face, int dir) const
 {
diff --git a/Makefile b/Makefile
index fcfffb0ecb..3156300e91 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.463 2008-01-23 09:04:05 geuzaine Exp $
+# $Id: Makefile,v 1.464 2008-02-06 07:33:49 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -46,7 +46,8 @@ GMSH_EMBEDDED = ${GMSH_API} Geo/discrete*.h Numeric/NumericEmbedded.h\
                 Geo/GEntity.cpp Geo/GVertex.cpp Geo/GEdge.cpp\
                 Geo/GEdgeLoop.cpp Geo/GFace.cpp Geo/GRegion.cpp\
                 Geo/MElement.cpp Geo/MFace.cpp Geo/MVertex.cpp\
-                Numeric/NumericEmbedded.cpp
+                Numeric/NumericEmbedded.cpp\
+                utils/embed/GmshEmbedded.{cpp,h} utils/embed/Makefile
 
 all: link
 
@@ -85,9 +86,8 @@ install-lib: lib
 	cp -f bin/libGmsh${LIBEXT} ${libdir}
 
 embed:
-	rsync -av ${GMSH_EMBEDDED} utils/embed
-	@if [ ! -r ../getdp2/contrib/gmsh/Makefile ]; then \
-          rsync -av utils/embed/*.{cpp,h} utils/embed/Makefile ../getdp2/contrib/gmsh;\
+	@if [ -r ../getdp2/contrib/gmsh/Makefile ]; then \
+          rsync -av ${GMSH_EMBEDDED} ../getdp2/contrib/gmsh;\
         fi
 
 variables: configure
diff --git a/Mesh/meshGFaceOptimize.cpp b/Mesh/meshGFaceOptimize.cpp
index e5efa33b2f..ad2dda84e5 100644
--- a/Mesh/meshGFaceOptimize.cpp
+++ b/Mesh/meshGFaceOptimize.cpp
@@ -1,3 +1,24 @@
+// $Id: meshGFaceOptimize.cpp,v 1.9 2008-02-06 07:33:49 geuzaine Exp $
+//
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
 #include "meshGFaceOptimize.h"
 #include "qualityMeasures.h"
 #include "GFace.h"
@@ -6,6 +27,7 @@
 #include "MVertex.h"
 #include "MElement.h"
 #include "BackgroundMesh.h"
+
 static void setLcsMax ( MTriangle *t, std::map<MVertex*,double> &vSizes)
 {
   for (int i=0;i<3;i++)
diff --git a/Mesh/meshGRegionLocalMeshMod.cpp b/Mesh/meshGRegionLocalMeshMod.cpp
index 3c4852efee..830b92e637 100644
--- a/Mesh/meshGRegionLocalMeshMod.cpp
+++ b/Mesh/meshGRegionLocalMeshMod.cpp
@@ -1,3 +1,24 @@
+// $Id: meshGRegionLocalMeshMod.cpp,v 1.10 2008-02-06 07:33:49 geuzaine Exp $
+//
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
 #include "meshGRegionLocalMeshMod.h"
 #include "GEntity.h"
 #include "GRegion.h"
diff --git a/Mesh/qualityMeasures.cpp b/Mesh/qualityMeasures.cpp
index 4b94e87053..7a4661acd5 100644
--- a/Mesh/qualityMeasures.cpp
+++ b/Mesh/qualityMeasures.cpp
@@ -1,3 +1,24 @@
+// $Id: qualityMeasures.cpp,v 1.6 2008-02-06 07:33:49 geuzaine Exp $
+//
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
 #include "qualityMeasures.h"
 #include "BDS.h"
 #include "MVertex.h"
diff --git a/Mesh/qualityMeasures.h b/Mesh/qualityMeasures.h
index 335a74437d..bee2bef345 100644
--- a/Mesh/qualityMeasures.h
+++ b/Mesh/qualityMeasures.h
@@ -1,6 +1,25 @@
 #ifndef _QUALITY_MEASURES_H_
 #define _QUALITY_MEASURES_H_
 
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
 class BDS_Point;
 class BDS_Face;
 class MVertex;
diff --git a/Parser/OpenFile.cpp b/Parser/OpenFile.cpp
index 23d48a7eff..7560d991d6 100644
--- a/Parser/OpenFile.cpp
+++ b/Parser/OpenFile.cpp
@@ -1,4 +1,4 @@
-// $Id: OpenFile.cpp,v 1.171 2008-02-05 21:45:16 geuzaine Exp $
+// $Id: OpenFile.cpp,v 1.172 2008-02-06 07:33:49 geuzaine Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -110,7 +110,6 @@ static void FinishUpBoundingBox()
     CTX.lc = range[2];
     CTX.min[0] -= CTX.lc; CTX.min[1] -= CTX.lc;
     CTX.max[0] += CTX.lc; CTX.max[1] += CTX.lc;
-    printf("hello!\n");
   }
   else if(range[0] < CTX.geom.tolerance && 
 	  range[2] < CTX.geom.tolerance) {
-- 
GitLab