← Back to team overview

yade-dev team mailing list archive

[yade/trunk] 975dcf: Add different capillar models into ViscoElasticPM.

 

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: 975dcfbf44f6fd9b5b757b1bb349d17eba7d5c9f
      https://github.com/yade/trunk/commit/975dcfbf44f6fd9b5b757b1bb349d17eba7d5c9f
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-27 (Mon, 27 May 2013)

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

  Log Message:
  -----------
  Add different capillar models into ViscoElasticPM.


  Commit: 2be57305a5af8454f1018e91bc34ad7072e033a2
      https://github.com/yade/trunk/commit/2be57305a5af8454f1018e91bc34ad7072e033a2
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M pkg/dem/ViscoelasticPM.cpp

  Log Message:
  -----------
  Add links to equations, consider not only monodisperse particles.


  Commit: ef26131e7dc590d59dea5cf04f008b2e94ac35a2
      https://github.com/yade/trunk/commit/ef26131e7dc590d59dea5cf04f008b2e94ac35a2
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M pkg/dem/ViscoelasticPM.cpp

  Log Message:
  -----------
  Fix s parameter for Willet-formulation of capillar.


  Commit: c173af7f3d3306a4fa3a8cfe385cf04c849414af
      https://github.com/yade/trunk/commit/c173af7f3d3306a4fa3a8cfe385cf04c849414af
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M pkg/dem/ViscoelasticPM.cpp

  Log Message:
  -----------
  Add one more critical-calculation to capillar model.


  Commit: 65748ed1874a5e4bee2491646638ea4ad423eeec
      https://github.com/yade/trunk/commit/65748ed1874a5e4bee2491646638ea4ad423eeec
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M pkg/dem/ViscoelasticPM.cpp

  Log Message:
  -----------
  Cleanings in viscoelastic capillar modell.


  Commit: f2cf64c542243c45dee447a6e49647899d99df74
      https://github.com/yade/trunk/commit/f2cf64c542243c45dee447a6e49647899d99df74
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-27 (Mon, 27 May 2013)

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

  Log Message:
  -----------
  Move capillar calculation into another function not to overload VPM.


  Commit: 141fee4046d389bee74b5557bed114d97ba8446a
      https://github.com/yade/trunk/commit/141fee4046d389bee74b5557bed114d97ba8446a
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M pkg/dem/ViscoelasticPM.cpp

  Log Message:
  -----------
  Modify Weigart`s model.


  Commit: e600316c52e84b70d3f1cea9adcc0b91b7c2c920
      https://github.com/yade/trunk/commit/e600316c52e84b70d3f1cea9adcc0b91b7c2c920
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M pkg/dem/ViscoelasticPM.cpp

  Log Message:
  -----------
  Update equations for Weigart`s capillar model.


  Commit: 53996c1a38a443a90ed62a770606cf6ee04ae12b
      https://github.com/yade/trunk/commit/53996c1a38a443a90ed62a770606cf6ee04ae12b
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-27 (Mon, 27 May 2013)

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

  Log Message:
  -----------
  Update capillar equations and names of schemas.


  Commit: ec04fdcf3e76831be681712ba0462938b0d16de5
      https://github.com/yade/trunk/commit/ec04fdcf3e76831be681712ba0462938b0d16de5
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M doc/references.bib
    M pkg/dem/ViscoelasticPM.cpp
    M pkg/dem/ViscoelasticPM.hpp

  Log Message:
  -----------
  Move references to a references.bib.


  Commit: 56344ded186026c1cd10ac50ecaaf17a1c99eec8
      https://github.com/yade/trunk/commit/56344ded186026c1cd10ac50ecaaf17a1c99eec8
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M pkg/dem/ViscoelasticPM.cpp

  Log Message:
  -----------
  Add comment on liquid bridges.


  Commit: 3165a878a5e0808e7ef792c5f8203758ee1a02d1
      https://github.com/yade/trunk/commit/3165a878a5e0808e7ef792c5f8203758ee1a02d1
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M gui/qt4/OpenGLManager.cpp
    M lib/import/STLReader.hpp
    M pkg/common/Cylinder.hpp
    M pkg/dem/CohesiveFrictionalContactLaw.hpp
    M pkg/dem/HertzMindlin.hpp
    M pkg/dem/KinemCTDEngine.hpp
    M pkg/dem/KinemSimpleShearBox.cpp
    M pkg/dem/Law2_ScGeom6D_InelastCohFrictPhys_CohesionMoment.hpp
    M pkg/dem/SpherePack.hpp
    M pkg/dem/TriaxialStateRecorder.hpp

  Log Message:
  -----------
  Fix some warnings (clang).


Compare: https://github.com/yade/trunk/compare/77864982a467...3165a878a5e0