From d73b15c744fb038e94249a33428b463957d841c5 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 20 May 2008 19:25:34 +0000
Subject: [PATCH] *** empty log message ***
---
Fltk/Makefile | 4 ++--
Geo/Makefile | 34 +++++++++++++++++++---------------
Geo/discreteEdge.h | 13 +------------
Geo/discreteFace.cpp | 22 ++++++++++++++++++++++
Geo/discreteRegion.cpp | 22 +++++++++++++++++++++-
Geo/discreteRegion.h | 4 +++-
Makefile | 4 ++--
7 files changed, 70 insertions(+), 33 deletions(-)
diff --git a/Fltk/Makefile b/Fltk/Makefile
index cdad63afaa..352218e3c6 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.185 2008-05-20 19:03:26 geuzaine Exp $
+# $Id: Makefile,v 1.186 2008-05-20 19:25:33 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -179,7 +179,7 @@ GUI_Classifier.o: GUI_Classifier.cpp GUI_Classifier.h ../Common/GmshUI.h \
../Geo/fourierProjectionFace.h ../Geo/GModel.h ../Geo/Range.h \
GUI_Extras.h ../Common/Message.h ../Mesh/meshGFaceDelaunayInsertion.h \
../Mesh/meshGFaceOptimize.h ../Mesh/meshGFaceDelaunayInsertion.h \
- ../Geo/discreteEdge.h ../Geo/GModel.h ../Geo/GEdge.h ../Geo/Geo.h \
+ ../Geo/discreteEdge.h ../Geo/GModel.h ../Geo/GEdge.h \
../Geo/discreteFace.h ../Geo/GModel.h ../Geo/GFace.h
Callbacks.o: Callbacks.cpp ../Common/GmshUI.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/Tools.h ../DataStr/List.h \
diff --git a/Geo/Makefile b/Geo/Makefile
index a8b09c74ae..362582d374 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.208 2008-05-20 19:03:27 geuzaine Exp $
+# $Id: Makefile,v 1.209 2008-05-20 19:25:33 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -34,7 +34,7 @@ SRC = GEntity.cpp\
GVertex.cpp GEdge.cpp GEdgeLoop.cpp GFace.cpp GRegion.cpp\
gmshVertex.cpp gmshEdge.cpp gmshFace.cpp gmshRegion.cpp gmshSurface.cpp\
OCCVertex.cpp OCCEdge.cpp OCCFace.cpp OCCRegion.cpp\
- discreteFace.cpp discreteRegion.cpp\
+ discreteEdge.cpp discreteFace.cpp discreteRegion.cpp\
fourierEdge.cpp fourierFace.cpp fourierProjectionFace.cpp\
GModel.cpp\
GModelIO_Geo.cpp\
@@ -153,15 +153,21 @@ OCCRegion.o: OCCRegion.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h OCCVertex.h OCCIncludes.h MVertex.h \
OCCEdge.h OCCFace.h OCCRegion.h ../Common/Message.h
+discreteEdge.o: discreteEdge.cpp discreteEdge.h GModel.h GVertex.h \
+ GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
+ SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h Geo.h \
+ ../Common/GmshDefines.h gmshSurface.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ExtrudeParams.h ../Common/SmoothData.h
discreteFace.o: discreteFace.cpp discreteFace.h GModel.h GVertex.h \
GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h Geo.h \
../Common/GmshDefines.h gmshSurface.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ExtrudeParams.h ../Common/SmoothData.h
-discreteRegion.o: discreteRegion.cpp discreteRegion.h GRegion.h GEntity.h \
- Range.h SPoint3.h SBoundingBox3d.h GModel.h GVertex.h GPoint.h \
- SPoint2.h GEdge.h SVector3.h GFace.h GEdgeLoop.h Pair.h Geo.h \
+discreteRegion.o: discreteRegion.cpp discreteRegion.h GModel.h GVertex.h \
+ GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
+ SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h Geo.h \
../Common/GmshDefines.h gmshSurface.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ExtrudeParams.h ../Common/SmoothData.h
@@ -182,12 +188,12 @@ GModel.o: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
MVertex.h MEdge.h MFace.h discreteRegion.h discreteFace.h \
- discreteEdge.h Geo.h gmshSurface.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ExtrudeParams.h ../Common/SmoothData.h \
- discreteVertex.h ../Common/Message.h ../Mesh/Field.h ../Geo/Geo.h \
- ../Post/PView.h ../Geo/SPoint3.h ../Mesh/Generator.h \
- ../Common/Context.h
+ discreteEdge.h discreteVertex.h ../Common/Message.h gmshSurface.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Mesh/Field.h \
+ ../Geo/Geo.h ../Geo/gmshSurface.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Post/PView.h ../Geo/SPoint3.h \
+ ../Mesh/Generator.h ../Common/Context.h
GModelIO_Geo.o: GModelIO_Geo.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \
GFace.h GEdgeLoop.h Pair.h GRegion.h Geo.h ../Common/GmshDefines.h \
@@ -201,10 +207,8 @@ GModelIO_Mesh.o: GModelIO_Mesh.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \
GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshDefines.h MElement.h \
MVertex.h MEdge.h MFace.h discreteRegion.h discreteFace.h \
- discreteEdge.h Geo.h gmshSurface.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ExtrudeParams.h ../Common/SmoothData.h \
- discreteVertex.h ../Common/StringUtils.h ../Common/Message.h
+ discreteEdge.h discreteVertex.h ../Common/StringUtils.h \
+ ../Common/Message.h
GModelIO_OCC.o: GModelIO_OCC.cpp GModelIO_OCC.h GModel.h GVertex.h \
GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h OCCIncludes.h \
diff --git a/Geo/discreteEdge.h b/Geo/discreteEdge.h
index 47c73fbd79..c8d86bbaec 100644
--- a/Geo/discreteEdge.h
+++ b/Geo/discreteEdge.h
@@ -23,20 +23,9 @@
#include "GModel.h"
#include "GEdge.h"
-#if !defined(HAVE_GMSH_EMBEDDED)
-#include "Geo.h"
-#endif
-
class discreteEdge : public GEdge {
public:
- discreteEdge(GModel *model, int num) : GEdge(model, num, 0, 0)
- {
-#if !defined(HAVE_GMSH_EMBEDDED)
- Curve *c = Create_Curve(num, MSH_SEGM_DISCRETE, 0, 0, 0, -1, -1, 0., 1.);
- Tree_Add(model->getGEOInternals()->Curves, &c);
- CreateReversedCurve(c);
-#endif
- }
+ discreteEdge(GModel *model, int num);
virtual ~discreteEdge() {}
virtual GeomType geomType() const { return DiscreteCurve; }
virtual GPoint point(double p) const { throw; }
diff --git a/Geo/discreteFace.cpp b/Geo/discreteFace.cpp
index 964d4bd589..b0f9e3a5ab 100644
--- a/Geo/discreteFace.cpp
+++ b/Geo/discreteFace.cpp
@@ -1,4 +1,26 @@
+// $Id: discreteFace.cpp,v 1.2 2008-05-20 19:25:33 geuzaine Exp $
+//
+// Copyright (C) 1997-2008 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 "discreteFace.h"
+
#if !defined(HAVE_GMSH_EMBEDDED)
#include "Geo.h"
#endif
diff --git a/Geo/discreteRegion.cpp b/Geo/discreteRegion.cpp
index be555a1c85..cd0f4513fe 100644
--- a/Geo/discreteRegion.cpp
+++ b/Geo/discreteRegion.cpp
@@ -1,5 +1,25 @@
+// $Id: discreteRegion.cpp,v 1.2 2008-05-20 19:25:34 geuzaine Exp $
+//
+// Copyright (C) 1997-2008 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 "discreteRegion.h"
-#include "GModel.h"
#if !defined(HAVE_GMSH_EMBEDDED)
#include "Geo.h"
diff --git a/Geo/discreteRegion.h b/Geo/discreteRegion.h
index 7fa284b640..5103ac25d6 100644
--- a/Geo/discreteRegion.h
+++ b/Geo/discreteRegion.h
@@ -20,10 +20,12 @@
//
// Please report all bugs and problems to <gmsh@geuz.org>.
+#include "GModel.h"
#include "GRegion.h"
+
class discreteRegion : public GRegion {
public:
- discreteRegion(GModel *model, int num) ;
+ discreteRegion(GModel *model, int num);
virtual ~discreteRegion() {}
virtual GeomType geomType() const { return DiscreteVolume; }
};
diff --git a/Makefile b/Makefile
index ae39903b0e..7ff8f32d38 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.483 2008-05-19 18:50:31 remacle Exp $
+# $Id: Makefile,v 1.484 2008-05-20 19:25:33 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -43,7 +43,7 @@ GMSH_API = Geo/GModel.h\
Post/PView.h Post/PViewData.h Post/PViewDataGModel.h\
Common/Gmsh.h Common/GmshDefines.h Common/GmshVersion.h Common/GmshMatrix.h
-GMSH_EMBEDDED = ${GMSH_API} Geo/discrete*.h\
+GMSH_EMBEDDED = ${GMSH_API} Geo/discrete*.cpp\
Geo/GModel.cpp Geo/GModelIO_Mesh.cpp\
Geo/GEntity.cpp Geo/GVertex.cpp Geo/GEdge.cpp\
Geo/GEdgeLoop.cpp Geo/GFace.cpp Geo/GRegion.cpp\
--
GitLab