yade-dev team mailing list archive

[Francois Kneib <francois.kneib@xxxxxxxxx>]

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: 8e7ce51082829eeb2050293b7686bb77d5c457a1
      https://github.com/yade/trunk/commit/8e7ce51082829eeb2050293b7686bb77d5c457a1
  Author: Francois Kneib <francois.kneib@xxxxxxxxx>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M pkg/dem/CapillaryTriaxialTest.cpp
    M pkg/dem/CohesiveTriaxialTest.cpp
    M pkg/dem/Shop.cpp
    M pkg/dem/Shop.hpp
    M pkg/dem/SpherePack.cpp

  Log Message:
  -----------
  Add the ability to save to a file a SpherePack containing some Clumps.
Into SpherePack : now the toFile method writes a fifth column containing the clump number (-1 if the sphere isn't clumped). The fromFile method uses the new information to append clumped Spheres.
Into Shop : loadSpheresFromFile method is modified to read and return the fifth column. Old files with 4 columns are still compatible.
Into CapillaryTriaxialTest and CohesiveTriaxialTest : Shop::loadSpheresFromFile is sometimes used here, so remove the clumpId information to match the "BasicSphere" typedef.