~ubuntu-branches/debian/jessie/yade/jessie

Viewing changes to pkg/dem/KinemCNSEngine.cpp

Committer: Package Import Robot
Author(s): Anton Gladky
Date: 2014-08-04 19:34:58 UTC
mfrom: (1.1.11)
Revision ID: package-import@ubuntu.com-20140804193458-cw8qhnujxe9wzi15

Tags: 1.11.0-1

* [a0600ae] Imported Upstream version 1.11.0
* [a3055e0] Do not use parallel build on kfreebsd-amd64 and s390x.
* [f86b405] Remove applied patches.

files added:
examples/bouncingbubble.py

pkg/common/Bo1_Aabb.cpp

pkg/common/Bo1_Aabb.hpp

pkg/common/Gl1_Primitives.cpp

pkg/common/Gl1_Primitives.hpp

pkg/common/common.cpp

pkg/dem/InelastCohFrictPM.cpp

pkg/dem/InelastCohFrictPM.hpp

pkg/dem/KinemC__Engine.cpp

pkg/dem/KinemC__Engine.hpp

pkg/dem/NormalInelasticPM.cpp

pkg/dem/NormalInelasticPM.hpp

py/3rd-party/mtTkinter-0.4

py/3rd-party/mtTkinter-0.4/gpl.txt

py/3rd-party/mtTkinter-0.4/lgpl.txt

py/3rd-party/mtTkinter-0.4/mtTkinter.py

files removed:
.pc/02_redirect_stdout.patch

.pc/02_redirect_stdout.patch/py

.pc/02_redirect_stdout.patch/py/tests

.pc/02_redirect_stdout.patch/py/tests/__init__.py

.pc/03_redirect_stdout.patch

.pc/03_redirect_stdout.patch/core

.pc/03_redirect_stdout.patch/core/main

.pc/03_redirect_stdout.patch/core/main/main.py.in

.pc/04_modify_description.patch

.pc/04_modify_description.patch/py

.pc/04_modify_description.patch/py/utils.py

NEWS

core/Bound.cpp

core/Dispatcher.cpp

core/EnergyTracker.cpp

core/Engine.cpp

core/FrontEnd.cpp

core/PartialEngine.cpp

core/Shape.cpp

core/TimeStepper.cpp

debian/patches/02_redirect_stdout.patch

debian/patches/03_redirect_stdout.patch

debian/patches/04_modify_description.patch

lib/multimethods/Indexable.cpp

pkg/common/Aabb.cpp

pkg/common/Bo1_Box_Aabb.cpp

pkg/common/Bo1_Box_Aabb.hpp

pkg/common/Bo1_Facet_Aabb.cpp

pkg/common/Bo1_Facet_Aabb.hpp

pkg/common/Bo1_Sphere_Aabb.cpp

pkg/common/Bo1_Sphere_Aabb.hpp

pkg/common/BoundaryController.cpp

pkg/common/Box.cpp

pkg/common/Callbacks.cpp

pkg/common/CylScGeom6D.cpp

pkg/common/ElastMat.cpp

pkg/common/FieldApplier.cpp

pkg/common/ForceResetter.cpp

pkg/common/GLDrawFunctors.cpp

pkg/common/Gl1_Aabb.cpp

pkg/common/Gl1_Aabb.hpp

pkg/common/Gl1_Box.cpp

pkg/common/Gl1_Box.hpp

pkg/common/Gl1_Facet.cpp

pkg/common/Gl1_Facet.hpp

pkg/common/Gl1_Sphere.cpp

pkg/common/Gl1_Sphere.hpp

pkg/common/NormShearPhys.cpp

pkg/common/PeriodicEngines.cpp

pkg/common/PyRunner.cpp

pkg/common/Recorder.cpp

pkg/common/Sphere.cpp

pkg/common/StepDisplacer.cpp

pkg/common/TorqueEngine.cpp

pkg/dem/CohFrictMat.cpp

pkg/dem/CohFrictMat.hpp

pkg/dem/CohFrictPhys.cpp

pkg/dem/CohFrictPhys.hpp

pkg/dem/DemXDofGeom.cpp

pkg/dem/InelastCohFrictMat.cpp

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_2xNormalInelasticMat_NormalInelasticityPhys.cpp

pkg/dem/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.hpp

pkg/dem/Ip2_CohFrictMat_CohFrictMat_CohFrictPhys.cpp

pkg/dem/Ip2_CohFrictMat_CohFrictMat_CohFrictPhys.hpp

pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.cpp

pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp

pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.cpp

pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp

pkg/dem/Ip2_FrictMat_FrictMat_MindlinCapillaryPhys.cpp

pkg/dem/Ip2_FrictMat_FrictMat_MindlinCapillaryPhys.hpp

pkg/dem/KinemCNDEngine.cpp

