[gmsh] 07/10: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Mon Mar 21 23:30:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gmsh.
commit 2c20221772d476774be4972bcd32d071fe4b6474
Merge: 19c5864 494f444
Author: Anton Gladky <gladk at debian.org>
Date: Mon Mar 21 22:55:47 2016 +0100
Merge.
CMakeLists.txt | 197 +-
CTestConfig.cmake | 4 +-
Common/CMakeLists.txt | 4 +-
Common/Colors.h | 4 +-
Common/CommandLine.cpp | 51 +-
Common/CommandLine.h | 4 +-
Common/Context.cpp | 24 +-
Common/Context.h | 29 +-
Common/CreateFile.cpp | 5 +-
Common/CreateFile.h | 4 +-
Common/DefaultOptions.h | 69 +-
Common/GamePad.cpp | 4 +-
Common/GamePad.h | 4 +-
Common/Gmsh.cpp | 72 +-
Common/Gmsh.h | 4 +-
Common/GmshConfig.h.in | 4 +-
Common/GmshDefines.h | 14 +-
Common/GmshIO.h | 8 +-
Common/GmshMessage.cpp | 274 +-
Common/GmshMessage.h | 41 +-
Common/GmshRemote.cpp | 6 +-
Common/GmshRemote.h | 4 +-
Common/GmshSocket.h | 4 +-
Common/GmshVersion.h.in | 4 +-
Common/Hash.h | 4 +-
Common/HashMap.h | 4 +-
Common/ListUtils.cpp | 20 +-
Common/ListUtils.h | 5 +-
Common/Main.cpp | 4 +-
Common/MallocUtils.cpp | 4 +-
Common/MallocUtils.h | 4 +-
Common/OS.cpp | 10 +-
Common/OS.h | 4 +-
Common/Octree.cpp | 4 +-
Common/Octree.h | 4 +-
Common/OctreeInternals.cpp | 4 +-
Common/OctreeInternals.h | 4 +-
Common/OpenFile.cpp | 112 +-
Common/OpenFile.h | 8 +-
Common/Options.cpp | 373 +-
Common/Options.h | 28 +-
Common/SmoothData.cpp | 4 +-
Common/SmoothData.h | 4 +-
Common/StringUtils.cpp | 4 +-
Common/StringUtils.h | 4 +-
Common/TreeUtils.cpp | 4 +-
Common/TreeUtils.h | 4 +-
Common/VertexArray.cpp | 4 +-
Common/VertexArray.h | 4 +-
Common/gmshLocalNetworkClient.cpp | 69 +-
Common/gmshLocalNetworkClient.h | 4 +-
Common/gmshPopplerWrapper.cpp | 4 +-
Common/gmshPopplerWrapper.h | 4 +-
Common/onelab.h | 649 +-
Common/onelabUtils.cpp | 209 +-
Common/onelabUtils.h | 11 +-
Fltk/CMakeLists.txt | 16 +-
Fltk/FlGui.cpp | 68 +-
Fltk/FlGui.h | 14 +-
Fltk/Main.cpp | 12 +-
Fltk/Navigator.cpp | 4 +-
Fltk/Navigator.h | 4 +-
Fltk/classificationEditor.cpp | 4 +-
Fltk/classificationEditor.h | 4 +-
Fltk/clippingWindow.cpp | 6 +-
Fltk/clippingWindow.h | 4 +-
Fltk/colorbarWindow.cpp | 146 +-
Fltk/colorbarWindow.h | 4 +-
Fltk/contextWindow.cpp | 217 +-
Fltk/contextWindow.h | 27 +-
Fltk/drawContextFltk.h | 13 +-
Fltk/drawContextFltkCairo.cpp | 4 +-
Fltk/drawContextFltkCairo.h | 4 +-
Fltk/drawContextFltkStringTexture.cpp | 4 +-
Fltk/drawContextFltkStringTexture.h | 4 +-
Fltk/extraDialogs.cpp | 4 +-
Fltk/extraDialogs.h | 4 +-
Fltk/fieldWindow.cpp | 4 +-
Fltk/fieldWindow.h | 4 +-
Fltk/fileDialogs.cpp | 4 +-
Fltk/fileDialogs.h | 4 +-
Fltk/gamepadWindow.cpp | 4 +-
Fltk/gamepadWindow.h | 4 +-
Fltk/graphicWindow.cpp | 424 +-
Fltk/graphicWindow.h | 22 +-
Fltk/helpWindow.cpp | 27 +-
Fltk/helpWindow.h | 4 +-
Fltk/highOrderToolsWindow.cpp | 47 +-
Fltk/highOrderToolsWindow.h | 4 +-
Fltk/inputRange.h | 4 +-
Fltk/inputRegion.cpp | 4 +-
Fltk/inputRegion.h | 4 +-
Fltk/inputValue.cpp | 4 +-
Fltk/inputValue.h | 4 +-
Fltk/mainWindow.h | 4 +-
Fltk/manipWindow.cpp | 5 +-
Fltk/manipWindow.h | 4 +-
Fltk/messageBrowser.h | 99 +
Fltk/onelab2Group.cpp | 1045 --
Fltk/onelab2Group.h | 95 -
Fltk/onelabGroup.cpp | 1002 +-
Fltk/onelabGroup.h | 8 +-
Fltk/openglWindow.cpp | 28 +-
Fltk/openglWindow.h | 4 +-
Fltk/optionWindow.cpp | 28 +-
Fltk/optionWindow.h | 4 +-
Fltk/outputRange.h | 4 +-
Fltk/paletteWindow.h | 4 +-
Fltk/partitionDialog.cpp | 4 +-
Fltk/partitionDialog.h | 4 +-
Fltk/pluginWindow.cpp | 6 +-
Fltk/pluginWindow.h | 4 +-
Fltk/projectionEditor.cpp | 4 +-
Fltk/projectionEditor.h | 4 +-
Fltk/solverButton.cpp | 4 +-
Fltk/solverButton.h | 4 +-
Fltk/spherePositionWidget.h | 4 +-
Fltk/statisticsWindow.cpp | 40 +-
Fltk/statisticsWindow.h | 4 +-
Fltk/treeIcons.h | 4 +-
Fltk/viewButton.cpp | 8 +-
Fltk/viewButton.h | 4 +-
Fltk/visibilityWindow.cpp | 53 +-
Fltk/visibilityWindow.h | 4 +-
Geo/ACISEdge.cpp | 4 +-
Geo/ACISEdge.h | 4 +-
Geo/ACISFace.cpp | 4 +-
Geo/ACISFace.h | 4 +-
Geo/ACISVertex.cpp | 2 +-
Geo/ACISVertex.h | 4 +-
Geo/CGNSOptions.h | 4 +-
Geo/CMakeLists.txt | 11 +-
Geo/Cell.cpp | 4 +-
Geo/Cell.h | 4 +-
Geo/CellComplex.cpp | 4 +-
Geo/CellComplex.h | 4 +-
Geo/Chain.cpp | 4 +-
Geo/Chain.h | 4 +-
Geo/ChainComplex.cpp | 4 +-
Geo/ChainComplex.h | 4 +-
Geo/Curvature.cpp | 27 +-
Geo/Curvature.h | 8 +-
Geo/CustomContainer.h | 4 +-
Geo/ExtrudeParams.cpp | 4 +-
Geo/ExtrudeParams.h | 4 +-
Geo/GEdge.cpp | 17 +-
Geo/GEdge.h | 5 +-
Geo/GEdgeCompound.cpp | 25 +-
Geo/GEdgeCompound.h | 5 +-
Geo/GEdgeLoop.cpp | 4 +-
Geo/GEdgeLoop.h | 4 +-
Geo/GEntity.cpp | 4 +-
Geo/GEntity.h | 10 +-
Geo/GFace.cpp | 94 +-
Geo/GFace.h | 12 +-
Geo/GFaceCompound.cpp | 156 +-
Geo/GFaceCompound.h | 4 +-
Geo/GModel.cpp | 243 +-
Geo/GModel.h | 21 +-
Geo/GModelFactory.cpp | 4 +-
Geo/GModelFactory.h | 4 +-
Geo/GModelIO_ACIS.cpp | 4 +-
Geo/GModelIO_ACTRAN.cpp | 4 +-
Geo/GModelIO_BDF.cpp | 4 +-
Geo/GModelIO_CELUM.cpp | 2 +-
Geo/GModelIO_CGNS.cpp | 839 +-
Geo/GModelIO_DIFF.cpp | 4 +-
Geo/GModelIO_Fourier.cpp | 4 +-
Geo/GModelIO_Fourier.h | 4 +-
Geo/GModelIO_GEO.cpp | 4 +-
Geo/GModelIO_GEOM.cpp | 4 +-
Geo/GModelIO_INP.cpp | 4 +-
Geo/GModelIO_IR3.cpp | 4 +-
Geo/GModelIO_MAIL.cpp | 4 +-
Geo/GModelIO_MED.cpp | 4 +-
Geo/GModelIO_MESH.cpp | 4 +-
Geo/GModelIO_MSH.cpp | 21 +-
Geo/GModelIO_MSH2.cpp | 34 +-
Geo/GModelIO_OCC.cpp | 54 +-
Geo/GModelIO_OCC.h | 4 +-
Geo/GModelIO_P3D.cpp | 4 +-
Geo/GModelIO_PLY.cpp | 4 +-
Geo/GModelIO_POS.cpp | 4 +-
Geo/GModelIO_SGEOM.cpp | 4 +-
Geo/GModelIO_SGEOM.h | 4 +-
Geo/GModelIO_STL.cpp | 4 +-
Geo/GModelIO_SU2.cpp | 4 +-
Geo/GModelIO_UNV.cpp | 4 +-
Geo/GModelIO_VRML.cpp | 4 +-
Geo/GModelIO_VTK.cpp | 4 +-
Geo/GModelVertexArrays.cpp | 17 +-
Geo/GPoint.h | 4 +-
Geo/GRbf.cpp | 4 +-
Geo/GRbf.h | 4 +-
Geo/GRegion.cpp | 52 +-
Geo/GRegion.h | 14 +-
Geo/GRegionCompound.cpp | 4 +-
Geo/GRegionCompound.h | 4 +-
Geo/GVertex.cpp | 4 +-
Geo/GVertex.h | 4 +-
Geo/GenericEdge.cpp | 4 +-
Geo/GenericEdge.h | 4 +-
Geo/GenericFace.cpp | 4 +-
Geo/GenericFace.h | 4 +-
Geo/GenericRegion.cpp | 4 +-
Geo/GenericRegion.h | 4 +-
Geo/GenericVertex.cpp | 4 +-
Geo/GenericVertex.h | 4 +-
Geo/Geo.cpp | 4 +-
Geo/Geo.h | 4 +-
Geo/GeoInterpolation.cpp | 4 +-
Geo/GeoInterpolation.h | 4 +-
Geo/GeoStringInterface.cpp | 138 +-
Geo/GeoStringInterface.h | 106 +-
Geo/GeomMeshMatcher.cpp | 6 +-
Geo/GeomMeshMatcher.h | 4 +-
Geo/Homology.cpp | 4 +-
Geo/Homology.h | 4 +-
Geo/MEdge.cpp | 4 +-
Geo/MEdge.h | 4 +-
Geo/MEdgeHash.h | 4 +-
Geo/MElement.cpp | 15 +-
Geo/MElement.h | 7 +-
Geo/MElementCut.cpp | 4 +-
Geo/MElementCut.h | 4 +-
Geo/MElementOctree.cpp | 4 +-
Geo/MElementOctree.h | 4 +-
Geo/MFace.cpp | 4 +-
Geo/MFace.h | 4 +-
Geo/MFaceHash.h | 4 +-
Geo/MHexahedron.cpp | 4 +-
Geo/MHexahedron.h | 4 +-
Geo/MLine.cpp | 4 +-
Geo/MLine.h | 4 +-
Geo/MPoint.h | 4 +-
Geo/MPrism.cpp | 4 +-
Geo/MPrism.h | 4 +-
Geo/MPyramid.cpp | 4 +-
Geo/MPyramid.h | 4 +-
Geo/MQuadrangle.cpp | 4 +-
Geo/MQuadrangle.h | 4 +-
Geo/MSubElement.cpp | 4 +-
Geo/MSubElement.h | 4 +-
Geo/MTetrahedron.cpp | 4 +-
Geo/MTetrahedron.h | 4 +-
Geo/MTriangle.cpp | 4 +-
Geo/MTriangle.h | 4 +-
Geo/MTrihedron.cpp | 3 +
Geo/MTrihedron.h | 162 +
Geo/MVertex.cpp | 25 +-
Geo/MVertex.h | 4 +-
Geo/MVertexBoundaryLayerData.cpp | 4 +-
Geo/MVertexBoundaryLayerData.h | 4 +-
Geo/MVertexRTree.h | 4 +-
Geo/MZone.cpp | 4 +-
Geo/MZone.h | 4 +-
Geo/MZoneBoundary.cpp | 4 +-
Geo/MZoneBoundary.h | 4 +-
Geo/OCCEdge.cpp | 4 +-
Geo/OCCEdge.h | 4 +-
Geo/OCCFace.cpp | 4 +-
Geo/OCCFace.h | 4 +-
Geo/OCCIncludes.h | 4 +-
Geo/OCCRegion.cpp | 4 +-
Geo/OCCRegion.h | 4 +-
Geo/OCCVertex.cpp | 4 +-
Geo/OCCVertex.h | 4 +-
Geo/OCC_Connect.cpp | 4 +-
Geo/OCC_Connect.h | 4 +-
Geo/Pair.h | 4 +-
Geo/Range.h | 4 +-
Geo/SBoundingBox3d.h | 4 +-
Geo/SGEOMIncludes.h | 4 +-
Geo/SOrientedBoundingBox.cpp | 4 +-
Geo/SOrientedBoundingBox.h | 4 +-
Geo/SPoint2.h | 4 +-
Geo/SPoint3.h | 4 +-
Geo/STensor3.cpp | 4 +-
Geo/STensor3.h | 4 +-
Geo/SVector3.h | 4 +-
Geo/boundaryLayersData.cpp | 4 +-
Geo/boundaryLayersData.h | 4 +-
Geo/closestPoint.cpp | 7 +-
Geo/closestPoint.h | 14 +-
Geo/discreteDiskFace.cpp | 704 +
Geo/discreteDiskFace.h | 91 +
Geo/discreteEdge.cpp | 270 +-
Geo/discreteEdge.h | 18 +-
Geo/discreteFace.cpp | 56 +-
Geo/discreteFace.h | 16 +-
Geo/discreteRegion.cpp | 4 +-
Geo/discreteRegion.h | 4 +-
Geo/discreteVertex.h | 4 +-
Geo/findLinks.cpp | 4 +-
Geo/findLinks.h | 4 +-
Geo/fourierEdge.cpp | 4 +-
Geo/fourierEdge.h | 4 +-
Geo/fourierFace.cpp | 4 +-
Geo/fourierFace.h | 4 +-
Geo/fourierProjectionFace.cpp | 4 +-
Geo/fourierProjectionFace.h | 4 +-
Geo/fourierVertex.h | 4 +-
Geo/gmshEdge.cpp | 11 +-
Geo/gmshEdge.h | 4 +-
Geo/gmshEdgeDiscretize.cpp | 135 +-
Geo/gmshFace.cpp | 4 +-
Geo/gmshFace.h | 4 +-
Geo/gmshLevelset.cpp | 4 +-
Geo/gmshLevelset.h | 4 +-
Geo/gmshRegion.cpp | 4 +-
Geo/gmshRegion.h | 4 +-
Geo/gmshSurface.cpp | 4 +-
Geo/gmshSurface.h | 4 +-
Geo/gmshVertex.cpp | 4 +-
Geo/gmshVertex.h | 4 +-
Geo/intersectCurveSurface.cpp | 8 +-
Geo/intersectCurveSurface.h | 4 +-
Geo/partitionEdge.h | 4 +-
Geo/partitionFace.h | 4 +-
Geo/partitionVertex.h | 4 +-
Graphics/CMakeLists.txt | 4 +-
Graphics/Camera.cpp | 4 +-
Graphics/Camera.h | 4 +-
Graphics/PixelBuffer.h | 4 +-
Graphics/ReadImg.cpp | 4 +-
Graphics/ReadImg.h | 4 +-
Graphics/drawAxes.cpp | 4 +-
Graphics/drawContext.cpp | 9 +-
Graphics/drawContext.h | 6 +-
Graphics/drawGeom.cpp | 4 +-
Graphics/drawGlyph.cpp | 4 +-
Graphics/drawGraph2d.cpp | 4 +-
Graphics/drawMesh.cpp | 11 +-
Graphics/drawPost.cpp | 9 +-
Graphics/drawScales.cpp | 4 +-
Graphics/gl2gif.cpp | 4 +-
Graphics/gl2gif.h | 4 +-
Graphics/gl2jpeg.cpp | 4 +-
Graphics/gl2jpeg.h | 4 +-
Graphics/gl2pgf.cpp | 8 +-
Graphics/gl2pgf.h | 8 +-
Graphics/gl2png.cpp | 4 +-
Graphics/gl2png.h | 4 +-
Graphics/gl2ppm.cpp | 4 +-
Graphics/gl2ppm.h | 4 +-
Graphics/gl2yuv.cpp | 4 +-
Graphics/gl2yuv.h | 4 +-
Mesh/BDS.cpp | 15 +-
Mesh/BDS.h | 4 +-
Mesh/BGMBase.cpp | 4 +-
Mesh/BGMBase.h | 2 +-
Mesh/BackgroundMesh.cpp | 15 +-
Mesh/BackgroundMesh.h | 6 +-
Mesh/BackgroundMesh2D.cpp | 4 +-
Mesh/BackgroundMesh2D.h | 4 +-
Mesh/BackgroundMesh3D.cpp | 4 +-
Mesh/BackgroundMesh3D.h | 4 +-
Mesh/BackgroundMeshManager.cpp | 4 +-
Mesh/BackgroundMeshManager.h | 4 +-
Mesh/BackgroundMeshTools.cpp | 4 +-
Mesh/BackgroundMeshTools.h | 4 +-
Mesh/BoundaryLayers.cpp | 44 +-
Mesh/BoundaryLayers.h | 4 +-
Mesh/CMakeLists.txt | 14 +-
Mesh/CenterlineField.cpp | 4 +-
Mesh/CenterlineField.h | 4 +-
Mesh/DivideAndConquer.cpp | 2 +-
Mesh/DivideAndConquer.h | 2 +-
Mesh/Field.cpp | 18 +-
Mesh/Field.h | 4 +-
Mesh/FieldPython.h | 4 +-
Mesh/Generator.cpp | 359 +-
Mesh/Generator.h | 4 +-
Mesh/HighOrder.cpp | 4 +-
Mesh/HighOrder.h | 4 +-
Mesh/Levy3D.cpp | 4 +-
Mesh/Levy3D.h | 4 +-
Mesh/QuadTriExtruded2D.cpp | 4 +-
Mesh/QuadTriExtruded2D.h | 2 +-
Mesh/QuadTriExtruded3D.cpp | 4 +-
Mesh/QuadTriExtruded3D.h | 2 +-
Mesh/QuadTriTransfinite3D.cpp | 6 +-
Mesh/QuadTriTransfinite3D.h | 4 +-
Mesh/QuadTriUtils.cpp | 5 +-
Mesh/QuadTriUtils.h | 4 +-
Mesh/ThinLayer.cpp | 608 +
Mesh/ThinLayer.h | 134 +
Mesh/Voronoi3D.cpp | 4 +-
Mesh/Voronoi3D.h | 4 +-
Mesh/cross3D.h | 4 +-
Mesh/delaunay3d.cpp | 1261 ++
Mesh/delaunay3d.h | 15 +
Mesh/delaunay3d_private.h | 327 +
Mesh/delaunay_refinement.cpp | 522 +
Mesh/delaunay_refinement.h | 13 +
Mesh/directions3D.cpp | 4 +-
Mesh/directions3D.h | 4 +-
Mesh/filterElements.cpp | 4 +-
Mesh/filterElements.h | 4 +-
Mesh/meshGEdge.cpp | 84 +-
Mesh/meshGEdge.h | 4 +-
Mesh/meshGEdgeExtruded.cpp | 4 +-
Mesh/meshGFace.cpp | 84 +-
Mesh/meshGFace.h | 4 +-
Mesh/meshGFaceBDS.cpp | 4 +-
Mesh/meshGFaceBDS.h | 4 +-
Mesh/meshGFaceBamg.cpp | 4 +-
Mesh/meshGFaceBamg.h | 4 +-
Mesh/meshGFaceDelaunayInsertion.cpp | 127 +-
Mesh/meshGFaceDelaunayInsertion.h | 9 +-
Mesh/meshGFaceElliptic.cpp | 4 +-
Mesh/meshGFaceElliptic.h | 4 +-
Mesh/meshGFaceExtruded.cpp | 5 +-
Mesh/meshGFaceLloyd.cpp | 4 +-
Mesh/meshGFaceLloyd.h | 2 +-
Mesh/meshGFaceOptimize.cpp | 3056 +---
Mesh/meshGFaceOptimize.h | 38 +-
Mesh/meshGFaceQuadrilateralize.cpp | 4 +-
Mesh/meshGFaceQuadrilateralize.h | 4 +-
Mesh/meshGFaceRecombine.cpp | 542 +-
Mesh/meshGFaceRecombine.h | 354 +-
Mesh/meshGFaceTransfinite.cpp | 4 +-
Mesh/meshGRegion.cpp | 814 +-
Mesh/meshGRegion.h | 4 +-
Mesh/{meshGRegion.cpp => meshGRegion19036.cpp} | 273 +-
Mesh/meshGRegionBoundaryRecovery.cpp | 15175 +++++++++++++++++++
Mesh/meshGRegionBoundaryRecovery.h | 882 ++
Mesh/meshGRegionCarveHole.cpp | 4 +-
Mesh/meshGRegionDelaunayInsertion.cpp | 516 +-
Mesh/meshGRegionDelaunayInsertion.h | 4 +-
Mesh/meshGRegionExtruded.cpp | 4 +-
Mesh/meshGRegionLocalMeshMod.cpp | 396 +-
Mesh/meshGRegionLocalMeshMod.h | 22 +-
Mesh/meshGRegionMMG3D.cpp | 4 +-
Mesh/meshGRegionMMG3D.h | 4 +-
Mesh/meshGRegionRelocateVertex.cpp | 247 +
Mesh/meshGRegionRelocateVertex.h | 8 +
Mesh/meshGRegionTransfinite.cpp | 4 +-
Mesh/meshMetric.cpp | 4 +-
Mesh/meshMetric.h | 4 +-
Mesh/meshPartition.cpp | 22 +-
Mesh/meshPartition.h | 4 +-
Mesh/meshPartitionObjects.h | 4 +-
Mesh/meshPartitionOptions.h | 6 +-
Mesh/meshRefine.cpp | 4 +-
Mesh/multiscalePartition.cpp | 4 +-
Mesh/multiscalePartition.h | 4 +-
Mesh/periodical.cpp | 4 +-
Mesh/periodical.h | 4 +-
Mesh/pointInsertion.cpp | 4 +-
Mesh/pointInsertion.h | 4 +-
Mesh/pointInsertionRTreeTools.cpp | 4 +-
Mesh/pointInsertionRTreeTools.h | 4 +-
Mesh/qualityMeasures.cpp | 6 +-
Mesh/qualityMeasures.h | 4 +-
Mesh/simple3D.cpp | 5 +-
Mesh/simple3D.h | 4 +-
Mesh/surfaceFiller.cpp | 479 +-
Mesh/surfaceFiller.h | 14 +-
Mesh/yamakawa.cpp | 1176 +-
Mesh/yamakawa.h | 33 +-
Numeric/BasisFactory.cpp | 2 +-
Numeric/BasisFactory.h | 4 +-
Numeric/BergotBasis.cpp | 4 +-
Numeric/BergotBasis.h | 4 +-
Numeric/CMakeLists.txt | 4 +-
Numeric/CondNumBasis.cpp | 32 +-
Numeric/CondNumBasis.h | 4 +-
Numeric/ConjugateGradients.cpp | 4 +-
Numeric/ConjugateGradients.h | 4 +-
Numeric/ElementType.cpp | 14 +-
Numeric/ElementType.h | 4 +-
Numeric/FuncSpaceData.cpp | 2 +-
Numeric/FuncSpaceData.h | 4 +-
Numeric/GaussIntegration.cpp | 4 +-
Numeric/GaussIntegration.h | 4 +-
Numeric/GaussJacobi1D.cpp | 4 +-
Numeric/GaussJacobi1D.h | 4 +-
Numeric/GaussLegendre1D.h | 4 +-
Numeric/GaussLegendreSimplex.cpp | 4 +-
Numeric/GaussQuadratureHex.cpp | 4 +-
Numeric/GaussQuadratureLin.cpp | 4 +-
Numeric/GaussQuadraturePri.cpp | 4 +-
Numeric/GaussQuadraturePyr.cpp | 6 +-
Numeric/GaussQuadratureQuad.cpp | 4 +-
Numeric/GaussQuadratureTet.cpp | 4 +-
Numeric/GaussQuadratureTri.cpp | 4 +-
Numeric/HilbertCurve.cpp | 8 +-
Numeric/HilbertCurve.h | 8 +-
Numeric/Iso.cpp | 4 +-
Numeric/Iso.h | 4 +-
Numeric/JacobianBasis.cpp | 4 +-
Numeric/JacobianBasis.h | 4 +-
Numeric/MetricBasis.cpp | 1119 +-
Numeric/MetricBasis.h | 118 +-
Numeric/Numeric.cpp | 58 +-
Numeric/Numeric.h | 11 +-
Numeric/approximationError.cpp | 4 +-
Numeric/approximationError.h | 4 +-
Numeric/bezierBasis.cpp | 4 +-
Numeric/bezierBasis.h | 4 +-
Numeric/cartesian.h | 4 +-
Numeric/decasteljau.cpp | 11 +-
Numeric/decasteljau.h | 8 +-
Numeric/discreteFrechetDistance.cpp | 15 +-
Numeric/discreteFrechetDistance.h | 13 +-
Numeric/fullMatrix.cpp | 4 +-
Numeric/fullMatrix.h | 4 +-
Numeric/hausdorffDistance.cpp | 55 +-
Numeric/jacobiPolynomials.cpp | 4 +-
Numeric/jacobiPolynomials.h | 4 +-
Numeric/legendrePolynomials.cpp | 4 +-
Numeric/legendrePolynomials.h | 4 +-
Numeric/mathEvaluator.cpp | 4 +-
Numeric/mathEvaluator.h | 4 +-
Numeric/miniBasis.cpp | 17 +-
Numeric/miniBasis.h | 14 +-
Numeric/nodalBasis.cpp | 4 +-
Numeric/nodalBasis.h | 4 +-
Numeric/pointsGenerators.cpp | 4 +-
Numeric/pointsGenerators.h | 4 +-
Numeric/polynomialBasis.cpp | 6 +-
Numeric/polynomialBasis.h | 4 +-
Numeric/pyramidalBasis.cpp | 4 +-
Numeric/pyramidalBasis.h | 4 +-
Numeric/robustPredicates.cpp | 44 +-
Numeric/robustPredicates.h | 14 +-
Numeric/simpleFunction.h | 4 +-
Numeric/simpleFunctionPython.h | 4 +-
Parser/CMakeLists.txt | 4 +-
Parser/FunctionManager.cpp | 4 +-
Parser/FunctionManager.h | 4 +-
Parser/Gmsh.l | 31 +-
Parser/Gmsh.tab.cpp | 11939 ++++++---------
Parser/Gmsh.tab.hpp | 59 +-
Parser/Gmsh.y | 482 +-
Parser/Gmsh.yy.cpp | 1511 +-
Parser/Parser.h | 6 +-
Plugin/AnalyseCurvedMesh.cpp | 4 +-
Plugin/AnalyseCurvedMesh.h | 4 +-
Plugin/Annotate.cpp | 4 +-
Plugin/Annotate.h | 4 +-
Plugin/Bubbles.cpp | 4 +-
Plugin/Bubbles.h | 4 +-
Plugin/CMakeLists.txt | 6 +-
Plugin/CVTRemesh.cpp | 2 +-
Plugin/CVTRemesh.h | 2 +-
Plugin/Crack.cpp | 4 +-
Plugin/Crack.h | 4 +-
Plugin/Curl.cpp | 4 +-
Plugin/Curl.h | 4 +-
Plugin/CurvedBndDist.cpp | 2 +-
Plugin/CurvedBndDist.h | 2 +-
Plugin/CutBox.cpp | 4 +-
Plugin/CutBox.h | 4 +-
Plugin/CutGrid.cpp | 4 +-
Plugin/CutGrid.h | 4 +-
Plugin/CutMesh.cpp | 4 +-
Plugin/CutMesh.h | 4 +-
Plugin/CutParametric.cpp | 4 +-
Plugin/CutParametric.h | 4 +-
Plugin/CutPlane.cpp | 4 +-
Plugin/CutPlane.h | 4 +-
Plugin/CutSphere.cpp | 4 +-
Plugin/CutSphere.h | 4 +-
Plugin/DiscretizationError.cpp | 4 +-
Plugin/DiscretizationError.h | 4 +-
Plugin/Distance.cpp | 4 +-
Plugin/Distance.h | 4 +-
Plugin/Divergence.cpp | 4 +-
Plugin/Divergence.h | 4 +-
Plugin/DuplicateBoundaries.cpp | 8191 +++++-----
Plugin/DuplicateBoundaries.h | 2 +-
Plugin/Eigenvalues.cpp | 4 +-
Plugin/Eigenvalues.h | 4 +-
Plugin/Eigenvectors.cpp | 4 +-
Plugin/Eigenvectors.h | 4 +-
Plugin/ExtractEdges.cpp | 4 +-
Plugin/ExtractEdges.h | 4 +-
Plugin/ExtractElements.cpp | 4 +-
Plugin/ExtractElements.h | 4 +-
Plugin/FaultZone.cpp | 4 +-
Plugin/FaultZone.h | 4 +-
Plugin/FieldFromAmplitudePhase.cpp | 4 +-
Plugin/FieldFromAmplitudePhase.h | 4 +-
Plugin/Gradient.cpp | 4 +-
Plugin/Gradient.h | 4 +-
Plugin/HarmonicToTime.cpp | 4 +-
Plugin/HarmonicToTime.h | 4 +-
Plugin/HomologyComputation.cpp | 4 +-
Plugin/HomologyComputation.h | 4 +-
Plugin/HomologyPostProcessing.cpp | 4 +-
Plugin/HomologyPostProcessing.h | 4 +-
Plugin/Integrate.cpp | 4 +-
Plugin/Integrate.h | 4 +-
Plugin/Isosurface.cpp | 4 +-
Plugin/Isosurface.h | 4 +-
Plugin/Lambda2.cpp | 4 +-
Plugin/Lambda2.h | 4 +-
Plugin/Levelset.cpp | 4 +-
Plugin/Levelset.h | 4 +-
Plugin/LongitudeLatitude.cpp | 4 +-
Plugin/LongitudeLatitude.h | 4 +-
Plugin/MakeSimplex.cpp | 4 +-
Plugin/MakeSimplex.h | 4 +-
Plugin/MathEval.cpp | 4 +-
Plugin/MathEval.h | 4 +-
Plugin/MeshSubEntities.cpp | 4 +-
Plugin/MeshSubEntities.h | 4 +-
Plugin/MinMax.cpp | 4 +-
Plugin/MinMax.h | 4 +-
Plugin/ModifyComponents.cpp | 4 +-
Plugin/ModifyComponents.h | 4 +-
Plugin/ModulusPhase.cpp | 4 +-
Plugin/ModulusPhase.h | 4 +-
Plugin/NearToFarField.cpp | 4 +-
Plugin/NearToFarField.h | 4 +-
Plugin/NearestNeighbor.cpp | 4 +-
Plugin/NearestNeighbor.h | 4 +-
Plugin/NewView.cpp | 4 +-
Plugin/NewView.h | 4 +-
Plugin/Particles.cpp | 4 +-
Plugin/Particles.h | 4 +-
Plugin/Plugin.cpp | 4 +-
Plugin/Plugin.h | 4 +-
Plugin/PluginManager.cpp | 7 +-
Plugin/PluginManager.h | 4 +-
Plugin/Probe.cpp | 4 +-
Plugin/Probe.h | 4 +-
Plugin/Remove.cpp | 4 +-
Plugin/Remove.h | 4 +-
Plugin/Scal2Tens.cpp | 8 +-
Plugin/Scal2Tens.h | 8 +-
Plugin/Scal2Vec.cpp | 4 +-
Plugin/Scal2Vec.h | 4 +-
Plugin/SimplePartition.cpp | 4 +-
Plugin/SimplePartition.h | 4 +-
Plugin/Skin.cpp | 4 +-
Plugin/Skin.h | 4 +-
Plugin/Smooth.cpp | 4 +-
Plugin/Smooth.h | 4 +-
Plugin/SphericalRaise.cpp | 4 +-
Plugin/SphericalRaise.h | 4 +-
Plugin/StreamLines.cpp | 4 +-
Plugin/StreamLines.h | 4 +-
Plugin/Tetrahedralize.cpp | 4 +-
Plugin/Tetrahedralize.h | 4 +-
Plugin/ThinLayerFixMesh.cpp | 1170 ++
Plugin/ThinLayerFixMesh.h | 180 +
Plugin/Transform.cpp | 4 +-
Plugin/Transform.h | 4 +-
Plugin/Triangulate.cpp | 4 +-
Plugin/Triangulate.h | 4 +-
Plugin/Warp.cpp | 4 +-
Plugin/Warp.h | 4 +-
Post/CMakeLists.txt | 4 +-
Post/ColorTable.cpp | 1080 +-
Post/ColorTable.h | 4 +-
Post/OctreePost.cpp | 4 +-
Post/OctreePost.h | 4 +-
Post/PView.cpp | 4 +-
Post/PView.h | 6 +-
Post/PViewAsSimpleFunction.cpp | 4 +-
Post/PViewAsSimpleFunction.h | 4 +-
Post/PViewData.cpp | 15 +-
Post/PViewData.h | 6 +-
Post/PViewDataGModel.cpp | 14 +-
Post/PViewDataGModel.h | 5 +-
Post/PViewDataGModelIO.cpp | 4 +-
Post/PViewDataIO.cpp | 4 +-
Post/PViewDataList.cpp | 84 +-
Post/PViewDataList.h | 9 +-
Post/PViewDataListIO.cpp | 4 +-
Post/PViewDataRemote.h | 4 +-
Post/PViewFactory.cpp | 4 +-
Post/PViewFactory.h | 4 +-
Post/PViewIO.cpp | 4 +-
Post/PViewOptions.cpp | 5 +-
Post/PViewOptions.h | 8 +-
Post/PViewVertexArrays.cpp | 25 +-
Post/PViewX3D.cpp | 64 +-
Post/PViewX3D.h | 4 +-
Post/adaptiveData.cpp | 18 +-
Post/adaptiveData.h | 4 +-
Post/shapeFunctions.cpp | 4 +-
Post/shapeFunctions.h | 4 +-
Qt/CMakeLists.txt | 4 +-
Qt/GLWidget.cpp | 4 +-
Qt/GLWidget.h | 4 +-
Qt/Main.cpp | 4 +-
Qt/QGui.cpp | 4 +-
Qt/QGui.h | 4 +-
Qt/graphicWindow.cpp | 4 +-
Qt/graphicWindow.h | 4 +-
README.txt | 8 +-
Solver/CMakeLists.txt | 4 +-
Solver/FuncGradDisc.h | 4 +-
Solver/FuncHeaviside.h | 4 +-
Solver/SElement.cpp | 4 +-
Solver/SElement.h | 4 +-
Solver/STensor33.cpp | 4 +-
Solver/STensor33.h | 4 +-
Solver/STensor43.cpp | 4 +-
Solver/STensor43.h | 4 +-
Solver/STensor53.cpp | 4 +-
Solver/STensor53.h | 4 +-
Solver/STensor63.cpp | 4 +-
Solver/STensor63.h | 4 +-
Solver/convexCombinationTerm.h | 11 +-
Solver/convexLaplaceTerm.h | 51 +
Solver/crossConfTerm.h | 4 +-
Solver/diagBCTerm.h | 2 +-
Solver/distanceTerm.h | 4 +-
Solver/dofManager.cpp | 4 +-
Solver/dofManager.h | 4 +-
Solver/eigenSolver.cpp | 4 +-
Solver/eigenSolver.h | 4 +-
Solver/elasticitySolver.cpp | 4 +-
Solver/elasticitySolver.h | 4 +-
Solver/elasticityTerm.cpp | 4 +-
Solver/elasticityTerm.h | 4 +-
Solver/femTerm.h | 4 +-
Solver/filters.cpp | 4 +-
Solver/filters.h | 4 +-
Solver/frameSolver.h | 4 +-
Solver/functionSpace.cpp | 4 +-
Solver/functionSpace.h | 4 +-
Solver/groupOfElements.cpp | 4 +-
Solver/groupOfElements.h | 4 +-
Solver/helmholtzTerm.h | 4 +-
Solver/laplaceTerm.h | 4 +-
Solver/linearSystem.cpp | 4 +-
Solver/linearSystem.h | 4 +-
Solver/linearSystemCSR.cpp | 145 +-
Solver/linearSystemCSR.h | 21 +-
Solver/linearSystemFull.h | 4 +-
Solver/linearSystemGMM.h | 4 +-
Solver/linearSystemMUMPS.cpp | 4 +-
Solver/linearSystemMUMPS.h | 4 +-
Solver/linearSystemPETSc.cpp | 4 +-
Solver/linearSystemPETSc.h | 4 +-
Solver/materialLaw.h | 4 +-
Solver/multiscaleLaplace.cpp | 4 +-
Solver/multiscaleLaplace.h | 4 +-
Solver/orthogonalTerm.h | 4 +-
Solver/quadratureRules.h | 4 +-
Solver/solverAlgorithms.h | 4 +-
Solver/solverField.h | 4 +-
Solver/sparsityPattern.cpp | 4 +-
Solver/sparsityPattern.h | 4 +-
Solver/terms.cpp | 4 +-
Solver/terms.h | 4 +-
Solver/terms.hpp | 4 +-
Solver/thermicSolver.cpp | 2 +-
Solver/thermicSolver.h | 2 +-
contrib/ANN/CMakeLists.txt | 4 +-
contrib/Chaco/CMakeLists.txt | 4 +-
contrib/Chaco/main/Gmsh_exit.cpp | 2 +-
contrib/Chaco/main/Gmsh_exit.h | 2 +-
contrib/Chaco/main/Gmsh_printf.cpp | 2 +-
contrib/Chaco/main/Gmsh_printf.h | 2 +-
contrib/DiscreteIntegration/CMakeLists.txt | 4 +-
contrib/HighOrderMeshOptimizer/CMakeLists.txt | 4 +-
contrib/HighOrderMeshOptimizer/OptHOM.cpp | 2 +-
contrib/HighOrderMeshOptimizer/OptHOM.h | 2 +-
contrib/HighOrderMeshOptimizer/OptHomElastic.cpp | 2 +-
contrib/HighOrderMeshOptimizer/OptHomElastic.h | 2 +-
.../HighOrderMeshOptimizer/OptHomFastCurving.cpp | 4 +-
contrib/HighOrderMeshOptimizer/OptHomFastCurving.h | 2 +-
contrib/HighOrderMeshOptimizer/OptHomMesh.cpp | 2 +-
contrib/HighOrderMeshOptimizer/OptHomMesh.h | 2 +-
contrib/HighOrderMeshOptimizer/OptHomRun.cpp | 2 +-
contrib/HighOrderMeshOptimizer/OptHomRun.h | 2 +-
contrib/HighOrderMeshOptimizer/ParamCoord.cpp | 2 +-
contrib/HighOrderMeshOptimizer/ParamCoord.h | 2 +-
contrib/HighOrderMeshOptimizer/SuperEl.cpp | 2 +-
contrib/HighOrderMeshOptimizer/SuperEl.h | 2 +-
contrib/MathEx/CMakeLists.txt | 4 +-
contrib/MeshOptimizer/CMakeLists.txt | 4 +-
contrib/MeshOptimizer/MeshOpt.cpp | 31 +-
contrib/MeshOptimizer/MeshOpt.h | 2 +-
contrib/MeshOptimizer/MeshOptCommon.cpp | 2 +-
contrib/MeshOptimizer/MeshOptCommon.h | 2 +-
contrib/MeshOptimizer/MeshOptPatch.cpp | 2 +-
contrib/MeshOptimizer/MeshOptPatch.h | 2 +-
contrib/MeshOptimizer/MeshOptVertexCoord.cpp | 2 +-
contrib/MeshOptimizer/MeshOptVertexCoord.h | 2 +-
contrib/MeshOptimizer/MeshOptimizer.cpp | 2 +-
contrib/MeshOptimizer/MeshOptimizer.h | 2 +-
contrib/MeshQualityOptimizer/CMakeLists.txt | 4 +-
.../MeshQualityOptimizer/MeshQualityOptimizer.h | 2 +-
contrib/Netgen/CMakeLists.txt | 4 +-
contrib/Salome/CMakeLists.txt | 4 +-
contrib/bamg/CMakeLists.txt | 4 +-
contrib/blossom/CMakeLists.txt | 4 +-
contrib/kbipack/CMakeLists.txt | 4 +-
contrib/mmg3d/CMakeLists.txt | 4 +-
contrib/mobile/androidUtils.cpp | 133 +-
contrib/mpeg_encode/CMakeLists.txt | 4 +-
contrib/onelab/CMakeLists.txt | 4 +-
contrib/onelab/OnelabClients.cpp | 25 -
contrib/onelab/OnelabClients.h | 2 +-
contrib/onelab/OnelabMessage.cpp | 4 +-
contrib/onelab/OnelabMessage.h | 2 +-
contrib/onelab/OnelabParser.cpp | 61 -
contrib/onelab/metamodel.h | 2 +-
contrib/onelab/myOS.cpp | 4 +-
contrib/onelab/myOS.h | 4 +-
contrib/onelab/python/onelab.py | 4 +-
contrib/onelab2/CMakeLists.txt | 46 -
contrib/onelab2/GmshLocalClient.cpp | 83 -
contrib/onelab2/GmshLocalClient.h | 39 -
contrib/onelab2/GmshNetworkClient.cpp | 54 -
contrib/onelab2/GmshNetworkClient.h | 36 -
contrib/onelab2/NetworkUtils.cpp | 189 -
contrib/onelab2/NetworkUtils.h | 168 -
contrib/onelab2/Onelab.cpp | 68 -
contrib/onelab2/OnelabAttributes.cpp | 198 -
contrib/onelab2/OnelabAttributes.h | 233 -
contrib/onelab2/OnelabDatabase.cpp | 118 -
contrib/onelab2/OnelabDatabase.h | 283 -
contrib/onelab2/OnelabException.h | 48 -
contrib/onelab2/OnelabLocalClient.h | 30 -
contrib/onelab2/OnelabLocalNetworkClient.cpp | 75 -
contrib/onelab2/OnelabLocalNetworkClient.h | 40 -
contrib/onelab2/OnelabNetworkClient.cpp | 244 -
contrib/onelab2/OnelabNetworkClient.h | 185 -
contrib/onelab2/OnelabProtocol.cpp | 162 -
contrib/onelab2/OnelabProtocol.h | 44 -
contrib/onelab2/OnelabServer.cpp | 884 --
contrib/onelab2/OnelabServer.h | 171 -
contrib/onelab2/OnelabWindow.cpp | 239 -
contrib/onelab2/OnelabWindow.h | 34 -
contrib/onelab2/UdtUtils.h | 80 -
contrib/onelab2/VirtualClient.h | 44 -
contrib/onelab2/noudt.cpp | 74 -
contrib/onelab2/noudt.h | 25 -
contrib/onelab2/python/onelab2.py | 458 -
contrib/taucs/CMakeLists.txt | 70 +
contrib/taucs/LICENSE | 9 +
contrib/taucs/config/taucs_config_build.h | 31 +
contrib/taucs/config/taucs_config_tests.h | 4 +
contrib/taucs/external/src/amdatr.c | 1475 ++
contrib/taucs/external/src/amdatr.f | 1281 ++
contrib/taucs/external/src/amdbar.c | 1474 ++
contrib/taucs/external/src/amdbar.f | 1277 ++
contrib/taucs/external/src/amdbarmex.f | 252 +
contrib/taucs/external/src/amdexa.c | 1415 ++
contrib/taucs/external/src/amdexa.f | 1233 ++
contrib/taucs/external/src/amdhaf.c | 1441 ++
contrib/taucs/external/src/amdhaf.f | 1251 ++
contrib/taucs/external/src/amdhat.c | 1396 ++
contrib/taucs/external/src/amdhat.f | 1215 ++
contrib/taucs/external/src/amdpre.c | 454 +
contrib/taucs/external/src/amdpre.f | 439 +
contrib/taucs/external/src/amdtru.c | 1418 ++
contrib/taucs/external/src/amdtru.f | 1238 ++
contrib/taucs/external/src/colamd.c | 2583 ++++
contrib/taucs/external/src/colamd.h | 67 +
contrib/taucs/external/src/f2c.h | 217 +
contrib/taucs/external/src/genmmd.c | 1021 ++
contrib/taucs/external/src/genmmd.f | 750 +
contrib/taucs/external/src/readhb.c | 1525 ++
contrib/taucs/external/src/readhb.f | 554 +
contrib/taucs/src/blas_aux.c | 36 +
contrib/taucs/src/taucs.h | 837 +
contrib/taucs/src/taucs_ccs_base.c | 132 +
contrib/taucs/src/taucs_ccs_factor_llt.c | 991 ++
contrib/taucs/src/taucs_ccs_generators.c | 948 ++
contrib/taucs/src/taucs_ccs_io.c | 1055 ++
contrib/taucs/src/taucs_ccs_ooc_llt.c | 3027 ++++
contrib/taucs/src/taucs_ccs_ooc_lu.c | 3983 +++++
contrib/taucs/src/taucs_ccs_ops.c | 500 +
contrib/taucs/src/taucs_ccs_order.c | 843 +
contrib/taucs/src/taucs_ccs_solve_llt.c | 484 +
contrib/taucs/src/taucs_ccs_xxt.c | 547 +
contrib/taucs/src/taucs_complex.c | 212 +
contrib/taucs/src/taucs_gremban.c | 1548 ++
contrib/taucs/src/taucs_iter.c | 431 +
contrib/taucs/src/taucs_linsolve.c | 629 +
contrib/taucs/src/taucs_logging.c | 84 +
contrib/taucs/src/taucs_malloc.c | 305 +
contrib/taucs/src/taucs_memory.c | 341 +
contrib/taucs/src/taucs_ooc_io.c | 1318 ++
contrib/taucs/src/taucs_private.h | 383 +
contrib/taucs/src/taucs_recvaidya.c | 428 +
contrib/taucs/src/taucs_sn_llt.c | 4020 +++++
contrib/taucs/src/taucs_superlu.c | 236 +
contrib/taucs/src/taucs_timer.c | 408 +
contrib/taucs/src/taucs_vaidya.c | 4116 +++++
contrib/taucs/src/taucs_vec_base.c | 212 +
contrib/zipper/CMakeLists.txt | 4 +-
demos/hex.geo | 6 +-
demos/title.script | 2 +-
doc/CREDITS.txt | 2 +-
doc/VERSIONS.txt | 4 +
doc/WELCOME.txt | 4 +-
doc/gmsh.1 | 2 +-
doc/gmsh.html | 163 +-
doc/texinfo/gmsh.texi | 311 +-
doc/texinfo/opt_geometry.texi | 2 +-
doc/texinfo/opt_mesh.texi | 52 +-
doc/texinfo/opt_plugin.texi | 3 +
doc/texinfo/opt_solver.texi | 59 +-
doc/texinfo/opt_view.texi | 12 +-
doc/texinfo/shortcuts.texi | 2 +
tutorial/t1.geo | 12 +-
tutorial/t13.geo | 11 +-
tutorial/t2.geo | 2 +-
tutorial/t8.geo | 8 +-
utils/api_demos/CMakeLists.txt | 4 +-
utils/api_demos/mainHomology.cpp | 4 +-
utils/converters/autocad/dxf2geo.cpp | 2 +-
utils/converters/autocad/dxf2msh.c | 77 +-
utils/converters/autocad/dxf2pos.c | 76 +-
utils/converters/matlab/load_gmsh.m | 1 -
utils/converters/matlab/load_gmsh2.m | 30 +-
utils/misc/find_missing_copyright.sh | 2 +-
utils/misc/package_gmsh_getdp.sh | 46 +-
utils/misc/update_copyright.sh | 11 +-
utils/solvers/c++/GmshSocket.h | 4 +-
utils/solvers/c++/onelab.h | 615 +-
wrappers/gmshpy/CMakeLists.txt | 4 +-
wrappers/gmshpy/gmshGeo.i | 10 +
wrappers/gmshpy/gmshNumeric.i | 2 +
.../main/java/com/artenum/sample/EssaiGmsh_v1.java | 1612 --
926 files changed, 92742 insertions(+), 33276 deletions(-)
diff --cc Common/CommandLine.cpp
index 4dcbb5e,146b595..3caab5b
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@@ -1001,10 -968,9 +985,10 @@@ void GetOptions(int argc, char *argv[]
fprintf(stderr, "MED version : %d.%d.%d\n", MED_NUM_MAJEUR,
MED_NUM_MINEUR, MED_NUM_RELEASE);
#endif
+>>>>>>> upstream/2.9.3+dfsg1
fprintf(stderr, "Packaged by : %s\n", GMSH_PACKAGER);
- fprintf(stderr, "Web site : http://www.geuz.org/gmsh/\n");
- fprintf(stderr, "Mailing list : gmsh at geuz.org\n");
+ fprintf(stderr, "Web site : http://gmsh.info\n");
+ fprintf(stderr, "Mailing list : gmsh at onelab.info\n");
Msg::Exit(0);
}
else if(!strcmp(argv[i] + 1, "help") || !strcmp(argv[i] + 1, "-help")) {
diff --cc Common/GmshMessage.h
index 0d12e2d,a7582c2..70fd111
--- a/Common/GmshMessage.h
+++ b/Common/GmshMessage.h
@@@ -50,25 -46,12 +46,20 @@@ class Msg
// command-line-specified numbers and strings
static std::map<std::string, std::vector<double> > _commandLineNumbers;
static std::map<std::string, std::string> _commandLineStrings;
- #if !defined(HAVE_ONELAB2)
// communication with Gmsh when run remotely
static GmshClient *_client;
- #endif
- #if defined(HAVE_ONELAB2)
- // communication with onelab server (replace _client and old _onelabClient)
- static OnelabDatabase *_onelabClient;
- #elif defined(HAVE_ONELAB)
+ #if defined(HAVE_ONELAB)
// communication with onelab server
static onelab::client *_onelabClient;
+<<<<<<< HEAD
+=======
#endif
+<<<<<<< HEAD
+>>>>>>> upstream/2.9.3+dfsg1
+ // internal onelab status for Gmsh parser
+ static std::string _gmshOnelabAction;
+=======
+>>>>>>> upstream/2.10.1+dfsg1
// executable name
static std::string _execName;
public:
diff --cc Fltk/helpWindow.cpp
index 8c91303,74de1ba..63d90ce
--- a/Fltk/helpWindow.cpp
+++ b/Fltk/helpWindow.cpp
@@@ -340,10 -330,9 +340,10 @@@ helpWindow::helpWindow(
<< "<li><i>MED version:</i> " << MED_NUM_MAJEUR << "."
<< MED_NUM_MINEUR << "." << MED_NUM_RELEASE
#endif
+>>>>>>> upstream/2.9.3+dfsg1
<< "<li><i>Packaged by:</i> " << GetGmshPackager()
<< "</ul>"
- << "<center>Visit <a href=\"http://geuz.org/gmsh/\">http://geuz.org/gmsh/</a> "
+ << "<center>Visit <a href=\"http://gmsh.info\">http://gmsh.info</a> "
<< "for more information</center>";
o->value(sstream.str().c_str());
o->link(help_link);
diff --cc Mesh/meshGFaceDelaunayInsertion.cpp
index 38161b9,df8d26e..4ccc810
--- a/Mesh/meshGFaceDelaunayInsertion.cpp
+++ b/Mesh/meshGFaceDelaunayInsertion.cpp
@@@ -24,11 -24,8 +24,12 @@@
#include "Field.h"
#include "GModel.h"
#include "GFaceCompound.h"
+ #include "discreteDiskFace.h"
#include "intersectCurveSurface.h"
+<<<<<<< HEAD
+#include "surfaceFiller.h"
+=======
+>>>>>>> upstream/2.9.3+dfsg1
#include "HilbertCurve.h"
static double LIMIT_ = 0.5 * sqrt(2.0) * 1;
diff --cc Mesh/surfaceFiller.h
index 9897b55,9e0ee0c..a3515e9
--- a/Mesh/surfaceFiller.h
+++ b/Mesh/surfaceFiller.h
@@@ -12,15 -13,11 +13,16 @@@
class GFace;
class MVertex;
+<<<<<<< HEAD
+void packingOfParallelogramsSmoothness(GFace* gf, std::vector<MVertex*> &packed, std::vector<SMetric3> &metrics );
+void packingOfParallelograms(GFace* gf, std::vector<MVertex*> &packed, std::vector<SMetric3> &metrics );
+=======
- void packingOfParallelogramsSmoothness(GFace* gf, std::vector<MVertex*> &packed,
- std::vector<SMetric3> &metrics);
- void packingOfParallelograms(GFace* gf, std::vector<MVertex*> &packed,
- std::vector<SMetric3> &metrics);
+ void packingOfParallelogramsSmoothness(GFace* gf, std::vector<MVertex*> &packed, std::vector<SMetric3> &metrics );
+ void packingOfParallelograms(GFace* gf, std::vector<MVertex*> &packed, std::vector<SMetric3> &metrics );
+ void packingOfParallelogramsConstrained(GFace* gf, std::set<MVertex*> constr_vertices, std::vector<MVertex*> &packed, std::vector<SMetric3> &metrics );
+
+
#endif
+>>>>>>> upstream/2.9.3+dfsg1
diff --cc Parser/Gmsh.tab.hpp
index 73d38fb,bd1f4a5..52d20ad
--- a/Parser/Gmsh.tab.hpp
+++ b/Parser/Gmsh.tab.hpp
@@@ -667,38 -200,37 +667,39 @@@ extern int gmsh_yydebug
tShow = 410,
tHide = 411,
tGetValue = 412,
- tGetEnv = 413,
- tGetString = 414,
- tGetNumber = 415,
- tHomology = 416,
- tCohomology = 417,
- tBetti = 418,
- tExists = 419,
- tFileExists = 420,
- tGMSH_MAJOR_VERSION = 421,
- tGMSH_MINOR_VERSION = 422,
- tGMSH_PATCH_VERSION = 423,
- tGmshExecutableName = 424,
- tSetPartition = 425,
- tNameFromString = 426,
- tStringFromName = 427,
- tAFFECTPLUS = 428,
- tAFFECTMINUS = 429,
- tAFFECTTIMES = 430,
- tAFFECTDIVIDE = 431,
- tOR = 432,
- tAND = 433,
- tEQUAL = 434,
- tNOTEQUAL = 435,
- tLESSOREQUAL = 436,
- tGREATEROREQUAL = 437,
- tPLUSPLUS = 438,
- tMINUSMINUS = 439,
- UNARYPREC = 440
+ tGetStringValue = 413,
+ tGetEnv = 414,
+ tGetString = 415,
+ tGetNumber = 416,
+ tHomology = 417,
+ tCohomology = 418,
+ tBetti = 419,
+ tExists = 420,
+ tFileExists = 421,
+ tGMSH_MAJOR_VERSION = 422,
+ tGMSH_MINOR_VERSION = 423,
+ tGMSH_PATCH_VERSION = 424,
+ tGmshExecutableName = 425,
+ tSetPartition = 426,
+ tNameToString = 427,
+ tStringToName = 428,
+ tAFFECTPLUS = 429,
+ tAFFECTMINUS = 430,
+ tAFFECTTIMES = 431,
+ tAFFECTDIVIDE = 432,
+ tOR = 433,
+ tAND = 434,
+ tEQUAL = 435,
+ tNOTEQUAL = 436,
+ tLESSOREQUAL = 437,
+ tGREATEROREQUAL = 438,
+ tPLUSPLUS = 439,
+ tMINUSMINUS = 440,
+ UNARYPREC = 441
};
+>>>>>>> upstream/2.10.1+dfsg1
#endif
+>>>>>>> upstream/2.9.3+dfsg1
/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@@ -722,14 -246,8 +723,14 @@@ union YYSTYP
double v[5];
Shape s;
List_T *l;
+<<<<<<< HEAD
+}
+/* Line 1529 of yacc.c. */
+#line 391 "Gmsh.tab.hpp"
+ YYSTYPE;
+=======
- #line 250 "Gmsh.tab.hpp" /* yacc.c:1909 */
+ #line 251 "Gmsh.tab.hpp" /* yacc.c:1909 */
};
typedef union YYSTYPE YYSTYPE;
diff --cc Parser/Gmsh.yy.cpp
index e6f91ce,5730fa3..6d997a6
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@@ -1943,40 -1937,8 +1945,40 @@@ return tGetValue
YY_BREAK
case 103:
YY_RULE_SETUP
+<<<<<<< HEAD
+#line 184 "Gmsh.l"
+return tHypot;
+>>>>>>> upstream/2.9.3+dfsg1
+ YY_BREAK
+case 104:
+YY_RULE_SETUP
+#line 186 "Gmsh.l"
+<<<<<<< HEAD
+return tIntersect;
+=======
+return tIn;
+>>>>>>> upstream/2.9.3+dfsg1
+ YY_BREAK
+case 105:
+YY_RULE_SETUP
+#line 187 "Gmsh.l"
+<<<<<<< HEAD
+return tInterpolationScheme;
+ YY_BREAK
+case 106:
+YY_RULE_SETUP
+#line 189 "Gmsh.l"
+return tNurbsKnots;
+ YY_BREAK
+case 107:
+YY_RULE_SETUP
+#line 191 "Gmsh.l"
+return tLength;
+=======
+return tIf;
+=======
#line 183 "Gmsh.l"
- return tGMSH_MAJOR_VERSION;
+ return tGetStringValue;
YY_BREAK
case 104:
YY_RULE_SETUP
diff --cc Plugin/AnalyseCurvedMesh.cpp
index 8ee5bfd,3b3cc3c..cf23774
--- a/Plugin/AnalyseCurvedMesh.cpp
+++ b/Plugin/AnalyseCurvedMesh.cpp
@@@ -1,28 -1,11 +1,28 @@@
- // Gmsh - Copyright (C) 1997-2015 C. Geuzaine, J.-F. Remacle
+ // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
- // bugs and problems to the public mailing list <gmsh at geuz.org>.
+ // bugs and problems to the public mailing list <gmsh at onelab.info>.
#include "AnalyseCurvedMesh.h"
+<<<<<<< HEAD
+#include "GModel.h"
+#include "OS.h"
+#include "Context.h"
+
+#include <cmath>
+#include <queue>
+#include <sstream>
+
+//#include "Gmsh.h"
+//#include "GmshMessage.h"
+//#include "polynomialBasis.h"
+//#include <fstream>
+//#include "PView.h"
+
+=======
#include "OS.h"
#include "Context.h"
+>>>>>>> upstream/2.9.3+dfsg1
#if defined(HAVE_OPENGL)
#include "drawContext.h"
#endif
diff --cc contrib/onelab/python/onelab.py
index f2269c0,6f16aea..4640609
--- a/contrib/onelab/python/onelab.py
+++ b/contrib/onelab/python/onelab.py
@@@ -24,14 -24,10 +24,14 @@@ ACTION, ARISING OUT OF OR IN CONNECTIO
OF THIS SOFTWARE.
Please report all bugs and problems to the public mailing list
- <gmsh at geuz.org>.
+ <gmsh at onelab.info>.
"""
+<<<<<<< HEAD
+import socket, struct, os, sys, subprocess
+=======
import socket, struct, os, sys, subprocess, time
+>>>>>>> upstream/2.9.3+dfsg1
_VERSION = '1.1'
def path(dirname, inp):
diff --cc wrappers/gmshpy/gmshGeo.i
index b5d09cb,d195c20..e210043
--- a/wrappers/gmshpy/gmshGeo.i
+++ b/wrappers/gmshpy/gmshGeo.i
@@@ -195,9 -200,12 +200,14 @@@ namespace std
$self->xyz2uvw(xyz, &uvw[0]);
return uvw;
}
+ std::vector<MVertex*> getVertices() {
+ std::vector <MVertex*> vertices;
+ $self->getVertices(vertices);
+ return vertices;
+ }
}
+<<<<<<< HEAD
+=======
%extend GEdge {
void setTransfinite(int nbPointsTransfinite, int typeTransfinite = 0, double coeffTransfinite = 1) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git
More information about the debian-science-commits
mailing list