------------------------------------------------------------ revno: 1869 committer: Václav Šmilauer <[email protected]> branch nick: trunk timestamp: Tue 2009-12-08 01:35:11 +0100 message: 1. Fix PeriTriaxController example modified: doc/sphinx/README pkg/dem/Engine/StandAloneEngine/PeriIsoCompressor.hpp scripts/test/periodic-triax.py
-- 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 'doc/sphinx/README' --- doc/sphinx/README 2009-12-06 22:02:12 +0000 +++ doc/sphinx/README 2009-12-08 00:35:11 +0000 @@ -1,1 +1,3 @@ ipython_console_highlighting.py is copied from matplotlib's trunk/matplotlib/lib/matplotlib/sphinxext + +ipython_directive.py from http://old.nabble.com/ipython-sphinx-directive-td26239546.html === modified file 'pkg/dem/Engine/StandAloneEngine/PeriIsoCompressor.hpp' --- pkg/dem/Engine/StandAloneEngine/PeriIsoCompressor.hpp 2009-12-06 17:18:16 +0000 +++ pkg/dem/Engine/StandAloneEngine/PeriIsoCompressor.hpp 2009-12-08 00:35:11 +0000 @@ -38,6 +38,9 @@ strainStress contains absolute values for the controlled quantity, and stressMask determines meaning of those values (0 for strain, 1 for stress): e.g. ( 1<<0 | 1<<2 ) = 1 | 4 = 5 means that strainStress[0] and strainStress[2] are stress values, and strainStress[1] is strain. + +See scripts/test/periodic-triax.py for a simple example. + */ class PeriTriaxController: public StandAloneEngine{ public: @@ -83,7 +86,7 @@ void action(Scene*); void strainStressStiffUpdate(); - PeriTriaxController(): reversedForces(false),goal(Vector3r::ZERO),stressMask(0),maxStrainRate(Vector3r(1,1,1)),maxUnbalanced(1e-4),absStressTol(1e3),relStressTol(3e-5),growDamping(.25),globUpdate(100),refSize(Vector3r(-1,-1,-1)),maxBodySpan(Vector3r(-1,-1,-1)),stress(Vector3r::ZERO),strain(Vector3r::ZERO),strainRate(Vector3r::ZERO),stiff(Vector3r::ZERO),currUnbalanced(-1),prevGrow(Vector3r::ZERO){} + PeriTriaxController(): reversedForces(false),goal(Vector3r::ZERO),stressMask(0),maxStrainRate(Vector3r(1,1,1)),maxUnbalanced(1e-4),absStressTol(1e3),relStressTol(3e-5),growDamping(.25),globUpdate(5),refSize(Vector3r(-1,-1,-1)),maxBodySpan(Vector3r(-1,-1,-1)),stress(Vector3r::ZERO),strain(Vector3r::ZERO),strainRate(Vector3r::ZERO),stiff(Vector3r::ZERO),currUnbalanced(-1),prevGrow(Vector3r::ZERO){} REGISTER_ATTRIBUTES(StandAloneEngine,(reversedForces)(goal)(stressMask)(maxStrainRate)(maxUnbalanced)(absStressTol)(relStressTol)(growDamping)(globUpdate)(doneHook)(refSize)(stress)(strain)(strainRate)(stiff)); DECLARE_LOGGER; REGISTER_CLASS_AND_BASE(PeriTriaxController,StandAloneEngine); === modified file 'scripts/test/periodic-triax.py' --- scripts/test/periodic-triax.py 2009-12-05 23:12:46 +0000 +++ scripts/test/periodic-triax.py 2009-12-08 00:35:11 +0000 @@ -3,7 +3,7 @@ "Test and demonstrate use of PeriTriaxController." from yade import * from yade import pack,log,qt -log.setLevel('PeriTriaxController',log.DEBUG) +#log.setLevel('PeriTriaxController',log.DEBUG) O.periodicCell=(0,0,0),(.1,.1,.1) sp=pack.SpherePack() radius=5e-3 @@ -20,7 +20,7 @@ [SimpleElasticRelationships()], [Law2_Dem3Dof_Elastic_Elastic()] ), - PeriTriaxController(goal=[-1e5,-1e5,0],stressMask=3,globUpdate=5,maxStrainRate=1.,doneHook='triaxDone()',label='triax'), + PeriTriaxController(goal=[-1e5,-1e5,0],stressMask=3,globUpdate=5,maxStrainRate=[1.,1.,1.],doneHook='triaxDone()',label='triax'), NewtonsDampedLaw(damping=.6), ] O.dt=utils.PWaveTimeStep()
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
