yade-dev team mailing list archive

[Jan Stránský <honzik.stransky@xxxxxxxxx>]

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: f288912f584501824f965081b4e75f267938a59c
      https://github.com/yade/trunk/commit/f288912f584501824f965081b4e75f267938a59c
  Author: Jan Stránský <honzik.stransky@xxxxxxxxx>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M core/Cell.hpp
    M py/export.py
    M py/ymport.py

  Log Message:
  -----------
  added periodic cell's deformation and strain measures


  Commit: 4e5186c6e85c88904e2966452363ba2a133edb6f
      https://github.com/yade/trunk/commit/4e5186c6e85c88904e2966452363ba2a133edb6f
  Author: Jan Stránský <honzik.stransky@xxxxxxxxx>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M core/Cell.hpp
    M py/utils.py

  Log Message:
  -----------
  added function utils.setVerticesOfFacet


  Commit: 2457bd991ae237fa8a847037cd09ca3a515b5bb2
      https://github.com/yade/trunk/commit/2457bd991ae237fa8a847037cd09ca3a515b5bb2
  Author: Jan Stránský <honzik.stransky@xxxxxxxxx>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M core/Cell.hpp

  Log Message:
  -----------
  improvement of Cell documentation


  Commit: 6f568f7e79b69195c44a0448a8d10a8a406cfdc6
      https://github.com/yade/trunk/commit/6f568f7e79b69195c44a0448a8d10a8a406cfdc6
  Author: Jan Stránský <honzik.stransky@xxxxxxxxx>
  Date:   2012-05-10 (Thu, 10 May 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/SimulationFlow.cpp
    M core/ThreadRunner.cpp
    M lib/SConscript
    M pkg/common/InteractionLoop.hpp
    M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/yade/trunk into stranskyjan-master

Conflicts:
	core/Cell.hpp


  Commit: 27343af19dcc34ec1a182a578868d8d1f3977534
      https://github.com/yade/trunk/commit/27343af19dcc34ec1a182a578868d8d1f3977534
  Author: Jan Stránský <honzik.stransky@xxxxxxxxx>
  Date:   2012-05-18 (Fri, 18 May 2012)

  Changed paths:
    M CMakeLists.txt
    M SConstruct
    A cMake/FindQGLVIEWER.cmake
    R core/main/main.py.in
    A core/main/main.py.in
    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/__init__.py.in
    M py/geom.py

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


  Commit: 9972630c28809c643246b08cfc29fc6529bcf495
      https://github.com/yade/trunk/commit/9972630c28809c643246b08cfc29fc6529bcf495
  Author: Jan Stránský <honzik.stransky@xxxxxxxxx>
  Date:   2012-05-27 (Sun, 27 May 2012)

  Changed paths:
    M CMakeLists.txt
    M core/BodyContainer.cpp
    M core/Scene.hpp
    A gui/CMakeLists.txt
    M lib/triangulation/PeriodicFlow.cpp
    M pkg/common/InsertionSortCollider.cpp
    M pkg/dem/FlowEngine.cpp
    M pkg/dem/Shop.cpp
    M pkg/dem/Shop.hpp
    A py/CMakeLists.txt
    M py/_utils.cpp
    M py/tests/core.py
    M py/ymport.py

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


  Commit: 27f49508795677a6fbf63583aa710a8f01d091a7
      https://github.com/yade/trunk/commit/27f49508795677a6fbf63583aa710a8f01d091a7
  Author: Jan Stránský <honzik.stransky@xxxxxxxxx>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M core/Cell.hpp

  Log Message:
  -----------
  Cell class improvement


  Commit: 412c4757c8a424ef443f1fc58953ab93fccd3969
      https://github.com/yade/trunk/commit/412c4757c8a424ef443f1fc58953ab93fccd3969
  Author: Jan Stránský <honzik.stransky@xxxxxxxxx>
  Date:   2012-06-19 (Tue, 19 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
    M cMake/GetVersion.cmake
    M core/Cell.hpp
    M core/main/main.py.in
    M doc/sphinx/installation.rst
    M gui/CMakeLists.txt
    M gui/qt4/GLViewer.hpp
    M gui/qt4/OpenGLManager.hpp
    M lib/base/openmp-accu.hpp
    M pkg/common/InsertionSortCollider.cpp
    M pkg/common/InsertionSortCollider.hpp
    M pkg/dem/ElasticContactLaw.cpp
    M pkg/dem/ElasticContactLaw.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/NewtonIntegrator.cpp
    M pkg/dem/NewtonIntegrator.hpp
    M pkg/dem/PeriIsoCompressor.cpp
    M pkg/dem/VTKRecorder.cpp
    M py/CMakeLists.txt
    M py/__init__.py.in
    M py/bodiesHandling.py
    M py/config.py.in
    M py/export.py
    M py/geom.py
    M py/pack/pack.py

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


  Commit: 46600d51d85ffb703a98360132a00d9de270dcb2
      https://github.com/yade/trunk/commit/46600d51d85ffb703a98360132a00d9de270dcb2
  Author: Jan Stránský <honzik.stransky@xxxxxxxxx>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M core/Cell.hpp
    M pkg/dem/PeriIsoCompressor.cpp
    M pkg/dem/Shop.cpp
    M pkg/dem/Shop.hpp
    M py/_utils.cpp

  Log Message:
  -----------
  made stressTensorOfPeriodicCell deprecated


  Commit: 80a6817e19e06fc43b86755fdc4206b7734a277e
      https://github.com/yade/trunk/commit/80a6817e19e06fc43b86755fdc4206b7734a277e
  Author: Jan Stránský <honzik.stransky@xxxxxxxxx>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M core/Cell.hpp
    M pkg/dem/PeriIsoCompressor.cpp
    M pkg/dem/Shop.cpp
    M pkg/dem/Shop.hpp
    M py/_utils.cpp
    M py/utils.py

  Log Message:
  -----------
  Merge pull request #24 from stranskyjan/master

made stressTensorOfPeriodicCell deprecated, little changes of Cell class


Compare: https://github.com/yade/trunk/compare/41b32702a9c3...80a6817e19e0