[gmsh] 01/04: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Thu Oct 20 20:52:58 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 1426988e393464d00e8f9153da29583d8874b449
Merge: c49de80 40b8734
Author: Anton Gladky <gladk at debian.org>
Date: Thu Oct 20 22:44:01 2016 +0200
Merge.
.gitignore | 1 -
CMakeLists.txt | 65 +-
Common/CommandLine.cpp | 25 +-
Common/Context.h | 3 -
Common/CreateFile.cpp | 13 +-
Common/DefaultOptions.h | 9 +-
Common/Gmsh.cpp | 26 +-
Common/Gmsh.h | 3 -
Common/GmshDefines.h | 3 +-
Common/GmshMessage.cpp | 106 +
Common/GmshMessage.h | 19 +-
Common/GmshSocket.h | 10 +-
Common/OS.cpp | 14 +
Common/OS.h | 1 +
Common/OpenFile.cpp | 15 +-
Common/Options.cpp | 2 +-
Common/gmshLocalNetworkClient.cpp | 151 +-
Common/onelab.h | 105 +-
Fltk/FlGui.cpp | 3 -
Fltk/drawContextFltk.h | 6 +
Fltk/fileDialogs.cpp | 6 +-
Fltk/graphicWindow.cpp | 50 +-
Fltk/helpWindow.cpp | 18 +-
Fltk/highOrderToolsWindow.cpp | 7 -
Fltk/onelabGroup.cpp | 63 +-
Fltk/openglWindow.cpp | 4 -
Fltk/optionWindow.cpp | 11 +-
Fltk/solverButton.cpp | 54 +
Geo/CMakeLists.txt | 2 +-
Geo/GModel.cpp | 140 +-
Geo/GModel.h | 4 +
Geo/GModelFactory.h | 12 -
Geo/GModelIO_CGNS.cpp | 708 +-
Geo/GModelIO_GEO.cpp | 30 +-
Geo/GModelIO_MSH2.cpp | 2 +-
Geo/GModelIO_OCC.cpp | 51 -
Geo/GModelIO_TOCHNOG.cpp | 186 +
Geo/GRegion.h | 13 +-
Geo/Geo.cpp | 104 +-
Geo/Geo.h | 2 +
Geo/GeoStringInterface.cpp | 6 +-
Geo/GeomMeshMatcher.cpp | 13 -
Geo/MElement.cpp | 38 +
Geo/MElement.h | 13 +-
Geo/MElementOctree.cpp | 42 +-
Geo/MHexahedron.h | 7 +-
Geo/MLine.cpp | 5 -
Geo/MLine.h | 4 +
Geo/MPrism.cpp | 33 -
Geo/MPrism.h | 5 +-
Geo/MPyramid.h | 6 +-
Geo/MQuadrangle.h | 26 +-
Geo/MTetrahedron.h | 4 +
Geo/MTriangle.h | 18 +-
Geo/MVertex.cpp | 19 +
Geo/MVertex.h | 1 +
Geo/MVertexPositionSet.h | 91 -
Geo/MVertexRTree.h | 15 +-
Geo/OCCFace.cpp | 2 +-
Geo/OCCRegion.cpp | 14 +
Geo/SOrientedBoundingBox.cpp | 5 -
Geo/STensor3.h | 2 -
Geo/SVector3.h | 3 -
Geo/discreteDiskFace.cpp | 402 +-
Geo/discreteDiskFace.h | 30 +-
Geo/discreteEdge.cpp | 44 +-
Geo/discreteEdge.h | 3 +-
Geo/discreteFace.cpp | 464 +-
Geo/discreteFace.h | 12 +-
Geo/gmshEdge.cpp | 6 +-
Geo/gmshLevelset.cpp | 4 -
Graphics/CMakeLists.txt | 1 +
Graphics/ReadImg.cpp | 22 +-
Graphics/drawContext.cpp | 41 +-
Graphics/drawContext.h | 6 -
Graphics/drawScales.cpp | 57 +-
Mesh/BDS.cpp | 2 +-
Mesh/BackgroundMesh.cpp | 25 -
Mesh/CMakeLists.txt | 1 +
Mesh/Field.cpp | 55 -
Mesh/Generator.cpp | 2 +-
Mesh/Generator.h | 4 +
Mesh/HighOrder.cpp | 335 -
Mesh/QuadTriExtruded2D.cpp | 52 -
Mesh/meshDiscreteRegion.cpp | 99 +
Mesh/meshGEdge.cpp | 27 +-
Mesh/meshGFace.cpp | 88 -
Mesh/meshGFaceDelaunayInsertion.cpp | 306 +-
Mesh/meshGFaceOptimize.cpp | 4 +-
Mesh/meshGRegion.cpp | 112 +-
Mesh/meshGRegionBoundaryRecovery.cpp | 18 +-
Mesh/meshGRegionRelocateVertex.cpp | 34 +-
Mesh/meshGRegionRelocateVertex.h | 7 +-
Mesh/meshRefine.cpp | 3 -
Mesh/qualityMeasuresJacobian.cpp | 113 +-
Mesh/qualityMeasuresJacobian.h | 3 +-
Mesh/surfaceFiller.h | 5 -
Numeric/BasisFactory.cpp | 52 -
Numeric/BasisFactory.h | 12 -
Numeric/CMakeLists.txt | 6 -
Numeric/FuncSpaceData.h | 2 +-
Numeric/JacobianBasis.cpp | 381 +-
Numeric/JacobianBasis.h | 146 +-
Numeric/Numeric.cpp | 5 -
Numeric/Numeric.h | 3 -
Numeric/bezierBasis.cpp | 331 +-
Numeric/bezierBasis.h | 10 +-
Numeric/fullMatrix.cpp | 55 +
Numeric/fullMatrix.h | 21 +-
Numeric/nodalBasis.h | 7 +-
Parser/FunctionManager.cpp | 13 -
Parser/FunctionManager.h | 5 -
Parser/Gmsh.l | 7 -
Parser/Gmsh.tab.cpp | 520 +-
Parser/Gmsh.y | 69 +-
Parser/Gmsh.yy.cpp | 40 -
Plugin/AnalyseCurvedMesh.cpp | 93 +-
Plugin/AnalyseCurvedMesh.h | 17 -
Plugin/MinMax.cpp | 11 -
Plugin/Triangulate.cpp | 70 -
Post/PViewData.cpp | 48 -
Post/PViewData.h | 19 -
Post/adaptiveData.cpp | 7 -
Solver/dofManager.h | 20 +-
Solver/eigenSolver.cpp | 46 +-
Solver/eigenSolver.h | 17 -
Solver/elasticitySolver.cpp | 73 -
Solver/linearSystemPETSc.h | 7 -
contrib/HighOrderMeshOptimizer/CMakeLists.txt | 3 -
contrib/HighOrderMeshOptimizer/OptHOM.cpp | 68 +-
contrib/HighOrderMeshOptimizer/OptHOM.h | 16 -
.../HighOrderMeshOptimizer/OptHomFastCurving.cpp | 6 -
.../OptHomIntegralBoundaryDist.cpp | 46 -
.../OptHomIntegralBoundaryDist.h | 3 -
contrib/HighOrderMeshOptimizer/OptHomMesh.cpp | 29 +-
contrib/HighOrderMeshOptimizer/OptHomRun.cpp | 206 +-
contrib/HighOrderMeshOptimizer/OptHomRun.h | 10 -
contrib/Parasolid/CMakeLists.txt | 6 -
contrib/Parasolid/interface_parasolid/Makefile | 50 -
.../interface_parasolid/ParasolidDataBase.cpp | 731 -
.../interface_parasolid/ParasolidDataBase.h | 100 -
.../interface_parasolid/ParasolidGModelBuilder.cpp | 818 -
.../interface_parasolid/ParasolidGModelBuilder.h | 52 -
.../Parasolid/interface_parasolid/callbacks.cpp | 1037 -
contrib/Parasolid/interface_parasolid/callbacks.h | 55 -
contrib/Parasolid/interface_parasolid/fg.c | 827 -
contrib/Parasolid/interface_parasolid/frustrum.c | 2720 --
.../Parasolid/interface_parasolid/frustrum_delta.c | 415 -
.../interface_parasolid/include/frustrum_ifails.h | 47 -
.../include/frustrum_interface.h | 43 -
.../interface_parasolid/include/frustrum_tokens.h | 153 -
.../interface_parasolid/include/kernel_interface.h | 3259 --
.../interface_parasolid/include/parasolid_debug.h | 504 -
.../interface_parasolid/include/parasolid_ifails.h | 657 -
.../interface_parasolid/include/parasolid_kernel.h | 29735 -------------------
.../interface_parasolid/include/parasolid_tokens.h | 737 -
.../include/parasolid_typedefs.h | 181 -
contrib/Parasolid/interface_parasolid/main.c | 386 -
.../interface_parasolid/schema/sch_0_15.sch_txt | 584 -
.../interface_parasolid/schema/sch_10002.sch_txt | 1236 -
.../interface_parasolid/schema/sch_10004.sch_txt | 1238 -
.../schema/sch_100_1000.sch_txt | 586 -
.../interface_parasolid/schema/sch_10100.sch_txt | 1252 -
.../interface_parasolid/schema/sch_1022.sch_txt | 738 -
.../interface_parasolid/schema/sch_11003.sch_txt | 1254 -
.../interface_parasolid/schema/sch_11004.sch_txt | 1254 -
.../interface_parasolid/schema/sch_110_0.sch_txt | 586 -
.../interface_parasolid/schema/sch_12006.sch_txt | 1274 -
.../interface_parasolid/schema/sch_120_0.sch_txt | 586 -
.../interface_parasolid/schema/sch_12102.sch_txt | 1276 -
.../interface_parasolid/schema/sch_12103.sch_txt | 1279 -
.../interface_parasolid/schema/sch_13005.sch_txt | 1279 -
.../interface_parasolid/schema/sch_13006.sch_txt | 1280 -
.../interface_parasolid/schema/sch_130_0.sch_txt | 586 -
.../interface_parasolid/schema/sch_14000.sch_txt | 1281 -
.../interface_parasolid/schema/sch_140_0.sch_txt | 586 -
.../interface_parasolid/schema/sch_15003.sch_txt | 1286 -
.../interface_parasolid/schema/sch_15102.sch_txt | 1298 -
.../interface_parasolid/schema/sch_16002.sch_txt | 1302 -
.../interface_parasolid/schema/sch_16003.sch_txt | 1303 -
.../interface_parasolid/schema/sch_16004.sch_txt | 1306 -
.../interface_parasolid/schema/sch_16100.sch_txt | 1313 -
.../interface_parasolid/schema/sch_17104.sch_txt | 1342 -
.../interface_parasolid/schema/sch_17105.sch_txt | 1357 -
.../interface_parasolid/schema/sch_17106.sch_txt | 1355 -
.../interface_parasolid/schema/sch_18005.sch_txt | 1369 -
.../interface_parasolid/schema/sch_18007.sch_txt | 1389 -
.../interface_parasolid/schema/sch_18106.sch_txt | 1381 -
.../interface_parasolid/schema/sch_19002.sch_txt | 1386 -
.../interface_parasolid/schema/sch_19007.sch_txt | 1399 -
.../interface_parasolid/schema/sch_19008.sch_txt | 1398 -
.../interface_parasolid/schema/sch_20000.sch_txt | 1407 -
.../schema/sch_200_1009.sch_txt | 691 -
.../schema/sch_200_1010.sch_txt | 693 -
.../schema/sch_200_1011.sch_txt | 696 -
.../schema/sch_200_1012.sch_txt | 696 -
.../schema/sch_210_1012.sch_txt | 696 -
.../interface_parasolid/schema/sch_25000.sch_txt | 1439 -
.../interface_parasolid/schema/sch_25001.sch_txt | 1434 -
.../interface_parasolid/schema/sch_26102.sch_txt | 1470 -
.../interface_parasolid/schema/sch_26104.sch_txt | 1471 -
.../interface_parasolid/schema/sch_26105.sch_txt | 1472 -
.../interface_parasolid/schema/sch_3000.sch_txt | 738 -
.../schema/sch_300_1022.sch_txt | 739 -
.../interface_parasolid/schema/sch_4011.sch_txt | 782 -
.../interface_parasolid/schema/sch_4022.sch_txt | 837 -
.../interface_parasolid/schema/sch_4030.sch_txt | 847 -
.../interface_parasolid/schema/sch_4031.sch_txt | 847 -
.../interface_parasolid/schema/sch_4032.sch_txt | 847 -
.../interface_parasolid/schema/sch_4035.sch_txt | 848 -
.../interface_parasolid/schema/sch_4039.sch_txt | 851 -
.../interface_parasolid/schema/sch_5015.sch_txt | 958 -
.../interface_parasolid/schema/sch_5021.sch_txt | 1030 -
.../interface_parasolid/schema/sch_5030.sch_txt | 1011 -
.../interface_parasolid/schema/sch_5031.sch_txt | 1011 -
.../interface_parasolid/schema/sch_5032.sch_txt | 1013 -
.../interface_parasolid/schema/sch_5033.sch_txt | 973 -
.../interface_parasolid/schema/sch_5041.sch_txt | 986 -
.../interface_parasolid/schema/sch_5049.sch_txt | 986 -
.../interface_parasolid/schema/sch_5050.sch_txt | 988 -
.../interface_parasolid/schema/sch_5051.sch_txt | 983 -
.../interface_parasolid/schema/sch_5053.sch_txt | 984 -
.../interface_parasolid/schema/sch_5054.sch_txt | 982 -
.../interface_parasolid/schema/sch_5056.sch_txt | 986 -
.../interface_parasolid/schema/sch_5057.sch_txt | 986 -
.../interface_parasolid/schema/sch_5058.sch_txt | 982 -
.../interface_parasolid/schema/sch_5059.sch_txt | 982 -
.../interface_parasolid/schema/sch_6020.sch_txt | 1110 -
.../interface_parasolid/schema/sch_6021.sch_txt | 1111 -
.../interface_parasolid/schema/sch_7002.sch_txt | 1110 -
.../interface_parasolid/schema/sch_7007.sch_txt | 1103 -
.../interface_parasolid/schema/sch_7014.sch_txt | 1187 -
.../interface_parasolid/schema/sch_7015.sch_txt | 1180 -
.../interface_parasolid/schema/sch_7016.sch_txt | 1163 -
.../interface_parasolid/schema/sch_8000.sch_txt | 1147 -
.../interface_parasolid/schema/sch_8002.sch_txt | 1148 -
.../interface_parasolid/schema/sch_8005.sch_txt | 1152 -
.../interface_parasolid/schema/sch_8008.sch_txt | 1161 -
.../interface_parasolid/schema/sch_8101.sch_txt | 1172 -
.../interface_parasolid/schema/sch_9001.sch_txt | 1175 -
.../interface_parasolid/schema/sch_9003.sch_txt | 1226 -
.../interface_parasolid/schema/sch_9008.sch_txt | 1227 -
.../interface_parasolid/schema/sch_9100.sch_txt | 1229 -
.../testcases/3D solid-X-Y plane.xmt_txt | 78 -
.../testcases/3D solid-Z-Y plane.xmt_txt | 73 -
.../interface_parasolid/testcases/B1.xmt_txt | 92 -
.../interface_parasolid/testcases/B2.xmt_txt | 163 -
.../interface_parasolid/testcases/B3.xmt_txt | 90 -
.../interface_parasolid/testcases/B4.xmt_txt | 160 -
.../interface_parasolid/testcases/Block.xmt_txt | 61 -
.../testcases/Cutting-punch.xmt_txt | 124 -
.../testcases/Cutting-punch2.xmt_txt | 119 -
.../testcases/Hole CAD model.xmt_txt | 144 -
.../testcases/Work-piece.xmt_txt | 89 -
.../interface_parasolid/testcases/blend1.xmt_txt | 120 -
.../interface_parasolid/testcases/blend2.xmt_txt | 109 -
.../interface_parasolid/testcases/blend3.xmt_txt | 146 -
.../interface_parasolid/testcases/brut.xmt_txt | 476 -
.../interface_parasolid/testcases/bsurf.xmt_txt | 49 -
.../interface_parasolid/testcases/fan.xmt_txt | 1176 -
.../testcases/instance_block.xmt_txt | 71 -
.../testcases/instance_block_inscribed.xmt_txt | 90 -
.../testcases/instance_block_tool.xmt_txt | 80 -
.../testcases/instance_cuboid_tool.xmt_txt | 72 -
.../testcases/instance_cuboid_tool2.xmt_txt | 84 -
.../testcases/instance_h_shape.xmt_txt | 167 -
.../testcases/instance_multi_level.xmt_txt | 222 -
.../testcases/instance_prism_tool.xmt_txt | 86 -
.../testcases/instance_sheet_body.xmt_txt | 64 -
.../testcases/instance_solid_cyl.xmt_txt | 43 -
.../testcases/instance_solid_cyl2.xmt_txt | 43 -
.../testcases/sheet_body.xmt_txt | 23 -
.../testcases/twoplates.xmt_txt | 279 -
contrib/mobile/Android/AndroidManifest.xml | 8 +-
contrib/mobile/Android/res/layout/splash.xml | 4 -
contrib/mobile/Android/res/values/strings.xml | 3 +-
.../Android/src/org/geuz/onelab/AboutActivity.java | 142 +-
.../Android/src/org/geuz/onelab/GLESRender.java | 108 +-
.../mobile/Android/src/org/geuz/onelab/Gmsh.java | 297 +-
.../Android/src/org/geuz/onelab/MainActivity.java | 745 +-
.../mobile/Android/src/org/geuz/onelab/Model.java | 88 +-
.../src/org/geuz/onelab/ModelArrayAdapter.java | 106 +-
.../Android/src/org/geuz/onelab/ModelFragment.java | 545 +-
.../Android/src/org/geuz/onelab/ModelList.java | 641 +-
.../src/org/geuz/onelab/OptionsActivity.java | 124 +-
.../org/geuz/onelab/OptionsDisplayFragment.java | 251 +-
.../src/org/geuz/onelab/OptionsFragment.java | 195 +-
.../src/org/geuz/onelab/OptionsModelFragment.java | 200 +-
.../geuz/onelab/OptionsPostProcessingFragment.java | 255 +-
.../Android/src/org/geuz/onelab/Parameter.java | 275 +-
.../src/org/geuz/onelab/ParameterNumber.java | 731 +-
.../src/org/geuz/onelab/ParameterString.java | 379 +-
.../org/geuz/onelab/PostProcessingActivity.java | 46 +-
.../src/org/geuz/onelab/SeparatedListView.java | 301 +-
.../Android/src/org/geuz/onelab/SplashScreen.java | 174 +-
.../Android/src/org/geuz/onelab/Stepper.java | 140 +-
.../Android/src/org/geuz/onelab/StringTexture.java | 319 +-
.../src/org/geuz/onelab/mGLSurfaceView.java | 214 +-
contrib/mobile/CMakeLists.txt | 7 -
contrib/mobile/README.txt | 1 -
contrib/mobile/androidUtils.h | 32 -
contrib/mobile/drawContext.cpp | 116 +-
contrib/mobile/drawContext.h | 6 -
.../mobile/iOS/Onelab.xcodeproj/project.pbxproj | 22 +-
contrib/mobile/iOS/Onelab/AboutViewController.h | 1 +
contrib/mobile/iOS/Onelab/AboutViewController.mm | 58 +-
contrib/mobile/iOS/Onelab/AppDelegate.h | 5 +-
contrib/mobile/iOS/Onelab/AppDelegate.mm | 1 -
contrib/mobile/iOS/Onelab/EAGLView.h | 42 +-
contrib/mobile/iOS/Onelab/EAGLView.mm | 33 -
contrib/mobile/iOS/Onelab/ModelListController.h | 6 +-
contrib/mobile/iOS/Onelab/ModelListController.mm | 238 +-
contrib/mobile/iOS/Onelab/ModelViewController.h | 15 +-
contrib/mobile/iOS/Onelab/ModelViewController.mm | 70 +-
contrib/mobile/iOS/Onelab/Onelab-Info.plist | 5 +-
contrib/mobile/iOS/Onelab/OptionsViewController.mm | 2 +-
contrib/mobile/iOS/Onelab/Parameter.h | 1 -
contrib/mobile/iOS/Onelab/Parameter.mm | 174 +-
.../mobile/iOS/Onelab/ParametersViewController.mm | 8 +-
contrib/mobile/iOS/Onelab/Utils.mm | 7 -
contrib/mobile/iOS/Onelab/emulatorFix.c | 8 +-
contrib/mobile/utils/android_build.sh | 17 +-
contrib/mobile/utils/iOS.cmake | 7 -
contrib/mobile/utils/ios_build.sh | 8 +-
contrib/mobile/utils/iossimulator_build.sh | 8 +-
contrib/mobile/utils/microlight.js | 209 +
contrib/mobile/utils/onelab_ios_build.sh | 95 -
contrib/mobile/utils/onelab_iossimulator_build.sh | 61 -
.../mobile/utils/petsc_reconfigure_android_real.py | 25 -
contrib/onelab/OnelabParser.cpp | 6 +-
contrib/onelab/python/onelab.py | 67 +-
contrib/taucs/config/taucs_config_build.h | 2 -
doc/CREDITS.txt | 11 +-
doc/VERSIONS.txt | 20 +-
doc/gmsh.html | 26 +-
doc/texinfo/commandline.texi | 2 +
doc/texinfo/gmsh.texi | 2 +-
doc/texinfo/opt_fields.texi | 35 +-
doc/texinfo/opt_solver.texi | 2 +-
doc/texinfo/opt_view.texi | 2 +-
tutorial/t15.geo | 43 +-
utils/api_demos/CMakeLists.txt | 3 +
utils/api_demos/mainReadMesh.cpp | 31 +
utils/misc/package_gmsh_getdp.sh | 199 -
utils/misc/package_onelab.sh | 210 +
utils/solvers/c++/GmshSocket.h | 3 -
wrappers/gmshpy/__init__.py.in | 3 -
wrappers/gmshpy/gmshGeo.i | 6 -
wrappers/gmshpy/gmshNumeric.i | 16 +
wrappers/gmshpy/gmshtypemaps.i | 215 +-
wrappers/java/CMakeLists.txt | 10 +-
351 files changed, 6539 insertions(+), 148648 deletions(-)
--
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