[gmsh] 01/05: Merge tag 'upstream/2.8.3+dfsg'
Anton Gladky
gladk at alioth.debian.org
Sun Sep 29 12:37:54 UTC 2013
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gmsh.
commit 0cb764d34bb8b6e580492bcc89e00a85eb79a339
Merge: 5f48ae2 55ddcd9
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Sun Sep 29 10:25:37 2013 +0200
Merge tag 'upstream/2.8.3+dfsg'
Upstream version 2.8.3+dfsg
CMakeLists.txt | 204 +-
Common/CommandLine.cpp | 10 +-
Common/Context.h | 4 +-
Common/CreateFile.cpp | 161 +-
Common/CreateFile.h | 3 +-
Common/DefaultOptions.h | 27 +-
Common/GamePad.cpp | 3 +-
Common/GamePad.h | 5 +-
Common/GmshConfig.h.in | 1 +
Common/GmshDefines.h | 35 +-
Common/GmshMessage.cpp | 46 +-
Common/GmshSocket.h | 4 +-
Common/OS.cpp | 5 -
Common/OpenFile.cpp | 14 +-
Common/Options.cpp | 53 +-
Common/Options.h | 6 +
Common/SmoothData.cpp | 46 +
Common/SmoothData.h | 8 +-
Common/onelabUtils.cpp | 17 +-
Fltk/CMakeLists.txt | 2 +-
Fltk/FlGui.cpp | 35 +-
Fltk/extraDialogs.cpp | 153 -
Fltk/extraDialogs.h | 3 -
Fltk/fileDialogs.cpp | 105 +-
Fltk/graphicWindow.cpp | 380 +-
Fltk/graphicWindow.h | 1 +
Fltk/helpWindow.cpp | 81 +-
Fltk/helpWindow.h | 5 +
Fltk/highOrderToolsWindow.cpp | 66 +-
Fltk/inputRange.h | 26 +-
Fltk/inputValue.cpp | 76 +
Fltk/inputValue.h | 25 +
Fltk/onelabGroup.cpp | 50 +-
Fltk/onelabGroup.h | 8 +-
Fltk/openglWindow.cpp | 17 +-
Fltk/optionWindow.cpp | 59 +-
Fltk/optionWindow.h | 7 +-
Fltk/solverButton.cpp | 6 +
Fltk/viewButton.cpp | 114 +-
Fltk/visibilityWindow.cpp | 2 +-
Geo/CMakeLists.txt | 3 +-
Geo/CustomContainer.h | 13 +-
Geo/ExtrudeParams.cpp | 26 +
Geo/ExtrudeParams.h | 9 +
Geo/GEdge.cpp | 26 +-
Geo/GEdge.h | 3 +
Geo/GEdgeCompound.cpp | 6 +-
Geo/GFace.cpp | 6 +-
Geo/GFace.h | 17 +-
Geo/GFaceCompound.cpp | 109 +-
Geo/GFaceCompound.h | 3 +
Geo/GModel.cpp | 50 +-
Geo/GModel.h | 45 +-
Geo/GModelFactory.cpp | 47 +-
Geo/GModelFactory.h | 54 +-
Geo/GModelIO_ACTRAN.cpp | 118 +
Geo/GModelIO_CELUM.cpp | 123 +
Geo/GModelIO_CGNS.cpp | 4 +-
Geo/GModelIO_GEO.cpp | 16 +
Geo/GModelIO_MESH.cpp | 6 -
Geo/GModelIO_MSH.cpp | 4 +-
Geo/GModelIO_OCC.cpp | 2 +
Geo/GModelIO_SGEOM.cpp | 1120 +++
Geo/GModelIO_SGEOM.h | 68 +
Geo/GModelIO_STL.cpp | 8 +-
Geo/GModelIO_SU2.cpp | 107 +
Geo/GModelIO_UNV.cpp | 17 +
Geo/GRbf.cpp | 4 +-
Geo/GRbf.h | 7 +-
Geo/GVertex.cpp | 35 +-
Geo/GVertex.h | 6 +
Geo/Geo.cpp | 2323 +++---
Geo/Geo.h | 74 +-
Geo/GeoInterpolation.cpp | 35 +-
Geo/MElement.cpp | 172 +-
Geo/MElement.h | 5 +-
Geo/MFace.cpp | 4 +-
Geo/MFace.h | 6 +-
Geo/MHexahedron.cpp | 90 +-
Geo/MHexahedron.h | 11 +-
Geo/MLine.cpp | 49 +-
Geo/MLine.h | 1 +
Geo/MPrism.cpp | 160 +-
Geo/MPrism.h | 104 +
Geo/MPyramid.cpp | 40 +-
Geo/MPyramid.h | 25 +-
Geo/MQuadrangle.cpp | 90 +-
Geo/MQuadrangle.h | 33 +-
Geo/MTetrahedron.cpp | 79 +-
Geo/MTetrahedron.h | 12 +-
Geo/MTriangle.cpp | 84 +-
Geo/MTriangle.h | 13 +-
Geo/MVertex.cpp | 12 +
Geo/MVertex.h | 1 +
Geo/OCCEdge.cpp | 8 +-
Geo/SGEOMIncludes.h | 337 +
Geo/boundaryLayersData.cpp | 675 +-
Geo/boundaryLayersData.h | 116 +-
Geo/discreteFace.h | 1 +
Geo/gmshFace.cpp | 2 +-
Geo/gmshLevelset.cpp | 12 +-
Geo/gmshLevelset.h | 5 +-
Graphics/drawPost.cpp | 6 +-
Mesh/BoundaryLayers.cpp | 199 +-
Mesh/CMakeLists.txt | 2 +-
Mesh/CenterlineField.cpp | 4 +-
Mesh/Field.cpp | 109 +-
Mesh/Field.h | 36 +
Mesh/FieldPython.h | 59 +
Mesh/Generator.cpp | 111 +-
Mesh/HighOrder.cpp | 691 +-
Mesh/QuadTriExtruded2D.cpp | 296 +-
Mesh/QuadTriExtruded2D.h | 4 +-
Mesh/QuadTriExtruded3D.cpp | 376 +-
Mesh/QuadTriUtils.cpp | 222 +-
Mesh/QuadTriUtils.h | 8 +
Mesh/directions3D.cpp | 563 +-
Mesh/directions3D.h | 15 +-
Mesh/meshGEdge.cpp | 35 +-
Mesh/meshGFace.cpp | 264 +-
Mesh/meshGFace.h | 10 +-
Mesh/meshGFaceDelaunayInsertion.cpp | 34 +-
Mesh/meshGFaceDelaunayInsertion.h | 1 +
Mesh/meshGFaceExtruded.cpp | 69 +-
Mesh/meshGFaceLloyd.cpp | 6 +-
Mesh/meshGFaceOptimize.cpp | 162 +-
Mesh/meshGFaceRecombine.cpp | 833 ++-
Mesh/meshGFaceRecombine.h | 127 +-
Mesh/meshGRegion.cpp | 619 +-
Mesh/meshGRegion.h | 8 +-
Mesh/meshGRegionBoundaryLayers.cpp | 212 -
Mesh/meshGRegionDelaunayInsertion.cpp | 80 +-
Mesh/meshGRegionDelaunayInsertion.h | 4 +-
Mesh/meshMetric.cpp | 111 +-
Mesh/meshPartition.cpp | 5 +-
Mesh/simple3D.cpp | 119 +-
Mesh/simple3D.h | 2 +-
Mesh/yamakawa.cpp | 10 +-
Mesh/yamakawa.h | 2 +-
Numeric/ElementType.cpp | 108 +-
Numeric/ElementType.h | 20 +-
Numeric/JacobianBasis.cpp | 375 +-
Numeric/JacobianBasis.h | 65 +-
Numeric/bezierBasis.cpp | 690 +-
Numeric/nodalBasis.cpp | 988 ++-
Numeric/polynomialBasis.cpp | 137 +-
Parser/Gmsh.l | 9 +
Parser/Gmsh.tab.cpp | 7444 ++++++++++----------
Parser/Gmsh.tab.hpp | 494 +-
Parser/Gmsh.y | 225 +-
Parser/Gmsh.yy.cpp | 1331 ++--
Plugin/AnalyseCurvedMesh.cpp | 20 +-
Plugin/Crack.cpp | 40 +-
Post/PView.cpp | 14 +
Post/PView.h | 3 +
Post/PViewData.h | 5 +-
Post/PViewDataGModel.cpp | 8 +-
Post/PViewDataGModel.h | 5 +-
Post/PViewDataGModelIO.cpp | 21 +-
Post/PViewDataIO.cpp | 3 +-
Post/PViewDataList.h | 3 +-
Post/PViewDataListIO.cpp | 13 +-
Post/PViewVertexArrays.cpp | 11 +-
README.txt | 3 +-
Solver/eigenSolver.cpp | 18 +-
Solver/functionSpace.h | 1 +
Solver/linearSystemPETSc.cpp | 282 +-
Solver/linearSystemPETSc.h | 113 +-
Solver/linearSystemPETSc.hpp | 151 +-
Solver/multiscaleLaplace.cpp | 12 +-
contrib/HighOrderMeshOptimizer/CMakeLists.txt | 2 +
contrib/HighOrderMeshOptimizer/OptHOM.cpp | 4 +-
contrib/HighOrderMeshOptimizer/OptHOM.h | 2 +-
.../HighOrderMeshOptimizer/OptHomFastCurving.cpp | 448 ++
contrib/HighOrderMeshOptimizer/OptHomFastCurving.h | 53 +
contrib/HighOrderMeshOptimizer/OptHomMesh.cpp | 34 +-
contrib/HighOrderMeshOptimizer/OptHomMesh.h | 4 +-
contrib/HighOrderMeshOptimizer/OptHomRun.cpp | 19 +-
contrib/HighOrderMeshOptimizer/ParamCoord.h | 2 +-
contrib/HighOrderMeshOptimizer/SuperEl.cpp | 300 +
contrib/HighOrderMeshOptimizer/SuperEl.h | 77 +
contrib/mobile/Android/AndroidManifest.xml | 15 +-
.../mobile/Android/res/drawable-hdpi/ic_list.png | Bin 464 -> 0 bytes
.../mobile/Android/res/drawable-hdpi/ic_mesh.png | Bin 760 -> 0 bytes
.../Android/res/drawable-hdpi/ic_settings.png | Bin 1412 -> 0 bytes
.../Android/res/layout/activity_fragment.xml | 7 +
.../mobile/Android/res/layout/activity_model.xml | 10 +
.../mobile/Android/res/layout/activity_twopane.xml | 27 +
contrib/mobile/Android/res/layout/control_bar.xml | 43 +
.../mobile/Android/res/layout/fragment_model.xml | 6 +
.../mobile/Android/res/layout/fragment_options.xml | 35 +
.../res/layout/fragment_options_display.xml | 8 +
.../Android/res/layout/fragment_postprocessing.xml | 38 +
contrib/mobile/Android/res/layout/model.xml | 17 +-
contrib/mobile/Android/res/raw/models.zip | Bin 23732 -> 3480515 bytes
contrib/mobile/Android/res/values-sw600dp/refs.xml | 5 +
contrib/mobile/Android/res/values/refs.xml | 5 +
contrib/mobile/Android/res/values/strings.xml | 27 +-
contrib/mobile/Android/res/xml/models.xml | 15 -
.../Android/src/org/geuz/onelab/GLESRender.java | 63 +-
.../mobile/Android/src/org/geuz/onelab/Gmsh.java | 96 +-
.../Android/src/org/geuz/onelab/MainActivity.java | 745 +-
.../mobile/Android/src/org/geuz/onelab/Model.java | 42 +
.../src/org/geuz/onelab/ModelArrayAdapter.java | 47 +
.../Android/src/org/geuz/onelab/ModelFragment.java | 228 +
.../Android/src/org/geuz/onelab/ModelList.java | 387 +-
.../src/org/geuz/onelab/ModeleArrayAdapter.java | 53 -
.../mobile/Android/src/org/geuz/onelab/Models.java | 40 -
.../src/org/geuz/onelab/OptionsActivity.java | 51 +
.../org/geuz/onelab/OptionsDisplayFragment.java | 148 +
.../src/org/geuz/onelab/OptionsFragment.java | 110 +
.../src/org/geuz/onelab/OptionsModelFragment.java | 109 +
.../geuz/onelab/OptionsPostProcessingFragment.java | 122 +
.../Android/src/org/geuz/onelab/Parameter.java | 35 +-
.../src/org/geuz/onelab/ParameterNumber.java | 93 +-
.../src/org/geuz/onelab/ParameterString.java | 45 +-
.../org/geuz/onelab/PostProcessingActivity.java | 28 +
.../src/org/geuz/onelab/SeparatedListView.java | 29 +-
.../Android/src/org/geuz/onelab/SplashScreen.java | 17 +-
.../Android/src/org/geuz/onelab/StringTexture.java | 172 +
.../src/org/geuz/onelab/mGLSurfaceView.java | 65 +-
contrib/mobile/CMakeLists.txt | 39 +-
contrib/mobile/androidGModel.cpp | 187 +-
contrib/mobile/androidGModel.h | 88 +-
contrib/mobile/drawContext.cpp | 414 +-
contrib/mobile/drawContext.h | 18 +-
contrib/mobile/drawGModel.cpp | 655 --
contrib/mobile/drawGModel.h | 57 -
contrib/mobile/drawGeom.cpp | 97 +
contrib/mobile/drawMesh.cpp | 123 +
contrib/mobile/drawString.cpp | 83 +
contrib/mobile/drawString.h | 32 +
.../mobile/iOS/Onelab.xcodeproj/project.pbxproj | 349 +-
contrib/mobile/iOS/Onelab/AppDelegate.h | 5 +
contrib/mobile/iOS/Onelab/AppDelegate.mm | 16 +-
contrib/mobile/iOS/Onelab/DetailViewController.h | 35 -
contrib/mobile/iOS/Onelab/DetailViewController.mm | 394 --
contrib/mobile/iOS/Onelab/EAGLView.h | 8 +-
contrib/mobile/iOS/Onelab/EAGLView.mm | 76 +-
contrib/mobile/iOS/Onelab/MasterViewController.mm | 471 --
contrib/mobile/iOS/Onelab/Model.h | 29 +
contrib/mobile/iOS/Onelab/Model.mm | 66 +
contrib/mobile/iOS/Onelab/ModelListController.h | 23 +
contrib/mobile/iOS/Onelab/ModelListController.mm | 207 +
contrib/mobile/iOS/Onelab/ModelViewController.h | 44 +
contrib/mobile/iOS/Onelab/ModelViewController.mm | 402 ++
contrib/mobile/iOS/Onelab/Onelab-Info.plist | 35 +-
contrib/mobile/iOS/Onelab/OptionsViewController.h | 16 +
contrib/mobile/iOS/Onelab/OptionsViewController.mm | 262 +
contrib/mobile/iOS/Onelab/Parameter.h | 74 +
contrib/mobile/iOS/Onelab/Parameter.mm | 388 +
...ViewController.h => ParametersViewController.h} | 13 +-
.../mobile/iOS/Onelab/ParametersViewController.mm | 318 +
.../iOS/Onelab/PostProcessingViewController.h | 28 +
.../iOS/Onelab/PostProcessingViewController.mm | 126 +
contrib/mobile/iOS/Onelab/SplitViewController.h | 21 +
contrib/mobile/iOS/Onelab/SplitViewController.mm | 58 +
contrib/mobile/iOS/Onelab/Utils.h | 16 +
contrib/mobile/iOS/Onelab/Utils.mm | 35 +
.../iOS/Onelab/en.lproj/MainStoryboard.storyboard | 153 -
.../iOS/Onelab/en.lproj/iPadStoryboard.storyboard | 317 +
.../en.lproj/iPhoneiPodStoryboard.storyboard | 286 +
.../Onelab/files/{ => magnet}/Magnetostatics.pro | 0
contrib/mobile/iOS/Onelab/files/magnet/infos.xml | 5 +
.../iOS/Onelab/files/{ => magnet}/magnet.geo | 0
.../iOS/Onelab/files/{ => magnet}/magnet.pro | 0
.../iOS/Onelab/files/{ => magnet}/magnet_data.pro | 0
contrib/mobile/iOS/Onelab/files/{ => pmsm}/BH.pro | 0
contrib/mobile/iOS/Onelab/files/pmsm/infos.xml | 4 +
.../files/{ => pmsm}/machine_magstadyn_a.pro | 0
.../mobile/iOS/Onelab/files/{ => pmsm}/pmsm.geo | 0
.../mobile/iOS/Onelab/files/{ => pmsm}/pmsm.pro | 0
.../Onelab/files/{ => pmsm}/pmsm_8p_circuit.pro | 0
.../iOS/Onelab/files/{ => pmsm}/pmsm_data.geo | 0
.../iOS/Onelab/files/{ => pmsm}/pmsm_rotor.geo | 0
.../iOS/Onelab/files/{ => pmsm}/pmsm_stator.geo | 0
contrib/mobile/iOS/Onelab/{main.m => main.mm} | 0
contrib/mobile/iosGModel.cpp | 22 +
contrib/mobile/iosGModel.h | 19 +-
contrib/mobile/utils/onelab_android.sh | 18 +-
contrib/onelab/python/onelab.py | 6 +-
demos/splines.geo | 3 +-
doc/CREDITS.txt | 2 +-
doc/VERSIONS.txt | 13 +-
doc/gmsh.html | 14 +-
doc/texinfo/cmake_options.texi | 111 +
doc/texinfo/commandline.texi | 18 +-
doc/texinfo/gmsh.texi | 277 +-
doc/texinfo/opt_fields.texi | 8 +
doc/texinfo/opt_mesh.texi | 5 +
doc/texinfo/opt_plugin.texi | 4 +-
doc/texinfo/opt_post.texi | 2 +-
doc/texinfo/opt_print.texi | 25 +
doc/texinfo/opt_solver.texi | 2 +-
doc/texinfo/shortcuts.texi | 2 -
tutorial/t8.geo | 85 +-
tutorial/t8.par | 50 -
utils/api_demos/CMakeLists.txt | 14 +-
utils/api_demos/README.txt | 25 -
utils/api_demos/mainElasticity.cpp | 2 +-
utils/api_demos/mainGeoFactory.cpp | 31 +
utils/api_demos/mainGlut.cpp | 344 +-
utils/api_demos/mainHomology.cpp | 3 +-
utils/api_demos/mainLevelset.cpp | 701 --
utils/misc/package_gmsh_getdp.sh | 4 +-
utils/solvers/python/pend.py | 3 +
wrappers/gmshpy/CMakeLists.txt | 1 +
wrappers/gmshpy/gmshGeo.i | 39 +
wrappers/gmshpy/gmshMesh.i | 16 +
wrappers/gmshpy/gmshSolver.i | 1 +
wrappers/java/WrapGmsh.i | 20 +-
.../main/java/com/artenum/sample/EssaiGmsh_v1.java | 11 +-
312 files changed, 23723 insertions(+), 14719 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