------------------------------------------------------------ revno: 3946 committer: Jan Stransky <jan.stran...@fsv.cvut.cz> timestamp: Tue 2016-10-18 11:04:27 +0200 message: Changed L3Geom to ScGeom in tutorial example scripts modified: doc/sphinx/tutorial/01-bouncing-sphere.py doc/sphinx/tutorial/02-gravity-deposition.py doc/sphinx/tutorial/03-oedometric-test.py doc/sphinx/tutorial/04-periodic-simple-shear.py doc/sphinx/tutorial/05-3d-postprocessing.py
-- 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 'doc/sphinx/tutorial/01-bouncing-sphere.py' --- doc/sphinx/tutorial/01-bouncing-sphere.py 2015-06-16 15:31:20 +0000 +++ doc/sphinx/tutorial/01-bouncing-sphere.py 2016-10-18 09:04:27 +0000 @@ -19,9 +19,9 @@ ForceResetter(), InsertionSortCollider([Bo1_Sphere_Aabb()]), InteractionLoop( - [Ig2_Sphere_Sphere_L3Geom()], # collision geometry + [Ig2_Sphere_Sphere_ScGeom()], # collision geometry [Ip2_FrictMat_FrictMat_FrictPhys()], # collision "physics" - [Law2_L3Geom_FrictPhys_ElPerfPl()] # contact law -- apply forces + [Law2_ScGeom_FrictPhys_CundallStrack()] # contact law -- apply forces ), # Apply gravity force to particles. damping: numerical dissipation of energy. NewtonIntegrator(gravity=(0,0,-9.81),damping=0.1) === modified file 'doc/sphinx/tutorial/02-gravity-deposition.py' --- doc/sphinx/tutorial/02-gravity-deposition.py 2015-06-16 15:31:20 +0000 +++ doc/sphinx/tutorial/02-gravity-deposition.py 2016-10-18 09:04:27 +0000 @@ -21,9 +21,9 @@ InsertionSortCollider([Bo1_Sphere_Aabb(),Bo1_Facet_Aabb()]), InteractionLoop( # handle sphere+sphere and facet+sphere collisions - [Ig2_Sphere_Sphere_L3Geom(),Ig2_Facet_Sphere_L3Geom()], + [Ig2_Sphere_Sphere_ScGeom(),Ig2_Facet_Sphere_ScGeom()], [Ip2_FrictMat_FrictMat_FrictPhys()], - [Law2_L3Geom_FrictPhys_ElPerfPl()] + [Law2_ScGeom_FrictPhys_CundallStrack()] ), NewtonIntegrator(gravity=(0,0,-9.81),damping=0.4), # call the checkUnbalanced function (defined below) every 2 seconds === modified file 'doc/sphinx/tutorial/03-oedometric-test.py' --- doc/sphinx/tutorial/03-oedometric-test.py 2015-06-16 15:31:20 +0000 +++ doc/sphinx/tutorial/03-oedometric-test.py 2016-10-18 09:04:27 +0000 @@ -28,9 +28,9 @@ InsertionSortCollider([Bo1_Sphere_Aabb(),Bo1_Facet_Aabb(),Bo1_Wall_Aabb()]), InteractionLoop( # the loading plate is a wall, we need to handle sphere+sphere, sphere+facet, sphere+wall - [Ig2_Sphere_Sphere_L3Geom(),Ig2_Facet_Sphere_L3Geom(),Ig2_Wall_Sphere_L3Geom()], + [Ig2_Sphere_Sphere_ScGeom(),Ig2_Facet_Sphere_ScGeom(),Ig2_Wall_Sphere_ScGeom()], [Ip2_FrictMat_FrictMat_FrictPhys()], - [Law2_L3Geom_FrictPhys_ElPerfPl()] + [Law2_ScGeom_FrictPhys_CundallStrack()] ), NewtonIntegrator(gravity=(0,0,-9.81),damping=0.5), # the label creates an automatic variable referring to this engine === modified file 'doc/sphinx/tutorial/04-periodic-simple-shear.py' --- doc/sphinx/tutorial/04-periodic-simple-shear.py 2015-06-16 15:31:20 +0000 +++ doc/sphinx/tutorial/04-periodic-simple-shear.py 2016-10-18 09:04:27 +0000 @@ -41,9 +41,9 @@ ForceResetter(), InsertionSortCollider([Bo1_Sphere_Aabb()]), InteractionLoop( - [Ig2_Sphere_Sphere_L3Geom()], + [Ig2_Sphere_Sphere_ScGeom()], [Ip2_FrictMat_FrictMat_FrictPhys()], - [Law2_L3Geom_FrictPhys_ElPerfPl()] + [Law2_ScGeom_FrictPhys_CundallStrack()] ), NewtonIntegrator(damping=.4), # run checkStress function (defined below) every second === modified file 'doc/sphinx/tutorial/05-3d-postprocessing.py' --- doc/sphinx/tutorial/05-3d-postprocessing.py 2015-06-16 15:31:20 +0000 +++ doc/sphinx/tutorial/05-3d-postprocessing.py 2016-10-18 09:04:27 +0000 @@ -16,9 +16,9 @@ ForceResetter(), InsertionSortCollider([Bo1_Sphere_Aabb()]), InteractionLoop( - [Ig2_Sphere_Sphere_L3Geom()], + [Ig2_Sphere_Sphere_ScGeom()], [Ip2_FrictMat_FrictMat_FrictPhys()], - [Law2_L3Geom_FrictPhys_ElPerfPl()] + [Law2_ScGeom_FrictPhys_CundallStrack()] ), NewtonIntegrator(damping=.4), # save data for Paraview
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : yade-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