pkg/dem/KinemCNDEngine.hpp

pkg/dem/KinemCNLEngine.cpp

pkg/dem/KinemCNLEngine.hpp

pkg/dem/KinemCNSEngine.cpp

pkg/dem/KinemCNSEngine.hpp

pkg/dem/KinemCTDEngine.cpp

pkg/dem/KinemCTDEngine.hpp

pkg/dem/Law2_ScGeom6D_InelastCohFrictPhys_CohesionMoment.cpp

pkg/dem/Law2_ScGeom6D_InelastCohFrictPhys_CohesionMoment.hpp

pkg/dem/NormalInelasticMat.cpp

pkg/dem/NormalInelasticMat.hpp

pkg/dem/NormalInelasticityLaw.cpp

pkg/dem/NormalInelasticityLaw.hpp

pkg/dem/NormalInelasticityPhys.cpp

pkg/dem/NormalInelasticityPhys.hpp

pkg/lbm/LBMbody.cpp

pkg/lbm/LBMlink.cpp

py/3rd-party/mtTkinter-0.3

py/3rd-party/mtTkinter-0.3/mtTkinter.py

files modified:
.pc/applied-patches

CMakeLists.txt

ChangeLog

LICENSE

RELEASE

core/Body.cpp

core/Body.hpp

core/BodyContainer.cpp

core/BodyContainer.hpp

core/Clump.cpp

core/Clump.hpp

core/Dispatcher.hpp

core/EnergyTracker.hpp

core/Engine.hpp

core/FileGenerator.cpp

core/ForceContainer.hpp

core/FrontEnd.hpp

core/Functor.hpp

core/InteractionContainer.hpp

core/Material.cpp

core/Material.hpp

core/Omega.cpp

core/Omega.hpp

core/Scene.cpp

core/Shape.hpp

core/State.cpp

core/ThreadRunner.cpp

core/TimeStepper.hpp

core/Timing.hpp

core/corePlugins.cpp

core/main/main.py.in

core/main/pyboot.cpp

debian/changelog

debian/patches/series

debian/rules

doc/references.bib

doc/sphinx/conf.py

doc/sphinx/installation.rst

doc/sphinx/user.rst

doc/yade-conferences.bib

examples/gts-horse/gts-horse.py

examples/stl-gts/gts-stl.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/_GLViewer.cpp

lib/base/Logging.hpp

lib/base/Math.cpp

lib/base/Math.hpp

lib/base/openmp-accu.hpp

lib/factory/ClassFactory.hpp

lib/factory/DynLibManager.cpp

lib/factory/DynLibManager.hpp

lib/import/STLReader.hpp

lib/import/utils.hpp

lib/multimethods/DynLibDispatcher.hpp

lib/multimethods/FunctorWrapper.hpp

lib/multimethods/Indexable.hpp

lib/opengl/GLUtils.hpp

lib/pyutil/doc_opts.hpp

lib/pyutil/numpy_boost.hpp

lib/pyutil/raw_constructor.hpp

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/KinematicLocalisationAnalyser.cpp

lib/triangulation/KinematicLocalisationAnalyser.hpp

lib/triangulation/Network.ipp

lib/triangulation/PeriodicFlowLinSolv.hpp

lib/triangulation/PeriodicFlowLinSolv.ipp

lib/triangulation/Tenseur3.cpp

lib/triangulation/Tenseur3.h

lib/triangulation/Tesselation.ipp

lib/triangulation/Timer.cpp

lib/triangulation/Timer.h

lib/triangulation/TriaxialState.cpp

lib/triangulation/TriaxialState.h

lib/triangulation/basicVTKwritter.cpp

lib/triangulation/basicVTKwritter.hpp

pkg/common/Aabb.hpp

pkg/common/BoundaryController.hpp

pkg/common/Box.hpp

pkg/common/Callbacks.hpp

pkg/common/Collider.cpp

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/FieldApplier.hpp

pkg/common/ForceResetter.hpp

pkg/common/Gl1_NormPhys.cpp

pkg/common/GravityEngines.cpp

pkg/common/Grid.cpp

pkg/common/Grid.hpp

pkg/common/InsertionSortCollider.cpp

pkg/common/InteractionLoop.cpp

pkg/common/KinematicEngines.cpp

pkg/common/MatchMaker.cpp

pkg/common/MatchMaker.hpp

pkg/common/NormShearPhys.hpp

pkg/common/OpenGLRenderer.cpp

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/SpatialQuickSortCollider.cpp

pkg/common/SpatialQuickSortCollider.hpp

pkg/common/Sphere.hpp

pkg/common/StepDisplacer.hpp

pkg/common/TorqueEngine.hpp

pkg/common/Wall.cpp

pkg/common/ZECollider.cpp

