yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jérôme Duriez (jduriez)
------------------------------------------------------------
revno: 3482 [merge]
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
timestamp: Wed 2014-10-15 20:20:54 +0200
message:
  Merge branch 'master' of github.com:yade/trunk
modified:
  pkg/dem/Shop_02.cpp


--
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/Shop_02.cpp'
--- pkg/dem/Shop_02.cpp	2014-10-15 06:44:01 +0000
+++ pkg/dem/Shop_02.cpp	2014-10-15 15:51:34 +0000
@@ -352,7 +352,7 @@
 Matrix3r Shop::getStress(Real volume){
 	Scene* scene=Omega::instance().getScene().get();
 	Real volumeNonPeri = 0;
-	if (!scene->isPeriodic) {
+	if ( volume==0 && !scene->isPeriodic ) {
 	  py::tuple extrema = Shop::aabbExtrema();
 	  volumeNonPeri = py::extract<Real>( (extrema[1][0] - extrema[0][0])*(extrema[1][1] - extrema[0][1])*(extrema[1][2] - extrema[0][2]) );
 	}