← Back to branch summary

~ubuntu-branches/ubuntu/wily/yade/wily

~ubuntu-branches/ubuntu/wily/yade/wily

« back to all changes in this revision

Viewing changes to pkg/dem/ViscoelasticCapillarPM.hpp

Committer: Package Import Robot
Author(s): Dmitry Shachnev
Date: 2014-11-14 12:54:52 UTC
mfrom: (20.1.23 sid)
Revision ID: package-import@ubuntu.com-20141114125452-t16anreumu4ybg2s

Tags: 1.12.0-2ubuntu1

Add allow-stderr restriction to autopkgtest, to silence a warning
printed by new matplotlib.

files added:
debian/upstream/metadata

examples/sph/dam_break.py

pkg/pfv/TwoPhaseFlowEngine.cpp

pkg/pfv/TwoPhaseFlowEngine.hpp

pkg/pfv/UnsaturatedEngine.cpp

py/_utils.hpp

files removed:
.pc/03_fix_i386_segfault.patch

.pc/03_fix_i386_segfault.patch/core

.pc/03_fix_i386_segfault.patch/core/BodyContainer.cpp

debian/patches/03_fix_i386_segfault.patch

doc/sphinx/references.bib

pkg/pfv/FlowEngine.ipp

files modified:
.pc/applied-patches

CMakeLists.txt

ChangeLog

RELEASE

core/Body.cpp

core/Body.hpp

core/BodyContainer.cpp

core/BodyContainer.hpp

core/Bound.hpp

core/Cell.cpp

core/Cell.hpp

core/Clump.cpp

core/Clump.hpp

core/Dispatcher.hpp

core/EnergyTracker.hpp

core/Engine.hpp

core/FileGenerator.cpp

core/FileGenerator.hpp

core/ForceContainer.hpp

core/FrontEnd.hpp

core/Functor.hpp

core/GLConfig.hpp

core/IGeom.hpp

core/IPhys.hpp

core/Interaction.cpp

core/Interaction.hpp

core/InteractionContainer.cpp

core/InteractionContainer.hpp

core/Material.cpp

core/Material.hpp

core/Omega.cpp

core/Omega.hpp

core/PartialEngine.hpp

core/Scene.cpp

core/Scene.hpp

core/Shape.hpp

core/SimulationFlow.cpp

core/State.cpp

core/State.hpp

core/ThreadRunner.cpp

core/corePlugins.cpp

core/main/pyboot.cpp

debian/changelog

debian/control

debian/copyright

debian/patches/series

debian/rules

debian/tests/control

debian/upstream

doc/references.bib

doc/sphinx/github.rst

doc/sphinx/introduction.rst

doc/sphinx/prog.rst

doc/sphinx/tutorial/06-periodic-triaxial-test.py

doc/sphinx/yadeSphinx.py

doc/yade-articles.bib

examples/polyhedra/ball.py

examples/polyhedra/free-fall.py

examples/polyhedra/irregular.py

examples/polyhedra/wall.py

examples/sph/sph_box.py

examples/sph/toystar.py

examples/sph/watercolumn.py

examples/tetra/twoTetrasPoly.py

examples/triax-tutorial/script-session1.py

gui/qt4/GLViewer.cpp

gui/qt4/GLViewer.hpp

gui/qt4/GLViewerDisplay.cpp

gui/qt4/GLViewerMouse.cpp

gui/qt4/SerializableEditor.py

gui/qt4/_GLViewer.cpp

lib/base/Math.cpp

lib/base/openmp-accu.hpp

lib/factory/ClassFactory.cpp

lib/factory/ClassFactory.hpp

lib/factory/DynLibManager.hpp

lib/multimethods/DynLibDispatcher.hpp

lib/multimethods/FunctorWrapper.hpp

lib/opengl/GLUtils.hpp

lib/opengl/OpenGLWrapper.hpp

lib/pyutil/gil.cpp

lib/serialization/Serializable.hpp

lib/smoothing/WeightedAverage2d.hpp

lib/triangulation/FlowBoundingSphere.hpp

lib/triangulation/FlowBoundingSphere.ipp

lib/triangulation/FlowBoundingSphereLinSolv.hpp

lib/triangulation/FlowBoundingSphereLinSolv.ipp

lib/triangulation/Network.hpp

lib/triangulation/Network.ipp

lib/triangulation/PeriodicFlow.hpp

lib/triangulation/RegularTriangulation.h

pkg/common/Aabb.hpp

pkg/common/Bo1_Aabb.cpp

pkg/common/Bo1_Aabb.hpp

pkg/common/BoundaryController.hpp

pkg/common/Box.hpp

pkg/common/Callbacks.hpp

pkg/common/Collider.cpp

pkg/common/Collider.hpp

