yade-dev team mailing list archive

Thread
Date
[yade/trunk] 933dfb: add compressibility to fluid flow scheme

To: yade-dev@xxxxxxxxxxxxxxxxxxx
From: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxxxxxx>
Date: Fri, 27 Apr 2012 10:21:05 -0700
Reply-to: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxxxxxx>
  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: 933dfbd705a67e307ee6aef4b9962a8d098851fd
      https://github.com/yade/trunk/commit/933dfbd705a67e307ee6aef4b9962a8d098851fd
  Author: lucScholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M .kdev4/yade.kdev4
    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/dem/FlowEngine.cpp
    M pkg/dem/FlowEngine.hpp

  Log Message:
  -----------
  add compressibility to fluid flow scheme


  Commit: 5f85312d9ca02e4343f210a8b80caf99419ae464
      https://github.com/yade/trunk/commit/5f85312d9ca02e4343f210a8b80caf99419ae464
  Author: lucScholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M pkg/dem/FlowEngine.hpp

  Log Message:
  -----------
  delete obsolete line in flowEngine.hpp


  Commit: f6b6c05a051d830fc790fff1ef30e64e5e4a5ee3
      https://github.com/yade/trunk/commit/f6b6c05a051d830fc790fff1ef30e64e5e4a5ee3
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    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 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:
  -----------
  test


  Commit: 7d013998702c98cd0b3c47de2e6bde1f337a8997
      https://github.com/yade/trunk/commit/7d013998702c98cd0b3c47de2e6bde1f337a8997
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M py/pack/pack.py

  Log Message:
  -----------
  resolve bug 983888


  Commit: 4b414e699678f11e0412c0da938166eaea3686d7
      https://github.com/yade/trunk/commit/4b414e699678f11e0412c0da938166eaea3686d7
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-19 (Thu, 19 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

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: ade0485d04bd2ac1248fa7418e57177d1c8f200a
      https://github.com/yade/trunk/commit/ade0485d04bd2ac1248fa7418e57177d1c8f200a
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M lib/triangulation/FlowBoundingSphere.ipp

  Log Message:
  -----------
  cleaning FlowBoundingSphere.ipp


  Commit: 04edafb14faa67cf1551d210adaf207ac94b60eb
      https://github.com/yade/trunk/commit/04edafb14faa67cf1551d210adaf207ac94b60eb
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M lib/triangulation/PeriodicFlow.cpp
    M lib/triangulation/PeriodicFlow.hpp

  Log Message:
  -----------
  add compressibility to periodic flow engine


  Commit: 23ef09147a18bd26d63945627f79456428bb52a8
      https://github.com/yade/trunk/commit/23ef09147a18bd26d63945627f79456428bb52a8
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M py/pack/pack.py

  Log Message:
  -----------
  cleaning pack.py


  Commit: 0f78338b3299a0d2823ffa07ef957e8fefbb0bfb
      https://github.com/yade/trunk/commit/0f78338b3299a0d2823ffa07ef957e8fefbb0bfb
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M lib/triangulation/FlowBoundingSphere.hpp
    M lib/triangulation/FlowBoundingSphere.ipp
    M lib/triangulation/def_types.h
    M pkg/dem/FlowEngine.cpp
    M pkg/dem/FlowEngine.hpp

  Log Message:
  -----------
  all?


  Commit: 17e309f6f868778da557353f433bdcd5bf9414a3
      https://github.com/yade/trunk/commit/17e309f6f868778da557353f433bdcd5bf9414a3
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M lib/triangulation/FlowBoundingSphere.hpp
    M pkg/dem/FlowEngine.cpp
    M pkg/dem/FlowEngine.hpp

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: c119bfa0ddfb51f3e01ed11c006e5555d2850c84
      https://github.com/yade/trunk/commit/c119bfa0ddfb51f3e01ed11c006e5555d2850c84
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M lib/triangulation/FlowBoundingSphere.hpp
    M lib/triangulation/FlowBoundingSphere.ipp
    M pkg/dem/FlowEngine.cpp
    M pkg/dem/FlowEngine.hpp
    M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 9c50bce407eeecb62fb8de8bfd76311792b6598e
      https://github.com/yade/trunk/commit/9c50bce407eeecb62fb8de8bfd76311792b6598e
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
    M core/Interaction.cpp
    M core/Interaction.hpp
    M pkg/dem/ViscoelasticPM.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 5650d7fcc551cb28bbb84fbe0f28ab72e427f2ac
      https://github.com/yade/trunk/commit/5650d7fcc551cb28bbb84fbe0f28ab72e427f2ac
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M SConstruct
    M core/Body.hpp
    M core/BodyContainer.cpp
    M core/BodyContainer.hpp
    M examples/packs/packs.py
    M lib/import/STLReader.hpp
    M lib/triangulation/def_types.h
    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/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
    M py/SConscript
    M py/geom.py
    M py/pack/SpherePadder/SpherePadder.cpp
    M py/tests/wrapper.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: af2fc01fc0297f5a347323cfb44210feaba2d63f
      https://github.com/yade/trunk/commit/af2fc01fc0297f5a347323cfb44210feaba2d63f
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

  Changed paths:
    M pkg/dem/FlowEngine.hpp

  Log Message:
  -----------
  fix doc python


  Commit: 2e932b94e3d27a230cd90413d88e6dd5a2f8b876
      https://github.com/yade/trunk/commit/2e932b94e3d27a230cd90413d88e6dd5a2f8b876
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

  Changed paths:
    M pkg/dem/FlowEngine.cpp

  Log Message:
  -----------
  revise invVoidVolume calculation


  Commit: 6ff31ee5c51f2f78aa85c928fcadeb791b94a893
      https://github.com/yade/trunk/commit/6ff31ee5c51f2f78aa85c928fcadeb791b94a893
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

  Changed paths:
    M lib/triangulation/FlowBoundingSphere.ipp

  Log Message:
  -----------
  clean FlowBoundingSphere.ipp file


  Commit: 3b59867ac79fbf0a2d39649ee4974b507d2c54da
      https://github.com/yade/trunk/commit/3b59867ac79fbf0a2d39649ee4974b507d2c54da
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

  Changed paths:
    M lib/triangulation/PeriodicFlow.cpp

  Log Message:
  -----------
  add compressibility to periodic flow engine


  Commit: baf93a776a2891e42e572398c6b11df00ca055a5
      https://github.com/yade/trunk/commit/baf93a776a2891e42e572398c6b11df00ca055a5
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

  Changed paths:
    M lib/triangulation/FlowBoundingSphere.ipp
    M lib/triangulation/PeriodicFlow.cpp
    M lib/triangulation/Tesselation.ipp
    M pkg/dem/FlowEngine.cpp
    M pkg/dem/FlowEngine.hpp

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/triangulation/PeriodicFlow.cpp
	pkg/dem/FlowEngine.cpp
	pkg/dem/FlowEngine.hpp


  Commit: 267abe2c4493585e3212eeb4f5a3ea8696d34bec
      https://github.com/yade/trunk/commit/267abe2c4493585e3212eeb4f5a3ea8696d34bec
  Author: Luc Scholtes <lscholtes63@xxxxxxxxx>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

  Changed paths:
    M lib/triangulation/PeriodicFlow.cpp
    M lib/triangulation/PeriodicFlow.hpp
    M pkg/dem/FlowEngine.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 9565968b2b159b237bdd88fbe44a0a9dbd746a88
      https://github.com/yade/trunk/commit/9565968b2b159b237bdd88fbe44a0a9dbd746a88
  Author: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxxxxxx>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

  Changed paths:
    M lib/triangulation/FlowBoundingSphere.ipp
    M lib/triangulation/PeriodicFlow.cpp
    M pkg/dem/FlowEngine.cpp
    M pkg/dem/FlowEngine.hpp
    M py/pack/pack.py

  Log Message:
  -----------
  Merge pull request #17 from lucScholtes/master

add compressibility to the periodic fluid flow scheme + cleaning


Compare: https://github.com/yade/trunk/compare/e9513ca...9565968