pkg/common/ZECollider.hpp

pkg/dem/BubbleMat.cpp

pkg/dem/BubbleMat.hpp

pkg/dem/CapillaryPhys.cpp

pkg/dem/CapillaryPhys.hpp

pkg/dem/CapillaryStressRecorder.cpp

pkg/dem/CapillaryTriaxialTest.cpp

pkg/dem/CohesiveFrictionalContactLaw.cpp

pkg/dem/CohesiveFrictionalContactLaw.hpp

pkg/dem/CohesiveTriaxialTest.cpp

pkg/dem/ConcretePM.cpp

pkg/dem/ConcretePM.hpp

pkg/dem/DemXDofGeom.hpp

pkg/dem/DomainLimiter.cpp

pkg/dem/ElasticContactLaw.cpp

pkg/dem/ElasticContactLaw.hpp

pkg/dem/FacetTopologyAnalyzer.cpp

pkg/dem/FlatGridCollider.cpp

pkg/dem/FlatGridCollider.hpp

pkg/dem/FrictPhys.cpp

pkg/dem/FrictPhys.hpp

pkg/dem/FrictViscoPM.cpp

pkg/dem/FrictViscoPM.hpp

pkg/dem/GeneralIntegratorInsertionSortCollider.cpp

pkg/dem/HertzMindlin.cpp

pkg/dem/HertzMindlin.hpp

pkg/dem/Ig2_Box_Sphere_ScGeom.cpp

pkg/dem/Ig2_Facet_Sphere_ScGeom.cpp

pkg/dem/Integrator.cpp

pkg/dem/Integrator.hpp

pkg/dem/Ip2_ElastMat.cpp

pkg/dem/JointedCohesiveFrictionalPM.cpp

pkg/dem/JointedCohesiveFrictionalPM.hpp

pkg/dem/KinemSimpleShearBox.cpp

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.hpp

pkg/dem/NewtonIntegrator.cpp

pkg/dem/PeriIsoCompressor.cpp

pkg/dem/PeriIsoCompressor.hpp

pkg/dem/Polyhedra.cpp

pkg/dem/Polyhedra.hpp

pkg/dem/Polyhedra_splitter.cpp

pkg/dem/Polyhedra_support.cpp

pkg/dem/SampleCapillaryPressureEngine.cpp

pkg/dem/Shop.hpp

pkg/dem/Shop_01.cpp

pkg/dem/Shop_02.cpp

pkg/dem/SimpleShear.cpp

pkg/dem/SimpleShear.hpp

pkg/dem/SpherePack.cpp

pkg/dem/SpherePack.hpp

pkg/dem/SpheresFactory.cpp

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/TriaxialStressController.cpp

pkg/dem/TriaxialStressController.hpp

pkg/dem/TriaxialTest.cpp

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/LBMbody.hpp

pkg/lbm/LBMlink.hpp

pkg/lbm/LBMnode.cpp

pkg/pfv/FlowEngine.hpp.in

pkg/pfv/FlowEngine.ipp.in

pkg/pfv/PeriodicFlowEngine.cpp

pkg/pfv/SoluteFlowEngine.cpp

py/3rd-party/README

py/CMakeLists.txt

py/_polyhedra_utils.cpp

py/_utils.cpp

py/export.py

py/mathWrap/miniEigen.cpp

py/pack/_packObb.cpp

py/pack/_packPredicates.cpp

py/utils.py

py/wrapper/customConverters.cpp

py/wrapper/yadeWrapper.cpp

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

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

Show diffs side-by-side

added added

removed removed

pkg/dem/KinemCNSEngine.cpp

/*************************************************************************

* jerome.duriez@hmg.inpg.fr *

* *

* This program is free software; it is licensed under the terms of the *

* GNU General Public License v2 or later. See file LICENSE for details. *

*************************************************************************/

#include<yade/pkg/dem/KinemCNSEngine.hpp>

YADE_PLUGIN((KinemCNSEngine));

void KinemCNSEngine::action()

{

if(LOG) cerr << "debut applyCondi !!" << endl;

KinemSimpleShearBox::getBoxes_Dt();

if(gamma<=gammalim)

{

computeDY(KnC);

letMove(shearSpeed * dt,deltaH);

gamma+=shearSpeed * dt;

if(temoin==0)

{

temoin=1;

}

else if (temoin<2)

{

stopMovement(); // INDISPENSABLE !

it_stop=scene->iter;

cout << "Cisaillement arrete : gammaLim atteint a l'iteration "<< it_stop << endl;

temoin=2;

}

else if (temoin==2 && (scene->iter==(it_stop+5000)) )

{

Omega::instance().saveSimulation(Key + "finCis" +boost::lexical_cast<string> (scene->iter ) + ".xml");

Omega::instance().pause();

}

Older »