pkg/common/CylScGeom6D.hpp

pkg/common/Cylinder.cpp

pkg/common/Cylinder.hpp

pkg/common/Dispatching.cpp

pkg/common/Dispatching.hpp

pkg/common/ElastMat.hpp

pkg/common/Facet.hpp

pkg/common/FieldApplier.hpp

pkg/common/ForceEngine.cpp

pkg/common/ForceEngine.hpp

pkg/common/ForceResetter.hpp

pkg/common/GLDrawFunctors.hpp

pkg/common/Gl1_NormPhys.cpp

pkg/common/Gl1_NormPhys.hpp

pkg/common/Gl1_Primitives.cpp

pkg/common/Gl1_Primitives.hpp

pkg/common/GravityEngines.cpp

pkg/common/GravityEngines.hpp

pkg/common/Grid.cpp

pkg/common/Grid.hpp

pkg/common/Grid_GUI.cpp

pkg/common/InsertionSortCollider.cpp

pkg/common/InsertionSortCollider.hpp

pkg/common/InteractionLoop.hpp

pkg/common/KinematicEngines.cpp

pkg/common/KinematicEngines.hpp

pkg/common/MatchMaker.cpp

pkg/common/MatchMaker.hpp

pkg/common/NormShearPhys.hpp

pkg/common/OpenGLRenderer.cpp

pkg/common/OpenGLRenderer.hpp

pkg/common/ParallelEngine.cpp

pkg/common/ParallelEngine.hpp

pkg/common/PeriodicEngines.hpp

pkg/common/PersistentTriangulationCollider.cpp

pkg/common/PersistentTriangulationCollider.hpp

pkg/common/PyRunner.hpp

pkg/common/Recorder.hpp

pkg/common/ResetRandomPosition.cpp

pkg/common/ResetRandomPosition.hpp

pkg/common/SPHEngine.cpp

pkg/common/SPHEngine.hpp

pkg/common/SpatialQuickSortCollider.cpp

pkg/common/SpatialQuickSortCollider.hpp

pkg/common/Sphere.hpp

pkg/common/StepDisplacer.hpp

pkg/common/TorqueEngine.hpp

pkg/common/Wall.cpp

pkg/common/Wall.hpp

pkg/common/ZECollider.cpp

pkg/common/ZECollider.hpp

pkg/common/common.cpp

pkg/dem/BubbleMat.hpp

pkg/dem/CapillaryPhys.cpp

pkg/dem/CapillaryPhys.hpp

pkg/dem/CapillaryStressRecorder.cpp

pkg/dem/CapillaryStressRecorder.hpp

pkg/dem/CapillaryTriaxialTest.cpp

pkg/dem/CapillaryTriaxialTest.hpp

pkg/dem/CohesiveFrictionalContactLaw.cpp

pkg/dem/CohesiveFrictionalContactLaw.hpp

pkg/dem/CohesiveTriaxialTest.cpp

pkg/dem/CohesiveTriaxialTest.hpp

pkg/dem/ConcretePM.cpp

pkg/dem/ConcretePM.hpp

pkg/dem/DemXDofGeom.hpp

pkg/dem/Disp2DPropLoadEngine.cpp

pkg/dem/Disp2DPropLoadEngine.hpp

pkg/dem/DomainLimiter.cpp

pkg/dem/DomainLimiter.hpp

pkg/dem/ElasticContactLaw.cpp

pkg/dem/ElasticContactLaw.hpp

pkg/dem/FacetTopologyAnalyzer.cpp

pkg/dem/FacetTopologyAnalyzer.hpp

pkg/dem/FlatGridCollider.cpp

pkg/dem/FlatGridCollider.hpp

pkg/dem/ForceTorqueRecorder.hpp

pkg/dem/FrictPhys.cpp

pkg/dem/FrictPhys.hpp

pkg/dem/FrictViscoPM.cpp

pkg/dem/FrictViscoPM.hpp

pkg/dem/GeneralIntegratorInsertionSortCollider.cpp

pkg/dem/GeneralIntegratorInsertionSortCollider.hpp

pkg/dem/GlobalStiffnessTimeStepper.cpp

pkg/dem/GlobalStiffnessTimeStepper.hpp

pkg/dem/HertzMindlin.cpp

pkg/dem/HertzMindlin.hpp

pkg/dem/Ig2_Box_Sphere_ScGeom.cpp

pkg/dem/Ig2_Box_Sphere_ScGeom.hpp

pkg/dem/Ig2_Facet_Sphere_ScGeom.cpp

pkg/dem/Ig2_Facet_Sphere_ScGeom.hpp

pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp

pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp

pkg/dem/InelastCohFrictPM.hpp

pkg/dem/Integrator.cpp

