yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4141
committer: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
timestamp: Wed 2014-08-13 15:31:41 +0200
message:
  insert updatePorosity option in TriaxialStressController
modified:
  pkg/dem/TriaxialStressController.cpp
  pkg/dem/TriaxialStressController.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/TriaxialStressController.cpp'
--- pkg/dem/TriaxialStressController.cpp	2014-08-01 17:27:01 +0000
+++ pkg/dem/TriaxialStressController.cpp	2014-08-13 13:31:41 +0000
@@ -103,7 +103,7 @@
 	depth = p_front->se3.position.z() - p_back->se3.position.z() - thickness;
 
 	boxVolume = height * width * depth;
-	if (first) {
+	if ( (first) || (updatePorosity) ) {
 		BodyContainer::iterator bi = scene->bodies->begin();
 		BodyContainer::iterator biEnd = scene->bodies->end();
 
@@ -121,6 +121,7 @@
 			}
 		}
 		first = false;
+		updatePorosity = false;
 	}
 	max_vel1=3 * width /(height+width+depth)*max_vel;
 	max_vel2=3 * height /(height+width+depth)*max_vel;

=== modified file 'pkg/dem/TriaxialStressController.hpp'
--- pkg/dem/TriaxialStressController.hpp	2014-08-01 15:37:51 +0000
+++ pkg/dem/TriaxialStressController.hpp	2014-08-13 13:31:41 +0000
@@ -116,6 +116,7 @@
 		((Real,meanStress,0,Attr::readonly,"Mean stress in the packing. |yupdate|"))
 		((Real,volumetricStrain,0,Attr::readonly,"Volumetric strain (see :yref:`TriaxialStressController::strain`).|yupdate|"))
 		((Real,externalWork,0,Attr::readonly,"Energy provided by boundaries.|yupdate|"))
+		((bool,updatePorosity,false,,"If true porosity calculation will be updated once (will automatically reset to false after one calculation step). Can be used, when volume of particles changes during the simulation (e.g. when particles are erased or when clumps are created)."))
 		,
 		/* deprecated */
 		((sigma1,goal1,"renamed 'goal1', it can now also be a strain depending on stressMask"))