From 924854ac32044879fd04a681488cb32429e569da Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 23 Nov 2011 10:29:22 +0000
Subject: [PATCH] Gauss.? -> GaussIntegration.? to avoid file name clashes with
 getdp

---
 CMakeLists.txt                                | 2 +-
 Geo/MElement.h                                | 4 +---
 Mesh/Levy3D.cpp                               | 2 +-
 Numeric/CMakeLists.txt                        | 4 ++--
 Numeric/{Gauss.cpp => GaussIntegration.cpp}   | 2 +-
 Numeric/{Gauss.h => GaussIntegration.h}       | 4 ++--
 Numeric/GaussLegendreSimplex.cpp              | 2 +-
 Numeric/GaussQuadratureHex.cpp                | 2 +-
 Numeric/GaussQuadratureLin.cpp                | 2 +-
 Numeric/GaussQuadraturePri.cpp                | 2 +-
 Numeric/GaussQuadratureQuad.cpp               | 2 +-
 Numeric/GaussQuadratureTet.cpp                | 2 +-
 Numeric/GaussQuadratureTri.cpp                | 2 +-
 Numeric/polynomialBasis.cpp                   | 2 +-
 Solver/quadratureRules.h                      | 2 +-
 contrib/DiscreteIntegration/Integration3D.cpp | 2 +-
 gmshpy/gmshNumeric.i                          | 4 ++--
 17 files changed, 20 insertions(+), 22 deletions(-)
 rename Numeric/{Gauss.cpp => GaussIntegration.cpp} (98%)
 rename Numeric/{Gauss.h => GaussIntegration.h} (95%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9078711ec..0cdf4d7352 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ set(GMSH_API
   ${CMAKE_CURRENT_BINARY_DIR}/Common/GmshVersion.h
   Common/Gmsh.h Common/Context.h Common/GmshDefines.h Common/GmshMessage.h
     Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h
-  Numeric/Numeric.h Numeric/Gauss.h Numeric/polynomialBasis.h
+  Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
     Numeric/JacobianBasis.h Numeric/fullMatrix.h
     Numeric/simpleFunction.h Numeric/cartesian.h
   Geo/GModel.h Geo/GEntity.h Geo/GPoint.h Geo/GVertex.h Geo/GEdge.h 
diff --git a/Geo/MElement.h b/Geo/MElement.h
index f4711dc1ba..63b58ccc74 100644
--- a/Geo/MElement.h
+++ b/Geo/MElement.h
@@ -16,9 +16,7 @@
 #include "MFace.h"
 #include "polynomialBasis.h"
 #include "JacobianBasis.h"
-#include "Gauss.h"
-
-//class GFace; ??
+#include "GaussIntegration.h"
 
 // A mesh element.
 class MElement
diff --git a/Mesh/Levy3D.cpp b/Mesh/Levy3D.cpp
index 61d146b059..44ab810f3d 100755
--- a/Mesh/Levy3D.cpp
+++ b/Mesh/Levy3D.cpp
@@ -12,7 +12,7 @@
 
 #include "Levy3D.h"
 #include "polynomialBasis.h"
-#include "Gauss.h"
+#include "GaussIntegration.h"
 #include "GModel.h"
 #include "MElement.h"
 #include "MElementOctree.h"
diff --git a/Numeric/CMakeLists.txt b/Numeric/CMakeLists.txt
index 88cd8089b5..388f7259c0 100644
--- a/Numeric/CMakeLists.txt
+++ b/Numeric/CMakeLists.txt
@@ -8,14 +8,14 @@ set(SRC
     fullMatrix.cpp
     polynomialBasis.cpp
     JacobianBasis.cpp
-  GaussQuadratureLin.cpp
+  GaussIntegration.cpp
+    GaussQuadratureLin.cpp
     GaussQuadratureTri.cpp
     GaussQuadratureQuad.cpp
     GaussQuadratureTet.cpp
     GaussQuadratureHex.cpp
     GaussQuadraturePri.cpp
     GaussLegendreSimplex.cpp
-    Gauss.cpp
   robustPredicates.cpp
   mathEvaluator.cpp
   Iso.cpp
diff --git a/Numeric/Gauss.cpp b/Numeric/GaussIntegration.cpp
similarity index 98%
rename from Numeric/Gauss.cpp
rename to Numeric/GaussIntegration.cpp
index ca0c88b2e9..9e1f471012 100644
--- a/Numeric/Gauss.cpp
+++ b/Numeric/GaussIntegration.cpp
@@ -1,4 +1,4 @@
-#include "Gauss.h"
+#include "GaussIntegration.h"
 #include "GmshDefines.h"
 
 static void pts2fullMatrix(int npts, IntPt *pts, fullMatrix<double> &pMatrix, 
diff --git a/Numeric/Gauss.h b/Numeric/GaussIntegration.h
similarity index 95%
rename from Numeric/Gauss.h
rename to Numeric/GaussIntegration.h
index bc2b355959..099b6b22af 100644
--- a/Numeric/Gauss.h
+++ b/Numeric/GaussIntegration.h
@@ -3,8 +3,8 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
-#ifndef _GAUSS_H_
-#define _GAUSS_H_
+#ifndef _GAUSS_INTEGRATION_H_
+#define _GAUSS_INTEGRATION_H_
 
 #include "fullMatrix.h"
 
diff --git a/Numeric/GaussLegendreSimplex.cpp b/Numeric/GaussLegendreSimplex.cpp
index aeed112f42..8e24a370e2 100644
--- a/Numeric/GaussLegendreSimplex.cpp
+++ b/Numeric/GaussLegendreSimplex.cpp
@@ -4,7 +4,7 @@
 // bugs and problems to <gmsh@geuz.org>.
 
 #include <math.h>
-#include "Gauss.h"
+#include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
 
 static void brickToTet(double xi, double eta, double zeta,
diff --git a/Numeric/GaussQuadratureHex.cpp b/Numeric/GaussQuadratureHex.cpp
index 808aae08b0..43fee450ec 100644
--- a/Numeric/GaussQuadratureHex.cpp
+++ b/Numeric/GaussQuadratureHex.cpp
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
-#include "Gauss.h"
+#include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
 
 const double a1  = 0.40824826;
diff --git a/Numeric/GaussQuadratureLin.cpp b/Numeric/GaussQuadratureLin.cpp
index 3562a03b0b..e747b4cced 100644
--- a/Numeric/GaussQuadratureLin.cpp
+++ b/Numeric/GaussQuadratureLin.cpp
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
-#include "Gauss.h"
+#include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
 
 IntPt * GQL[20] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
diff --git a/Numeric/GaussQuadraturePri.cpp b/Numeric/GaussQuadraturePri.cpp
index 1a328b750c..c7bddb484c 100644
--- a/Numeric/GaussQuadraturePri.cpp
+++ b/Numeric/GaussQuadraturePri.cpp
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
-#include "Gauss.h"
+#include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
 #include "stdio.h"
 
diff --git a/Numeric/GaussQuadratureQuad.cpp b/Numeric/GaussQuadratureQuad.cpp
index ddfde8c4f7..6e4987d65c 100644
--- a/Numeric/GaussQuadratureQuad.cpp
+++ b/Numeric/GaussQuadratureQuad.cpp
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
-#include "Gauss.h"
+#include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
 
 IntPt GQQ1[1] = {
diff --git a/Numeric/GaussQuadratureTet.cpp b/Numeric/GaussQuadratureTet.cpp
index c30f455cfd..ceb35dc72d 100644
--- a/Numeric/GaussQuadratureTet.cpp
+++ b/Numeric/GaussQuadratureTet.cpp
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
-#include "Gauss.h"
+#include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
 
 /* constants for 4-point rule */
diff --git a/Numeric/GaussQuadratureTri.cpp b/Numeric/GaussQuadratureTri.cpp
index 7409586c3f..7f3a7feacb 100644
--- a/Numeric/GaussQuadratureTri.cpp
+++ b/Numeric/GaussQuadratureTri.cpp
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
-#include "Gauss.h"
+#include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
 
 IntPt GQT1[1] = { 
diff --git a/Numeric/polynomialBasis.cpp b/Numeric/polynomialBasis.cpp
index 18b2caf491..aa84c6c4e4 100644
--- a/Numeric/polynomialBasis.cpp
+++ b/Numeric/polynomialBasis.cpp
@@ -12,7 +12,7 @@
 #include "GmshDefines.h"
 #include "GmshMessage.h"
 #include "polynomialBasis.h"
-#include "Gauss.h"
+#include "GaussIntegration.h"
 
 static void printClosure(polynomialBasis::clCont &fullClosure, std::vector<int> &closureRef,
                          polynomialBasis::clCont &closures)
diff --git a/Solver/quadratureRules.h b/Solver/quadratureRules.h
index d84d4b1dc8..bf5fe5b399 100644
--- a/Solver/quadratureRules.h
+++ b/Solver/quadratureRules.h
@@ -14,7 +14,7 @@
 #ifndef _QUADRATURERULES_H_
 #define _QUADRATURERULES_H_
 
-#include "Gauss.h"
+#include "GaussIntegration.h"
 #include "MElement.h"
 
 class QuadratureBase
diff --git a/contrib/DiscreteIntegration/Integration3D.cpp b/contrib/DiscreteIntegration/Integration3D.cpp
index a9f8ed9c36..8219446b60 100644
--- a/contrib/DiscreteIntegration/Integration3D.cpp
+++ b/contrib/DiscreteIntegration/Integration3D.cpp
@@ -5,7 +5,7 @@
 
 #include "Integration3D.h"
 #include "recurCut.h"
-#include "Gauss.h"
+#include "GaussIntegration.h"
 #include "polynomialBasis.h"
 #include "GmshDefines.h" 
 
diff --git a/gmshpy/gmshNumeric.i b/gmshpy/gmshNumeric.i
index 77c064d0d2..6d0a1653e6 100644
--- a/gmshpy/gmshNumeric.i
+++ b/gmshpy/gmshNumeric.i
@@ -8,14 +8,14 @@
   #include "GmshConfig.h"
 
   #include "DivideAndConquer.h"
-  #include "Gauss.h"
+  #include "GaussIntegration.h"
   #include "JacobianBasis.h"
   #include "fullMatrix.h"
   #include "polynomialBasis.h"
 %}
 
 %include "DivideAndConquer.h"
-%include "Gauss.h"
+%include "GaussIntegration.h"
 %include "JacobianBasis.h"  
 %include "fullMatrix.h"
 %template(fullMatrixDouble) fullMatrix<double>;
-- 
GitLab