pkg/dem/Integrator.hpp

pkg/dem/Ip2_ElastMat.cpp

pkg/dem/Ip2_ElastMat.hpp

pkg/dem/JointedCohesiveFrictionalPM.cpp

pkg/dem/JointedCohesiveFrictionalPM.hpp

pkg/dem/KinemC__Engine.cpp

pkg/dem/KinemC__Engine.hpp

pkg/dem/KinemSimpleShearBox.cpp

pkg/dem/KinemSimpleShearBox.hpp

pkg/dem/L3Geom.cpp

pkg/dem/L3Geom.hpp

pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp

pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp

pkg/dem/LudingPM.cpp

pkg/dem/LudingPM.hpp

pkg/dem/MicroMacroAnalyser.cpp

pkg/dem/MicroMacroAnalyser.hpp

pkg/dem/NewtonIntegrator.cpp

pkg/dem/NewtonIntegrator.hpp

pkg/dem/NormalInelasticPM.cpp

pkg/dem/NormalInelasticPM.hpp

pkg/dem/PeriIsoCompressor.cpp

pkg/dem/PeriIsoCompressor.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/RungeKuttaCashKarp54Integrator.cpp

pkg/dem/RungeKuttaCashKarp54Integrator.hpp

pkg/dem/STLImporter.cpp

pkg/dem/STLImporter.hpp

pkg/dem/SampleCapillaryPressureEngine.cpp

pkg/dem/SampleCapillaryPressureEngine.hpp

pkg/dem/ScGeom.cpp

pkg/dem/ScGeom.hpp

pkg/dem/Shop.hpp

pkg/dem/Shop_01.cpp

pkg/dem/Shop_02.cpp

pkg/dem/SimpleShear.cpp

pkg/dem/SimpleShear.hpp

pkg/dem/SnapshotEngine.hpp

pkg/dem/SpherePack.cpp

pkg/dem/SpherePack.hpp

pkg/dem/SpheresFactory.cpp

pkg/dem/SpheresFactory.hpp

pkg/dem/TesselationWrapper.cpp

pkg/dem/TesselationWrapper.hpp

pkg/dem/Tetra.cpp

pkg/dem/Tetra.hpp

pkg/dem/ThreeDTriaxialEngine.cpp

pkg/dem/ThreeDTriaxialEngine.hpp

pkg/dem/TriaxialCompressionEngine.cpp

pkg/dem/TriaxialCompressionEngine.hpp

pkg/dem/TriaxialStateRecorder.cpp

pkg/dem/TriaxialStateRecorder.hpp

pkg/dem/TriaxialStressController.cpp

pkg/dem/TriaxialStressController.hpp

pkg/dem/TriaxialTest.cpp

pkg/dem/TriaxialTest.hpp

pkg/dem/UnbalancedForceCallbacks.cpp

pkg/dem/UnbalancedForceCallbacks.hpp

pkg/dem/UniaxialStrainer.cpp

pkg/dem/UniaxialStrainer.hpp

pkg/dem/VTKRecorder.cpp

pkg/dem/VTKRecorder.hpp

pkg/dem/ViscoelasticCapillarPM.cpp

pkg/dem/ViscoelasticCapillarPM.hpp

pkg/dem/ViscoelasticPM.cpp

pkg/dem/ViscoelasticPM.hpp

pkg/dem/WirePM.cpp

pkg/dem/WirePM.hpp

pkg/lbm/HydrodynamicsLawLBM.cpp

pkg/lbm/HydrodynamicsLawLBM.hpp

pkg/lbm/LBMbody.hpp

pkg/lbm/LBMlink.hpp

pkg/lbm/LBMnode.hpp

pkg/pfv/DFNFlow.cpp

pkg/pfv/FlowEngine.hpp

pkg/pfv/FlowEngine.hpp.in

pkg/pfv/FlowEngine.ipp.in

py/WeightedAverage2d.cpp

py/_polyhedra_utils.cpp

py/_utils.cpp

py/mathWrap/miniEigen.cpp

py/pack/_packObb.cpp

py/pack/_packPredicates.cpp

py/pack/_packSpheres.cpp

py/post2d.py

py/utils.py

py/wrapper/customConverters.cpp

py/wrapper/yadeWrapper.cpp

scripts/linkdeps.py

Show diffs side-by-side

added added

removed removed

pkg/dem/ViscoelasticCapillarPM.hpp

1

1

#pragma once

2

2

#include "ViscoelasticPM.hpp"

3

3

#include <boost/unordered_map.hpp>

4

#include <yade/core/PartialEngine.hpp>

4

#include <core/PartialEngine.hpp>

5

5

6

6

class ViscElCapMat : public ViscElMat {

7

7

public:

Older »