yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #09032
[yade/trunk] 2ae187: Improvements in Law2_ScGeom_CapillaryPhys_Capillar...
Branch: refs/heads/jakob
Home: https://github.com/yade/trunk
Commit: 2ae187f4e1b7ce49c063e20fdd0253c4e0a4c85c
https://github.com/yade/trunk/commit/2ae187f4e1b7ce49c063e20fdd0253c4e0a4c85c
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-03-19 (Mon, 19 Mar 2012)
Changed paths:
M pkg/dem/CapillaryPhys.hpp
M pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp
M pkg/dem/Ip2_FrictMat_FrictMat_MindlinCapillaryPhys.hpp
M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
A scripts/scanreplace.pyc
A site_scons/site_tools/qt4/__init__.pyc
A yadeSCons.pyc
Log Message:
-----------
Improvements in Law2_ScGeom_CapillaryPhys_Capillarity.cpp (included isBroken flag and updated checkFusion)
Commit: f2f51857c93cd6a1a03baa67e36f813d6cd991bd
https://github.com/yade/trunk/commit/f2f51857c93cd6a1a03baa67e36f813d6cd991bd
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-03-20 (Tue, 20 Mar 2012)
Changed paths:
R scripts/scanreplace.pyc
R site_scons/site_tools/qt4/__init__.pyc
R yadeSCons.pyc
Log Message:
-----------
deleted *.pyc files
Commit: 01b02b9de976d7848729254777a4a38dd2c30957
https://github.com/yade/trunk/commit/01b02b9de976d7848729254777a4a38dd2c30957
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-03-20 (Tue, 20 Mar 2012)
Changed paths:
M .gitignore
M doc/sphinx/installation.rst
M doc/sphinx/templates/index.html
M yadeSCons.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 09acb060c7d3e6249732e14dd71c655f84cd72be
https://github.com/yade/trunk/commit/09acb060c7d3e6249732e14dd71c655f84cd72be
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-03-21 (Wed, 21 Mar 2012)
Changed paths:
M yadeSCons.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: f2c794d81aadfb7211f542cbc4e737ed460c7d0d
https://github.com/yade/trunk/commit/f2c794d81aadfb7211f542cbc4e737ed460c7d0d
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-03-21 (Wed, 21 Mar 2012)
Changed paths:
M pkg/common/ResetRandomPosition.hpp
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: b2fd11d2425f5756be861e46c8d33856fcb2671b
https://github.com/yade/trunk/commit/b2fd11d2425f5756be861e46c8d33856fcb2671b
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-03-26 (Mon, 26 Mar 2012)
Changed paths:
A examples/ResetRandomPosition.py
A examples/baraban/rotating-cylinder.py
A examples/clumps/clump-hopper-viscoelastic.py
A examples/clumps/clump-inbox-viscoelastic.py
A examples/clumps/clump-viscoelastic.py
A examples/gts-horse/gts-horse.py
A examples/gts-horse/gts-operators.py
A examples/gts-horse/gts-random-pack-obb.py
A examples/gts-horse/gts-random-pack.py
A examples/gts-horse/horse.coarse.gts
R examples/not-working/ResetRandomPosition.py
R examples/not-working/clump-hopper-viscoelastic.py
R examples/not-working/clump-inbox-viscoelastic.py
R examples/not-working/clump-viscoelastic.py
R examples/not-working/gts-horse/gts-horse.py
R examples/not-working/gts-horse/gts-operators.py
R examples/not-working/gts-horse/gts-random-pack-obb.py
R examples/not-working/gts-horse/gts-random-pack.py
R examples/not-working/gts-horse/horse.coarse.gts
R examples/not-working/rotating-cylinder.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: c9db8b0ccf360ac27610967c37370162f546e036
https://github.com/yade/trunk/commit/c9db8b0ccf360ac27610967c37370162f546e036
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date: 2012-03-26 (Mon, 26 Mar 2012)
Changed paths:
A examples/ResetRandomPosition.py
A examples/baraban/rotating-cylinder.py
A examples/clumps/clump-hopper-viscoelastic.py
A examples/clumps/clump-inbox-viscoelastic.py
A examples/clumps/clump-viscoelastic.py
R examples/not-working/ResetRandomPosition.py
R examples/not-working/clump-hopper-viscoelastic.py
R examples/not-working/clump-inbox-viscoelastic.py
R examples/not-working/clump-viscoelastic.py
R examples/not-working/rotating-cylinder.py
Log Message:
-----------
Fix some examples.
Commit: 1025779dd02d63c699b482b3f60bff3c28a3e11b
https://github.com/yade/trunk/commit/1025779dd02d63c699b482b3f60bff3c28a3e11b
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date: 2012-03-26 (Mon, 26 Mar 2012)
Changed paths:
A examples/gts-horse/gts-horse.py
A examples/gts-horse/gts-operators.py
A examples/gts-horse/gts-random-pack-obb.py
A examples/gts-horse/gts-random-pack.py
A examples/gts-horse/horse.coarse.gts
R examples/not-working/gts-horse/gts-horse.py
R examples/not-working/gts-horse/gts-operators.py
R examples/not-working/gts-horse/gts-random-pack-obb.py
R examples/not-working/gts-horse/gts-random-pack.py
R examples/not-working/gts-horse/horse.coarse.gts
Log Message:
-----------
Reenable gts-scripts.
Commit: cca6c0265334956075208da581eabbabbbf5fd89
https://github.com/yade/trunk/commit/cca6c0265334956075208da581eabbabbbf5fd89
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-04-11 (Wed, 11 Apr 2012)
Changed paths:
M SConstruct
M core/Body.hpp
M core/BodyContainer.cpp
M core/main/main.py.in
M doc/sphinx/installation.rst
M doc/sphinx/templates/index.html
M doc/yade-articles.bib
M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
M py/geom.py
M py/pack/pack.py
M py/runtime.py
Log Message:
-----------
test
Commit: 0f1b9682be71e9e2aae26b9ed6a2a0732f21612e
https://github.com/yade/trunk/commit/0f1b9682be71e9e2aae26b9ed6a2a0732f21612e
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-04-11 (Wed, 11 Apr 2012)
Changed paths:
M doc/sphinx/introduction.rst
A pkg/common/CylScGeom6D.cpp
A pkg/common/CylScGeom6D.hpp
M pkg/common/Cylinder.cpp
M pkg/common/Cylinder.hpp
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: b5b3c6379b01d11746ee88d36bb8885b1a4bb7c4
https://github.com/yade/trunk/commit/b5b3c6379b01d11746ee88d36bb8885b1a4bb7c4
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-04-11 (Wed, 11 Apr 2012)
Log Message:
-----------
Merge branch 'master' of github.com:jakob-ifgt/trunk
Commit: 89e73bbc54dfee2b52d954a23f20717e1a36c642
https://github.com/yade/trunk/commit/89e73bbc54dfee2b52d954a23f20717e1a36c642
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-04-17 (Tue, 17 Apr 2012)
Changed paths:
M .kdev4/yade.kdev4
M CMakeLists.txt
M SConstruct
M core/main/main.py.in
M core/main/pyboot.cpp
M doc/sphinx/conf.py
M doc/sphinx/installation.rst
M doc/sphinx/introduction.rst
A doc/sphinx/ipython_directive012.py
M doc/sphinx/prog.rst
M doc/sphinx/yadeSphinx.py
A examples/CohesiveCylinderSphere.py
M examples/clumps/clump-hopper-viscoelastic.py
M examples/clumps/clump-inbox-viscoelastic.py
M examples/clumps/clump-viscoelastic.py
M examples/concrete/periodic.py
M examples/not-working/facet-topo.py
M examples/not-working/insertion-sort-collider.py
M examples/not-working/periodic-compress.py
M examples/not-working/periodic-grow.py
M examples/packs/packs.py
M examples/simpleShear.py
M examples/test/WireMatPM/net-2part-displ-unloading.py
M examples/test/WireMatPM/net-2part-strain.py
M examples/test/collider-stride-triax.py
M examples/test/collider-stride.py
M examples/test/facet-sphere.py
M examples/test/flat-collider.py
M examples/test/periodic-geom-compare.py
M examples/test/periodic-shear.py
M examples/test/periodic-simple-shear.py
M examples/test/periodic-simple.py
M examples/test/periodic-triax-settingHsize.py
M examples/test/periodic-triax.py
M examples/test/subdomain-balancer.py
M examples/test/wall.py
M gui/qt4/_GLViewer.cpp
M lib/base/Logging.hpp
M lib/triangulation/FlowBoundingSphere.hpp
M lib/triangulation/FlowBoundingSphere.ipp
M lib/triangulation/Network.hpp
M lib/triangulation/Network.ipp
M lib/triangulation/def_types.h
M pkg/common/Cylinder.cpp
M pkg/dem/DomainLimiter.cpp
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
M pkg/dem/PeriIsoCompressor.cpp
M pkg/dem/PeriIsoCompressor.hpp
M py/SConscript
M py/__init__.py.in
M py/_eudoxos.cpp
M py/_utils.cpp
R py/log.cpp
M py/pack/_packPredicates.cpp
M py/pack/pack.py
M py/system.py
M py/tests/__init__.py
M py/wrapper/yadeWrapper.cpp
M scripts/checks-and-tests/checks/checkTestDummy.py
M scripts/checks-and-tests/checks/checkTestTriax.py
M scripts/checks-and-tests/checks/checkWeight.py
M scripts/checks-and-tests/compare-identical.py
M scripts/checks-and-tests/law-test.py
M scripts/checks-and-tests/serialization-benchmark.py
M yadeSCons.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 40504e3c9d9073acde7591167e58ac6cf8581663
https://github.com/yade/trunk/commit/40504e3c9d9073acde7591167e58ac6cf8581663
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-04-23 (Mon, 23 Apr 2012)
Changed paths:
M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
Log Message:
-----------
make fusionDetection and isBroken flag compatible
Commit: 29186270a9f99fac881da0493ec5820a1bb30f57
https://github.com/yade/trunk/commit/29186270a9f99fac881da0493ec5820a1bb30f57
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-04-23 (Mon, 23 Apr 2012)
Changed paths:
M examples/clumps/clump-viscoelastic.py
M examples/gts-horse/gts-horse.py
M examples/packs/packs.py
M examples/triax-tutorial/script-session1.py
M examples/triax-tutorial/script-session2.py
M lib/triangulation/FlowBoundingSphere.hpp
M lib/triangulation/FlowBoundingSphere.ipp
M lib/triangulation/PeriodicFlow.cpp
M lib/triangulation/PeriodicFlow.hpp
M lib/triangulation/def_types.h
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
M py/pack/pack.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 567f75d5a0a7aeb8686064813e7adff63ead0208
https://github.com/yade/trunk/commit/567f75d5a0a7aeb8686064813e7adff63ead0208
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-04-24 (Tue, 24 Apr 2012)
Changed paths:
M SConstruct
M core/Body.hpp
M core/BodyContainer.cpp
M core/BodyContainer.hpp
M core/Interaction.cpp
M core/Interaction.hpp
M lib/import/STLReader.hpp
M lib/triangulation/FlowBoundingSphere.hpp
M lib/triangulation/FlowBoundingSphere.ipp
M pkg/common/Cylinder.cpp
M pkg/common/InteractionLoop.cpp
M pkg/common/OpenGLRenderer.cpp
M pkg/common/OpenGLRenderer.hpp
R pkg/common/SubdomainBalancer.cpp
R pkg/common/SubdomainBalancer.hpp
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
M pkg/dem/ViscoelasticPM.cpp
M py/SConscript
M py/pack/SpherePadder/SpherePadder.cpp
M py/tests/wrapper.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 4182c708217549c18cb3c918b8848911337a4055
https://github.com/yade/trunk/commit/4182c708217549c18cb3c918b8848911337a4055
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-04-27 (Fri, 27 Apr 2012)
Changed paths:
M examples/packs/packs.py
M lib/triangulation/FlowBoundingSphere.ipp
M lib/triangulation/PeriodicFlow.cpp
M lib/triangulation/Tesselation.ipp
M lib/triangulation/def_types.h
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
M py/geom.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 96ad7214888b19ca71c9eeaa7c36d68e0563c0ec
https://github.com/yade/trunk/commit/96ad7214888b19ca71c9eeaa7c36d68e0563c0ec
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-05-07 (Mon, 07 May 2012)
Changed paths:
M CMakeLists.txt
M SConstruct
M doc/sphinx/formulation.rst
M doc/sphinx/installation.rst
M doc/sphinx/prog.rst
M examples/test/CundallStrackTest.py
A examples/test/WireMatPM/net-2part-displ-unloading.py
R examples/test/WireMatPM/net-2part-displ-unloading.py
R examples/test/WireMatPM/net-2part-displ.py
A examples/test/WireMatPM/net-2part-displ.py
R examples/test/WireMatPM/net-2part-strain.py
A examples/test/WireMatPM/net-2part-strain.py
M examples/test/exact-rot-facet.py
M examples/test/exact-rot.py
M lib/import/STLReader.hpp
M lib/triangulation/FlowBoundingSphere.ipp
M lib/triangulation/PeriodicFlow.cpp
M lib/triangulation/PeriodicFlow.hpp
M pkg/common/InsertionSortCollider.hpp
M pkg/common/ZECollider.hpp
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
M pkg/dem/GlobalStiffnessTimeStepper.hpp
M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
M pkg/dem/VTKRecorder.hpp
M py/_utils.cpp
M py/geom.py
M py/pack/SpherePadder/SpherePadder.cpp
M py/pack/pack.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 9f4e3e667b05a2e44d506738fea6da84a5b4a9c8
https://github.com/yade/trunk/commit/9f4e3e667b05a2e44d506738fea6da84a5b4a9c8
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-05-07 (Mon, 07 May 2012)
Changed paths:
M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
A pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp~
Log Message:
-----------
improvements in Law2_ScGeom_CapillaryPhys_Capillarity
Commit: c04eff6d5d2b71ffa95a2fc9c5721670cc87c9de
https://github.com/yade/trunk/commit/c04eff6d5d2b71ffa95a2fc9c5721670cc87c9de
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-05-07 (Mon, 07 May 2012)
Changed paths:
R pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp~
Log Message:
-----------
removed backup file Law2_ScGeom_CapillaryPhys_Capillarity.cpp~
Commit: b6236a0effe33eac85c46fa3195b0a982abd1a12
https://github.com/yade/trunk/commit/b6236a0effe33eac85c46fa3195b0a982abd1a12
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-05-10 (Thu, 10 May 2012)
Changed paths:
M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
Log Message:
-----------
Fix memory leak in capillary law and make isBroken flag compatible with fusionDetection
Commit: 01fb063c0ab698d8da7ad1d8c17afeaca91090f7
https://github.com/yade/trunk/commit/01fb063c0ab698d8da7ad1d8c17afeaca91090f7
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M CMakeLists.txt
M SConstruct
A cMake/CombineSources.cmake
A cMake/FindEigen2.cmake
A cMake/FindEigen3.cmake
A cMake/Findglib2.cmake
A cMake/GetVersion.cmake
M core/BodyContainer.cpp
M core/Cell.hpp
M core/SimulationFlow.cpp
M core/ThreadRunner.cpp
M lib/SConscript
M pkg/common/InteractionLoop.hpp
M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
M py/export.py
M py/ymport.py
Log Message:
-----------
try to update/merge
Commit: 6e3707385a7ce9dbbf5a24f199bbf06e42a8fbfa
https://github.com/yade/trunk/commit/6e3707385a7ce9dbbf5a24f199bbf06e42a8fbfa
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M CMakeLists.txt
M SConstruct
R cMake/CombineSources.cmake
A cMake/FindCGAL.cmake
A cMake/FindGL2PS.cmake
A cMake/FindGTS.cmake
A cMake/FindQGLVIEWER.cmake
M cMake/GetVersion.cmake
M core/BodyContainer.cpp
M core/Cell.hpp
M core/Scene.hpp
M core/main/main.py.in
M doc/sphinx/installation.rst
A gui/CMakeLists.txt
M gui/qt4/GLViewer.hpp
M gui/qt4/OpenGLManager.hpp
M lib/base/openmp-accu.hpp
M lib/triangulation/FlowBoundingSphere.hpp
M lib/triangulation/FlowBoundingSphere.ipp
M lib/triangulation/PeriodicFlow.cpp
M lib/triangulation/PeriodicFlow.hpp
M lib/triangulation/def_types.h
M pkg/common/InsertionSortCollider.cpp
M pkg/common/InsertionSortCollider.hpp
M pkg/dem/ElasticContactLaw.cpp
M pkg/dem/ElasticContactLaw.hpp
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
M pkg/dem/FrictPhys.cpp
M pkg/dem/FrictPhys.hpp
M pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.cpp
M pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp
M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
M pkg/dem/NewtonIntegrator.cpp
M pkg/dem/NewtonIntegrator.hpp
M pkg/dem/PeriIsoCompressor.cpp
M pkg/dem/Shop.cpp
M pkg/dem/Shop.hpp
M pkg/dem/VTKRecorder.cpp
A py/CMakeLists.txt
M py/__init__.py.in
M py/_utils.cpp
M py/bodiesHandling.py
M py/config.py.in
M py/export.py
M py/geom.py
M py/pack/pack.py
M py/tests/core.py
M py/ymport.py
Log Message:
-----------
try to update/merge 2
Commit: ff92861d714c3bae50ad01c03db10018783cf314
https://github.com/yade/trunk/commit/ff92861d714c3bae50ad01c03db10018783cf314
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
Log Message:
-----------
fix last commit
Commit: cc040a1a542d715433ea357410f95fe352a735de
https://github.com/yade/trunk/commit/cc040a1a542d715433ea357410f95fe352a735de
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M CMakeLists.txt
A cMake/FindCholmod.cmake
A cMake/FindGMP.cmake
A cMake/FindGMPXX.cmake
M cMake/GetVersion.cmake
M core/Cell.hpp
M core/main/main.py.in
M core/main/yade-batch.in
M doc/sphinx/installation.rst
M doc/sphinx/prog.rst
M examples/baraban/rotating-cylinder.py
M examples/funnel.py
M examples/mill.py
M examples/not-working/insertion-sort-collider.py
M examples/not-working/periodic-compress.py
M examples/not-working/periodic-grow.py
M examples/ring2d/ringCundallDamping.py
M examples/rod-penetration/model.py
M examples/test/collider-stride.py
M examples/test/collider-sweep-simple.py
M examples/test/facet-sphere.py
M examples/test/flat-collider.py
M examples/test/peri3dController_triaxialCompression.py
M examples/test/periodic-geom-compare.py
M examples/test/periodic-shear.py
M examples/test/periodic-simple.py
M examples/test/remove-body.py
M examples/test/test-sphere-facet-corner.py
M examples/test/test-sphere-facet.py
M examples/test/wall.py
M lib/triangulation/FlowBoundingSphere.hpp
M lib/triangulation/FlowBoundingSphere.ipp
M lib/triangulation/Network.hpp
M lib/triangulation/Network.ipp
M lib/triangulation/def_types.h
M pkg/common/Bo1_Sphere_Aabb.hpp
M pkg/common/Cylinder.hpp
M pkg/common/InsertionSortCollider.hpp
M pkg/dem/CohFrictPhys.hpp
R pkg/dem/CohesionlessMomentRotation.cpp
R pkg/dem/CohesionlessMomentRotation.hpp
M pkg/dem/CohesiveFrictionalContactLaw.cpp
M pkg/dem/CohesiveFrictionalContactLaw.hpp
M pkg/dem/CohesiveFrictionalPM.cpp
R pkg/dem/CundallStrack.cpp
R pkg/dem/CundallStrack.hpp
M pkg/dem/ElasticContactLaw.cpp
M pkg/dem/ElasticContactLaw.hpp
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
M pkg/dem/Ip2_CohFrictMat_CohFrictMat_CohFrictPhys.cpp
M pkg/dem/PeriIsoCompressor.cpp
M pkg/dem/Shop.cpp
M pkg/dem/Shop.hpp
M pkg/dem/TriaxialTest.cpp
M py/_utils.cpp
M py/config.py.in
M py/pack/pack.py
M py/system.py
M py/tests/wrapper.py
M py/wrapper/yadeWrapper.cpp
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 0e92e173d5a4fb656322f29961a9f465e8910ea9
https://github.com/yade/trunk/commit/0e92e173d5a4fb656322f29961a9f465e8910ea9
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M CMakeLists.txt
A cMake/CombineSources.cmake
M doc/sphinx/installation.rst
M lib/triangulation/FlowBoundingSphere.hpp
M lib/triangulation/FlowBoundingSphere.ipp
M lib/triangulation/Network.hpp
M lib/triangulation/Network.ipp
M lib/triangulation/PeriodicFlow.cpp
M lib/triangulation/PeriodicFlow.hpp
M lib/triangulation/Tesselation.h
M lib/triangulation/Tesselation.ipp
M lib/triangulation/def_types.h
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
M pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp
M py/runtime.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 8738de4bcb680eaf1a6f58e66cb8478e0d204ca9
https://github.com/yade/trunk/commit/8738de4bcb680eaf1a6f58e66cb8478e0d204ca9
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M .gitignore
R SConscript
R SConstruct
M core/Body.hpp
M core/Cell.hpp
M core/Interaction.hpp
M core/InteractionContainer.cpp
R core/SConscript
M core/Scene.hpp
M core/SimulationFlow.cpp
M core/main/main.py.in
M doc/references.bib
M doc/sphinx/conf.py
A doc/sphinx/fig/localstrain.png
M doc/sphinx/installation.rst
M doc/sphinx/introduction.rst
M doc/sphinx/prog.rst
M doc/yade-conferences.bib
A examples/tesselationWrapper.py
M examples/test/triax-basic.py
R extra/SConscript
R gui/SConscript
R lib/SConscript
M lib/triangulation/FlowBoundingSphere.hpp
M lib/triangulation/FlowBoundingSphere.ipp
M lib/triangulation/PeriodicFlow.cpp
M lib/triangulation/PeriodicFlow.hpp
M lib/triangulation/TriaxialState.cpp
M pkg/dem/CohesiveFrictionalContactLaw.hpp
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
M pkg/dem/MicroMacroAnalyser.cpp
M pkg/dem/TesselationWrapper.hpp
R py/SConscript
M py/config.py.in
M py/runtime.py
M py/utils.py
R yadeSCons.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 00d3fe851622cf61e5978661001b001b2c5e9ac2
https://github.com/yade/trunk/commit/00d3fe851622cf61e5978661001b001b2c5e9ac2
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
A scons.current-profile
A scons.profile-default
Log Message:
-----------
merge branch
Commit: f6891cc34e5fea0eced71195bf9e4e6cc9eb893d
https://github.com/yade/trunk/commit/f6891cc34e5fea0eced71195bf9e4e6cc9eb893d
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
R scons.current-profile
R scons.profile-default
Log Message:
-----------
merge branch without local scons files
Commit: cb0cb9b3f586a39953e3ef95e1a584e593863d3a
https://github.com/yade/trunk/commit/cb0cb9b3f586a39953e3ef95e1a584e593863d3a
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M pkg/dem/Shop.cpp
M pkg/dem/Shop.hpp
M py/_utils.cpp
Log Message:
-----------
include calm function
Commit: 52ef0f0884264a93d02fa0c3c14034d34f761151
https://github.com/yade/trunk/commit/52ef0f0884264a93d02fa0c3c14034d34f761151
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M pkg/dem/Shop.cpp
Log Message:
-----------
fix mask bug in calm function
Commit: 7d204b604218ea6c3e11a91f982ea2290e46c734
https://github.com/yade/trunk/commit/7d204b604218ea6c3e11a91f982ea2290e46c734
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M pkg/dem/VTKRecorder.cpp
M pkg/dem/VTKRecorder.hpp
Log Message:
-----------
export boxes with vtkrecorder (not tested, boxesCells missing)
Commit: f34ce263bad3df4083689c8a0814e9ecf2c97b59
https://github.com/yade/trunk/commit/f34ce263bad3df4083689c8a0814e9ecf2c97b59
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M pkg/dem/VTKRecorder.cpp
M pkg/dem/VTKRecorder.hpp
Log Message:
-----------
export boxes with vtkrecorder (visualization works, but is not ok)
Commit: f1cebc02fc8632060b03e5b4d0148c27509125fb
https://github.com/yade/trunk/commit/f1cebc02fc8632060b03e5b4d0148c27509125fb
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp
M pkg/dem/ScGeom.hpp
M pkg/dem/TesselationWrapper.hpp
M pkg/dem/VTKRecorder.cpp
M pkg/dem/VTKRecorder.hpp
M py/pack/_packSpheres.cpp
Log Message:
-----------
merge branch
Commit: bbe19eec6348616f5c25e536af9b0aec245f39fb
https://github.com/yade/trunk/commit/bbe19eec6348616f5c25e536af9b0aec245f39fb
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-08-22 (Wed, 22 Aug 2012)
Changed paths:
M CMakeLists.txt
M core/BodyContainer.cpp
A core/Clump.cpp
A core/Clump.hpp
M doc/sphinx/installation.rst
M doc/yade-conferences.bib
M examples/concrete/periodic.py
M examples/concrete/uniax.py
M examples/test/peri3dController_example1.py
M examples/test/peri3dController_shear.py
A examples/test/test_Ip2_FrictMat_CpmMat_FrictPhys.py
M lib/opengl/OpenGLWrapper.hpp
M lib/triangulation/FlowBoundingSphere.hpp
M lib/triangulation/FlowBoundingSphere.ipp
M lib/triangulation/Network.ipp
M lib/triangulation/PeriodicFlow.cpp
M lib/triangulation/PeriodicFlow.hpp
M lib/triangulation/def_types.h
M pkg/common/OpenGLRenderer.cpp
R pkg/dem/Clump.cpp
R pkg/dem/Clump.hpp
M pkg/dem/ConcretePM.cpp
M pkg/dem/ConcretePM.hpp
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
M pkg/dem/GlobalStiffnessTimeStepper.cpp
M pkg/dem/NewtonIntegrator.cpp
M pkg/dem/RockPM.hpp
M pkg/dem/Shop.cpp
M pkg/dem/VTKRecorder.cpp
M py/export.py
M py/wrapper/yadeWrapper.cpp
M py/ymport.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 5b7a02b1d51f479c8fb0ac3a9865f1269b54fce4
https://github.com/yade/trunk/commit/5b7a02b1d51f479c8fb0ac3a9865f1269b54fce4
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-09-26 (Wed, 26 Sep 2012)
Changed paths:
M CMakeLists.txt
A README.rst
M cMake/GetVersion.cmake
M core/Body.hpp
M core/FileGenerator.cpp
M core/InteractionContainer.cpp
M core/State.hpp
M core/main/main.py.in
M doc/references.bib
M doc/sphinx/citing.rst
M doc/sphinx/formulation.rst
M doc/sphinx/installation.rst
M doc/sphinx/prog.rst
M doc/sphinx/tutorial-hands-on.rst
M doc/sphinx/user.rst
M doc/sphinx/yade.bodiesHandling.rst
M doc/sphinx/yade.geom.rst
M doc/sphinx/yadeSphinx.py
M doc/yade-articles.bib
M doc/yade-conferences.bib
M doc/yade-theses.bib
R examples/CohesiveCylinderSphere.py
A examples/chained-cylinders/CohesiveCylinderSphere.py
A examples/chained-cylinders/chained-cylinder-roots.py
A examples/chained-cylinders/chained-cylinder-spring.py
A examples/clumps/triax-basic-with-clumps.py
R examples/test/chained-cylinder/chained-cylinder-roots.py
R examples/test/chained-cylinder/chained-cylinder-spring.py
M examples/test/triax-basic.py
A examples/test/triax-cohesive.py
A examples/test/unv-read/unvReadVTKExport.py
A examples/timeStepperUsage.py
M gui/qt4/GLViewer.hpp
M gui/qt4/_GLViewer.cpp
M gui/qt4/__init__.py
M lib/base/Math.hpp
M lib/triangulation/FlowBoundingSphere.hpp
M lib/triangulation/FlowBoundingSphere.ipp
M lib/triangulation/PeriodicFlow.cpp
M pkg/common/Cylinder.cpp
M pkg/common/Cylinder.hpp
M pkg/common/Gl1_NormPhys.hpp
M pkg/common/Gl1_Sphere.hpp
M pkg/common/InsertionSortCollider.hpp
M pkg/common/KinematicEngines.hpp
M pkg/common/ZECollider.hpp
M pkg/dem/CohesiveFrictionalContactLaw.cpp
M pkg/dem/ConcretePM.cpp
M pkg/dem/ConcretePM.hpp
M pkg/dem/FlatGridCollider.hpp
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
M pkg/dem/GlobalStiffnessTimeStepper.cpp
M pkg/dem/GlobalStiffnessTimeStepper.hpp
M pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp
M pkg/dem/L3Geom.hpp
M pkg/dem/NewtonIntegrator.cpp
M pkg/dem/NewtonIntegrator.hpp
M pkg/dem/PeriIsoCompressor.cpp
M pkg/dem/PeriIsoCompressor.hpp
M pkg/dem/RockPM.cpp
M pkg/dem/RockPM.hpp
M pkg/dem/ScGeom.hpp
M pkg/dem/Shop.cpp
M pkg/dem/Shop.hpp
M pkg/dem/TesselationWrapper.hpp
M pkg/dem/TriaxialCompressionEngine.cpp
M pkg/dem/TriaxialCompressionEngine.hpp
M pkg/dem/TriaxialTest.hpp
M pkg/dem/VTKRecorder.hpp
M pkg/dem/ViscoelasticPM.cpp
M pkg/dem/ViscoelasticPM.hpp
M py/3rd-party/pygts-0.3.1/__init__.py
M py/_extraDocs.py
M py/_utils.cpp
M py/bodiesHandling.py
M py/export.py
M py/geom.py
M py/pack/pack.py
M py/plot.py
M py/tests/cohesive-chain.py
M py/tests/core.py
M py/utils.py
M py/wrapper/yadeWrapper.cpp
M py/ymport.py
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 48ebd9262146c4f3ffe0932a66329cd99510f1df
https://github.com/yade/trunk/commit/48ebd9262146c4f3ffe0932a66329cd99510f1df
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M examples/concrete/periodic.py
M examples/concrete/uniax.py
Log Message:
-----------
fix uniax.py and periodic.py example scripts
Commit: 36f93d4893282dfaf4ea4ff1d0050ad93be52541
https://github.com/yade/trunk/commit/36f93d4893282dfaf4ea4ff1d0050ad93be52541
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M examples/ResetRandomPosition.py
A examples/chained-cylinders/cloud4cylinders90
A examples/concrete/cpm-dem3dof-scgeom.py
A examples/concrete/periCube.pickle
M examples/gts-horse/gts-horse.py
M examples/gts-horse/gts-operators.py
A examples/hdaps.py
M examples/normalInelasticity-test.py
R examples/not-working/cpm-dem3dof-scgeom.py
R examples/not-working/hdaps.py
R examples/not-working/periodic-compress.py
R examples/not-working/periodic-grow.py
A examples/periodic-compress.py
A examples/periodic-grow.py
M examples/simple-scene/simple-scene-plot.py
A examples/simple-shear/simpleShear.py
R examples/simpleShear.py
R examples/tesselationWrapper.py
A examples/tesselationwrapper/tesselationWrapper.py
M examples/triax-tutorial/script-session1.py
M examples/triax-tutorial/script-session2.py
Log Message:
-----------
?fix and improvements of some example scripts
Commit: ec4ebfbf0d5a872f28af4927f7e88e5315082f39
https://github.com/yade/trunk/commit/ec4ebfbf0d5a872f28af4927f7e88e5315082f39
Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
R examples/chained-cylinders/cloud4cylinders90
Log Message:
-----------
delete unneeded file
Compare: https://github.com/yade/trunk/compare/2ae187f4e1b7^...ec4ebfbf0d5a
