cleanup + remove last occurrences of GEdge/Face/RegionCompound

CHANGELOG.txt

 3.1.0: generalized handling of "all" entities in geo file (using {:} notation);
-removed GModelFactory.
+removed GModelFactory, G{Edge,Face,Region}Compounds and old reparametrization
+code.
 
 3.0.6 (Novmeber 5, 2017): improved meshing of spheres; improved handling of mesh
 size constraints with OpenCASCADE kernel; implemented "Coherence" for

CMakeLists.txt

@@ -108,50 +108,48 @@ set(GMSH_INTERNAL_DEVELOPER_API
   ${CMAKE_CURRENT_BINARY_DIR}/Common/GmshConfig.h
   ${CMAKE_CURRENT_BINARY_DIR}/Common/GmshVersion.h
   Common/GmshGlobal.h Common/Context.h Common/GmshDefines.h Common/GmshMessage.h
-    Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h
-    Common/OS.h Common/StringUtils.h Common/OpenFile.h Common/Hash.h
-    Common/onelab.h Common/GmshSocket.h Common/onelabUtils.h Common/Options.h
-    Common/picojson.h
+    Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h Common/OS.h
+    Common/StringUtils.h Common/OpenFile.h Common/Hash.h Common/onelab.h
+    Common/GmshSocket.h Common/onelabUtils.h Common/Options.h Common/picojson.h
   Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
     Numeric/JacobianBasis.h Numeric/bezierBasis.h Numeric/fullMatrix.h
-    Numeric/FuncSpaceData.h Numeric/pointsGenerators.h
-    Numeric/simpleFunction.h Numeric/cartesian.h Numeric/ElementType.h
-    Numeric/BasisFactory.h Numeric/CondNumBasis.h
-  Geo/GModel.h Geo/GEntity.h Geo/GPoint.h Geo/GVertex.h Geo/GEdge.h
-    Geo/GFace.h Geo/GRegion.h Geo/GEdgeLoop.h Geo/GEdgeCompound.h
-    Geo/GFaceCompound.h Geo/GRegionCompound.h Geo/GRbf.h Geo/MVertex.h
-    Geo/MVertexBoundaryLayerData.h Geo/MEdge.h Geo/MFace.h
-    Geo/MEdgeHash.h Geo/MFaceHash.h
-    Geo/MElement.h Geo/MElementOctree.h Geo/MPoint.h Geo/MLine.h
-    Geo/MTriangle.h Geo/MQuadrangle.h Geo/MTetrahedron.h Geo/MHexahedron.h
-    Geo/MPrism.h Geo/MPyramid.h Geo/MTrihedron.h Geo/MElementCut.h
-    Geo/discreteVertex.h Geo/discreteEdge.h Geo/discreteFace.h Geo/discreteRegion.h
-    Geo/SPoint2.h Geo/SPoint3.h Geo/SVector3.h Geo/STensor3.h Geo/SBoundingBox3d.h
-    Geo/Pair.h Geo/Range.h Geo/SOrientedBoundingBox.h
-    Geo/CellComplex.h Geo/ChainComplex.h Geo/Cell.h Geo/Homology.h Geo/Chain.h
-    Geo/GenericVertex.h Geo/GenericEdge.h Geo/GenericFace.h Geo/GenericRegion.h
-    Geo/partitionVertex.h Geo/partitionEdge.h Geo/partitionFace.h Geo/CGNSOptions.h
-    Geo/gmshLevelset.h Geo/boundaryLayersData.h
+    Numeric/FuncSpaceData.h Numeric/pointsGenerators.h Numeric/simpleFunction.h
+    Numeric/cartesian.h Numeric/ElementType.h Numeric/BasisFactory.h
+    Numeric/CondNumBasis.h Numeric/mathEvaluator.h Numeric/nodalBasis.h
+  Geo/GModel.h Geo/GEntity.h Geo/GPoint.h Geo/GVertex.h Geo/GEdge.h Geo/GFace.h
+    Geo/GRegion.h Geo/GEdgeLoop.h Geo/MVertex.h Geo/MVertexBoundaryLayerData.h
+    Geo/MEdge.h Geo/MFace.h Geo/MEdgeHash.h Geo/MFaceHash.h Geo/MElement.h
+    Geo/MElementOctree.h Geo/MPoint.h Geo/MLine.h Geo/MTriangle.h
+    Geo/MQuadrangle.h Geo/MTetrahedron.h Geo/MHexahedron.h Geo/MPrism.h
+    Geo/MPyramid.h Geo/MTrihedron.h Geo/MElementCut.h Geo/discreteVertex.h
+    Geo/discreteEdge.h Geo/discreteFace.h Geo/discreteRegion.h Geo/SPoint2.h
+    Geo/SPoint3.h Geo/SVector3.h Geo/STensor3.h Geo/SBoundingBox3d.h Geo/Pair.h
+    Geo/Range.h Geo/SOrientedBoundingBox.h Geo/CellComplex.h Geo/ChainComplex.h
+    Geo/Cell.h Geo/Homology.h Geo/Chain.h Geo/GenericVertex.h Geo/GenericEdge.h
+    Geo/GenericFace.h Geo/GenericRegion.h Geo/partitionVertex.h
+    Geo/partitionEdge.h Geo/partitionFace.h Geo/CGNSOptions.h Geo/gmshLevelset.h
+    Geo/boundaryLayersData.h
   Mesh/meshGEdge.h Mesh/meshGFace.h Mesh/meshGFaceOptimize.h
-    Mesh/meshPartition.h Mesh/meshGFaceDelaunayInsertion.h
-    Mesh/simple3D.h Mesh/meshPartitionOptions.h Mesh/directions3D.h Mesh/yamakawa.h
+    Mesh/meshPartition.h Mesh/meshGFaceDelaunayInsertion.h Mesh/simple3D.h
+    Mesh/meshPartitionOptions.h Mesh/directions3D.h Mesh/yamakawa.h
     Mesh/Voronoi3D.h Mesh/Levy3D.h Mesh/meshMetric.h Mesh/ThinLayer.h
-  Numeric/mathEvaluator.h
-  Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
-    Solver/crossConfTerm.h Solver/orthogonalTerm.h
+  Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h
+    Solver/elasticityTerm.h Solver/crossConfTerm.h Solver/orthogonalTerm.h
     Solver/linearSystem.h Solver/linearSystemGMM.h Solver/linearSystemCSR.h
     Solver/linearSystemFull.h Solver/elasticitySolver.h Solver/sparsityPattern.h
-    Solver/groupOfElements.h Solver/linearSystemPETSc.h Solver/linearSystemMUMPS.h
-    Solver/thermicSolver.h
+    Solver/groupOfElements.h Solver/linearSystemPETSc.h
+    Solver/linearSystemMUMPS.h Solver/thermicSolver.h
   Post/PView.h Post/PViewData.h Plugin/PluginManager.h Post/OctreePost.h
-  Post/PViewDataList.h Post/PViewDataGModel.h Post/PViewOptions.h Post/ColorTable.h
-   Numeric/nodalBasis.h Post/adaptiveData.h
+    Post/PViewDataList.h Post/PViewDataGModel.h Post/PViewOptions.h
+    Post/ColorTable.h Post/adaptiveData.h
   Graphics/drawContext.h
   contrib/kbipack/gmp_normal_form.h contrib/kbipack/gmp_matrix.h
     contrib/kbipack/gmp_blas.h contrib/kbipack/mpz.h
   contrib/DiscreteIntegration/Integration3D.h
-  contrib/HighOrderMeshOptimizer/OptHOM.h contrib/HighOrderMeshOptimizer/OptHomMesh.h
-  contrib/HighOrderMeshOptimizer/OptHomRun.h contrib/HighOrderMeshOptimizer/ParamCoord.h
+    contrib/HighOrderMeshOptimizer/OptHOM.h
+    contrib/HighOrderMeshOptimizer/OptHomMesh.h
+    contrib/HighOrderMeshOptimizer/OptHomRun.h
+    contrib/HighOrderMeshOptimizer/ParamCoord.h
     contrib/HighOrderMeshOptimizer/OptHomFastCurving.h
     contrib/HighOrderMeshOptimizer/BoundaryLayerCurver.h
     contrib/HighOrderMeshOptimizer/OptHomIntegralBoundaryDist.h
@@ -161,9 +159,11 @@ set(GMSH_INTERNAL_DEVELOPER_API
     contrib/HighOrderMeshOptimizer/OptHomObjContribCADDist.h
   contrib/MeshOptimizer/MeshOptPatch.h contrib/MeshOptimizer/MeshOpt.h
     contrib/MeshOptimizer/MeshOptCommon.h contrib/MeshOptimizer/MeshOptimizer.h
-  contrib/MeshOptimizer/MeshOptObjContribFunc.h contrib/MeshOptimizer/MeshOptObjContrib.h
+    contrib/MeshOptimizer/MeshOptObjContribFunc.h
+    contrib/MeshOptimizer/MeshOptObjContrib.h
     contrib/MeshOptimizer/MeshOptObjContribScaledNodeDispSq.h
-  contrib/MeshOptimizer/MeshOptObjectiveFunction.h contrib/MeshOptimizer/MeshOptVertexCoord.h
+    contrib/MeshOptimizer/MeshOptObjectiveFunction.h
+    contrib/MeshOptimizer/MeshOptVertexCoord.h
   contrib/MeshQualityOptimizer/MeshQualityObjContribIdealJac.h
     contrib/MeshQualityOptimizer/MeshQualityObjContribInvCond.h
     contrib/MeshQualityOptimizer/MeshQualityOptimizer.h 
@@ -1257,7 +1257,7 @@ if(ENABLE_WRAP_PYTHON)
   find_package(PythonLibs)
   if(SWIG_FOUND AND PYTHONLIBS_FOUND)
     message(STATUS "Found SWIG version " ${SWIG_VERSION})
-    if(NOT ENABLE_INTERNAL_DEVELOPER_API) # new bindings
+    # stable API bindings
     include_directories(${PYTHON_INCLUDE_PATH})
     include_directories(${CMAKE_CURRENT_SOURCE_DIR})
     set(CMAKE_SWIG_FLAGS "")
@@ -1268,7 +1268,8 @@ if(ENABLE_WRAP_PYTHON)
       set_target_properties("_gmsh" PROPERTIES LINK_FLAGS
                             "-undefined suppress -flat_namespace")
     endif(APPLE)
-    else(NOT ENABLE_INTERNAL_DEVELOPER_API) # old, deprecated internal developer bindings
+    # internal developer API bindings
+    if(ENABLE_INTERNAL_DEVELOPER_API)
       find_package(PythonInterp)
       string(SUBSTRING ${SWIG_VERSION} 0 1 SWIG_MAJOR_VERSION)
       if(SWIG_MAJOR_VERSION EQUAL 1)
@@ -1303,7 +1304,7 @@ if(ENABLE_WRAP_PYTHON)
           endif(ENABLE_PETSC4PY)
         endif(HAVE_PETSC)
       endif(SWIG_MAJOR_VERSION EQUAL 1)
-    endif(NOT ENABLE_INTERNAL_DEVELOPER_API)
+    endif(ENABLE_INTERNAL_DEVELOPER_API)
   endif(SWIG_FOUND AND PYTHONLIBS_FOUND)
 endif(ENABLE_WRAP_PYTHON)
 
@@ -1934,9 +1935,9 @@ else(APPLE AND ENABLE_OS_SPECIFIC_INSTALL)
   set(CPACK_GENERATOR TGZ)
 endif(APPLE AND ENABLE_OS_SPECIFIC_INSTALL)
 
-if(HAVE_PYTHON AND ENABLE_INTERNAL_DEVELOPER_API)
+if(ENABLE_WRAP_PYTHON AND HAVE_PYTHON AND ENABLE_INTERNAL_DEVELOPER_API)
   add_subdirectory(wrappers/gmshpy)
-endif(HAVE_PYTHON AND ENABLE_INTERNAL_DEVELOPER_API)
+endif(ENABLE_WRAP_PYTHON AND HAVE_PYTHON AND ENABLE_INTERNAL_DEVELOPER_API)
 
 if(ENABLE_WRAP_JAVA AND ENABLE_INTERNAL_DEVELOPER_API)
   add_subdirectory(wrappers/java)

wrappers/gmshpy/CMakeLists.txt

@@ -151,7 +151,6 @@ if(ENABLE_GMSHPY_SOURCE_PACKAGE)
     Solver/eigenSolver.h
     Mesh/Generator.h
     Geo/GeomMeshMatcher.h
-    Geo/GFaceCompound.h
     Geo/gmshLevelset.h
     Numeric/jacobiPolynomials.h
     Numeric/legendrePolynomials.h

wrappers/gmshpy/gmshGeo.i

@@ -17,9 +17,7 @@
   #include "GVertex.h"
   #include "GEdge.h"
   #include "GFace.h"
-  #include "GFaceCompound.h"
   #include "GRegion.h"
-  #include "GRegionCompound.h"
   #include "discreteFace.h"
   #include "discreteEdge.h"
   #include "discreteRegion.h"
@@ -43,7 +41,6 @@
   #include "SPoint3.h"
   #include "SPoint2.h"
   #include "SBoundingBox3d.h"
-  #include "Curvature.h"
   #include "simpleFunction.h"
   #include "GeomMeshMatcher.h"
 %}
@@ -112,9 +109,7 @@ namespace std {
 %include "GEdge.h"
 %ignore GFace::computeMeanPlane(std::vector< MVertex *>const&);
 %include "GFace.h"
-%include "GFaceCompound.h"
 %include "GRegion.h"
-%include "GRegionCompound.h"
 %include "discreteFace.h"
 %include "discreteEdge.h"
 %include "discreteVertex.h"
@@ -146,7 +141,6 @@ namespace std {
 %include "SVector3.h"
 %include "SPoint2.h"
 %include "SBoundingBox3d.h"
-%include "Curvature.h"
 %include "gmshLevelset.h"
 %include "GeomMeshMatcher.h"