~ubuntu-branches/ubuntu/trusty/yade/trusty

« back to all changes in this revision

Viewing changes to pkg/dem/CapillaryTriaxialTest.cpp

Committer: Package Import Robot
Author(s): Anton Gladky, cf3f8d9
Date: 2013-10-30 20:56:33 UTC
mfrom: (20.1.9 sid)
Revision ID: package-import@ubuntu.com-20131030205633-1f01r7hjce17d723

Tags: 1.05.0-2

http://bugs.debian.org/726009

[cf3f8d9] Pass -ftrack-macro-expansion=0 only if gcc>=4.8. (Closes: #726009)

files added:
.pc/20_disable_release-mode.patch

.pc/20_disable_release-mode.patch/CMakeLists.txt

cMake/FindMetis.cmake

cMake/FindOpenBlas.cmake

debian/patches

debian/patches/20_disable_release-mode.patch

debian/patches/series

debian/yade.lintian-overrides

doc/sphinx/fig/micro-domains.png

examples/FluidCouplingPFV

examples/FluidCouplingPFV/oedometer.py

examples/LudingPM.py

examples/PIDController.py

examples/clumps/apply-buoyancy-clumps.py

examples/concrete/triax.py

examples/jointedCohesiveFrictionalPM

examples/jointedCohesiveFrictionalPM/README

examples/jointedCohesiveFrictionalPM/gravityBis.py

examples/jointedCohesiveFrictionalPM/gravityLoading.py

examples/jointedCohesiveFrictionalPM/gravityLoading_velocityField_arrows.png

examples/jointedCohesiveFrictionalPM/gravityLoading_velocityField_spheres.png

examples/jointedCohesiveFrictionalPM/identifBis.py

examples/jointedCohesiveFrictionalPM/identificationSpheresOnJoint.py

examples/jointedCohesiveFrictionalPM/jointedModel.png

examples/jointedCohesiveFrictionalPM/packInGtsSurface.py

examples/jointedCohesiveFrictionalPM/parallellepiped.gts

examples/jointedCohesiveFrictionalPM/persistentPlane30Deg.stl

examples/polyhedra

examples/polyhedra/ball.py

examples/polyhedra/free-fall.py

examples/polyhedra/irregular.py

examples/polyhedra/wall.py

examples/rotationalResistance.py

examples/spheresFactory.py

examples/test/unstructuredGrid.py

examples/test/vtkPeriodicCell.py

examples/tetra

examples/tetra/oneTetra.py

examples/tetra/oneTetraPoly.py

examples/tetra/twoTetras.py

examples/tetra/twoTetrasPoly.py

gui/qt4/GLViewerDisplay.cpp

gui/qt4/GLViewerMouse.cpp

lib/triangulation/FlowBoundingSphereLinSolv.hpp

lib/triangulation/FlowBoundingSphereLinSolv.ipp

lib/triangulation/PeriodicFlowLinSolv.hpp

lib/triangulation/PeriodicFlowLinSolv.ipp

pkg/dem/BubbleMat.cpp

pkg/dem/BubbleMat.hpp

pkg/dem/Ip2_ElastMat.cpp

pkg/dem/Ip2_ElastMat.hpp

pkg/dem/JointedCohesiveFrictionalPM.cpp

pkg/dem/JointedCohesiveFrictionalPM.hpp

pkg/dem/LudingPM.cpp

pkg/dem/LudingPM.hpp

pkg/dem/Polyhedra.cpp

pkg/dem/Polyhedra.hpp

pkg/dem/Polyhedra_Ig2.cpp

pkg/dem/Polyhedra_Ig2.hpp

pkg/dem/Polyhedra_splitter.cpp

pkg/dem/Polyhedra_splitter.hpp

pkg/dem/Polyhedra_support.cpp

pkg/dem/Shop_01.cpp

pkg/dem/Shop_02.cpp

pkg/dem/ViscoelasticCapillarPM.cpp

py/_polyhedra_utils.cpp

py/polyhedra_utils.py

scripts/checks-and-tests/checks/DEM-PFV-check.py

scripts/checks-and-tests/checks/checkWirePM.py

scripts/checks-and-tests/checks/data/100spheres

files removed:
.kdev4

.kdev4/yade.kdev4

Yade.kdevelop

debian/matplotlib

examples/clumps/adaptClumpMasses-example.py

examples/test/CundallStrackTest.py

examples/test/Dem3DofGeom.py

examples/test/spheresFactory.py

pkg/dem/CohesiveFrictionalPM.cpp

pkg/dem/CohesiveFrictionalPM.hpp

pkg/dem/CohesiveStateRPMRecorder.cpp

pkg/dem/CohesiveStateRPMRecorder.hpp

pkg/dem/Dem3DofGeom_FacetSphere.cpp

pkg/dem/Dem3DofGeom_FacetSphere.hpp

pkg/dem/Dem3DofGeom_SphereSphere.cpp

pkg/dem/Dem3DofGeom_SphereSphere.hpp

pkg/dem/Dem3DofGeom_WallSphere.cpp

pkg/dem/Dem3DofGeom_WallSphere.hpp

pkg/dem/ParticleSizeDistrbutionRPMRecorder.cpp

pkg/dem/ParticleSizeDistrbutionRPMRecorder.hpp

pkg/dem/RockPM.cpp

pkg/dem/RockPM.hpp

pkg/dem/Shop.cpp

py/_eudoxos.cpp

py/eudoxos.py

yade.kdev4

files modified:
.gitignore

.pc/applied-patches

CMakeLists.txt

ChangeLog

RELEASE

cMake/FindCholmod.cmake

cMake/FindLoki.cmake

core/Cell.hpp

core/Clump.cpp

core/Clump.hpp

core/Engine.hpp

core/ForceContainer.hpp

core/Functor.hpp

core/Scene.cpp

core/Scene.hpp

core/main/main.py.in

core/main/yade-batch.in

debian/changelog

debian/control

debian/rules

debian/watch

doc/references.bib

doc/sphinx/conf.py

doc/sphinx/formulation.rst

doc/sphinx/installation.rst

doc/sphinx/introduction.rst

doc/sphinx/prog.rst

doc/sphinx/references.bib

doc/sphinx/templates/index.html

doc/sphinx/user.rst

doc/sphinx/yadeSphinx.py

doc/yade-articles.bib

doc/yade-conferences.bib

doc/yade-theses.bib

examples/CapillaryPhys-example.py

examples/clumps/addToClump-example.py

examples/clumps/releaseFromClump-example.py

examples/clumps/replaceByClumps-example.py

examples/concrete/uniax.py

examples/gts-horse/gts-random-pack-obb.py

examples/gts-horse/gts-random-pack.py

examples/packs/packs.py

examples/periodicSandPile.py

examples/simple-scene/simple-scene-plot.py *

examples/simple-shear/simpleShear.py

examples/tesselationwrapper/tesselationWrapper.py

examples/test/vtk-exporter/vtkExporter.py

examples/timeStepperUsage.py

examples/triax-tutorial/script-session1.py

examples/tunnel-pack.py

gui/CMakeLists.txt

gui/qt4/GLViewer.cpp

gui/qt4/OpenGLManager.cpp

lib/base/Math.hpp

lib/import/STLReader.hpp

lib/opengl/GLUtils.cpp

lib/opengl/OpenGLWrapper.hpp

lib/pyutil/README

lib/pyutil/numpy_boost.hpp

lib/triangulation/FlowBoundingSphere.cpp

lib/triangulation/FlowBoundingSphere.hpp

lib/triangulation/FlowBoundingSphere.ipp

lib/triangulation/Network.hpp

lib/triangulation/Network.ipp

lib/triangulation/PeriodicFlow.hpp

lib/triangulation/RegularTriangulation.h

lib/triangulation/Tenseur3.h

lib/triangulation/TriaxialState.h

lib/triangulation/def_types.h

pkg/common/Cylinder.cpp

pkg/common/Cylinder.hpp

pkg/common/Facet.cpp

pkg/common/Facet.hpp

pkg/common/Gl1_NormPhys.cpp

pkg/common/Gl1_Sphere.cpp

pkg/common/Grid.cpp

pkg/common/Grid.hpp

pkg/common/InsertionSortCollider.cpp

pkg/common/KinematicEngines.cpp

pkg/common/KinematicEngines.hpp

pkg/common/OpenGLRenderer.cpp

pkg/common/OpenGLRenderer.hpp

pkg/dem/CapillaryPhys.hpp

pkg/dem/CapillaryStressRecorder.cpp

pkg/dem/CapillaryTriaxialTest.cpp

pkg/dem/CapillaryTriaxialTest.hpp

pkg/dem/CohesiveFrictionalContactLaw.hpp

pkg/dem/ConcretePM.cpp

pkg/dem/ConcretePM.hpp

pkg/dem/DemXDofGeom.cpp

pkg/dem/DemXDofGeom.hpp

pkg/dem/DomainLimiter.cpp

pkg/dem/FlowEngine.cpp

pkg/dem/FlowEngine.hpp

pkg/dem/GlobalStiffnessTimeStepper.cpp

pkg/dem/GlobalStiffnessTimeStepper.hpp

pkg/dem/HertzMindlin.cpp

pkg/dem/HertzMindlin.hpp

pkg/dem/InelastCohFrictMat.hpp

pkg/dem/InelastCohFrictPhys.cpp

pkg/dem/InelastCohFrictPhys.hpp

pkg/dem/Ip2_2xInelastCohFrictMat_InelastCohFrictPhys.cpp

pkg/dem/Ip2_2xInelastCohFrictMat_InelastCohFrictPhys.hpp

pkg/dem/Ip2_FrictMat_FrictMat_MindlinCapillaryPhys.hpp

pkg/dem/KinemCTDEngine.hpp

pkg/dem/KinemSimpleShearBox.cpp

pkg/dem/L3Geom.cpp

pkg/dem/L3Geom.hpp

pkg/dem/Law2_ScGeom6D_InelastCohFrictPhys_CohesionMoment.cpp

pkg/dem/Law2_ScGeom6D_InelastCohFrictPhys_CohesionMoment.hpp

pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp

pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp

pkg/dem/NewtonIntegrator.cpp

pkg/dem/NewtonIntegrator.hpp

pkg/dem/PeriIsoCompressor.cpp

pkg/dem/PeriIsoCompressor.hpp

pkg/dem/SampleCapillaryPressureEngine.cpp

pkg/dem/Shop.hpp

pkg/dem/SpherePack.cpp

pkg/dem/SpherePack.hpp

pkg/dem/TesselationWrapper.hpp

pkg/dem/Tetra.cpp

pkg/dem/Tetra.hpp

pkg/dem/TriaxialStateRecorder.hpp

pkg/dem/TriaxialStressController.cpp

pkg/dem/TriaxialStressController.hpp

pkg/dem/TriaxialTest.hpp

pkg/dem/VTKRecorder.cpp

pkg/dem/VTKRecorder.hpp

pkg/dem/ViscoelasticPM.cpp

pkg/dem/ViscoelasticPM.hpp

pkg/dem/WirePM.cpp

pkg/dem/WirePM.hpp

py/CMakeLists.txt

py/_extraDocs.py

py/_utils.cpp

py/export.py

py/mathWrap/miniEigen.cpp

py/pack/_packSpheres.cpp

py/pack/pack.py

py/system.py

py/tests/__init__.py

py/tests/clump.py

py/utils.py

py/wrapper/yadeWrapper.cpp

py/ymport.py

scripts/checks-and-tests/checks/README

scripts/checks-and-tests/checks/checkGravity.py

scripts/checks-and-tests/checks/checkList.py

scripts/checks-and-tests/checks/checkTestDummy.py

scripts/checks-and-tests/checks/checkTestTriax.py

scripts/erskine3.py *

scripts/hackett.py *

scripts/linkdeps.py *

scripts/py2wiki.py *

scripts/rename-class.py *

Show diffs side-by-side

added added

removed removed

pkg/dem/CapillaryTriaxialTest.cpp

338

339

// capillary

340

shared_ptr<Law2_ScGeom_CapillaryPhys_Capillarity> capillaryCohesiveLaw(new Law2_ScGeom_CapillaryPhys_Capillarity);

341

capillaryCohesiveLaw->CapillaryPressure = CapillaryPressure;

341

capillaryCohesiveLaw->capillaryPressure = capillaryPressure;

342

// capillaryCohesiveLaw->fusionDetection = fusionDetection;

343

// capillaryCohesiveLaw->binaryFusion = binaryFusion;

344

Older »