------------------------------------------------------------
revno: 2554
committer: Bruno Chareyre <[email protected]>
branch nick: yade
timestamp: Mon 2010-11-15 18:56:01 +0100
message:
- add the mandatory "bool periodic" parameter for makeCloud.
modified:
pkg/dem/TriaxialTest.cpp
--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to
https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription
=== modified file 'pkg/dem/TriaxialTest.cpp'
--- pkg/dem/TriaxialTest.cpp 2010-11-15 12:44:47 +0000
+++ pkg/dem/TriaxialTest.cpp 2010-11-15 17:56:01 +0000
@@ -76,15 +76,15 @@
shared_ptr<Body> body;
- /* if _mean_radius is not given (i.e. <=0), then calculate it from box size and porosity;
+ /* if _mean_radius is not given (i.e. <=0), then calculate it from box size;
* OTOH, if it is specified, scale the box preserving its ratio and lowerCorner so that the radius can be as requested
*/
- Real porosity=.75;
+ Real porosity=.8;
SpherePack sphere_pack;
if(importFilename==""){
Vector3r dimensions=upperCorner-lowerCorner; Real volume=dimensions.x()*dimensions.y()*dimensions.z();
long num;
- if(radiusMean<=0) num=sphere_pack.makeCloud(lowerCorner,upperCorner,-1,radiusStdDev,numberOfGrains,porosity);
+ if(radiusMean<=0) num=sphere_pack.makeCloud(lowerCorner,upperCorner,-1,radiusStdDev,numberOfGrains,false /*periodic?*/,porosity);
else {
bool fixedDims[3];
fixedDims[0]=fixedBoxDims.find('x')!=string::npos; fixedDims[1]=fixedBoxDims.find('y')!=string::npos; fixedDims[2]=fixedBoxDims.find('z')!=string::npos;
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
