yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #10373
[Branch ~yade-pkg/yade/git-trunk] Rev 3798: Remove cout accidentally added in a prev. commit.
------------------------------------------------------------
revno: 3798
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Thu 2014-01-09 08:12:14 +0100
message:
Remove cout accidentally added in a prev. commit.
modified:
pkg/dem/ViscoelasticPM.cpp
pkg/dem/ViscoelasticPM.hpp
--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'pkg/dem/ViscoelasticPM.cpp'
--- pkg/dem/ViscoelasticPM.cpp 2014-01-08 14:36:59 +0000
+++ pkg/dem/ViscoelasticPM.cpp 2014-01-09 07:12:14 +0000
@@ -121,7 +121,6 @@
if (geom.penetrationDepth<0) {
if (phys.liqBridgeCreated and -geom.penetrationDepth<phys.sCrit and phys.Capillar) {
- cout<<id1<<" "<<id2<<endl;
phys.normalForce = -calculateCapillarForce(geom, phys)*geom.normal;
if (I->isActive) {
addForce (id1,-phys.normalForce,scene);
=== modified file 'pkg/dem/ViscoelasticPM.hpp'
--- pkg/dem/ViscoelasticPM.hpp 2014-01-08 14:36:59 +0000
+++ pkg/dem/ViscoelasticPM.hpp 2014-01-09 07:12:14 +0000
@@ -10,7 +10,6 @@
#include<yade/pkg/dem/ScGeom.hpp>
#include<yade/pkg/dem/DemXDofGeom.hpp>
-
/* Simple viscoelastic model */
/// Material