yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4122
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Tue 2014-07-29 19:26:54 +0200
message:
  Replace L3eom by SCgeom in stl and gts examples.
modified:
  examples/gts-horse/gts-horse.py
  examples/stl-gts/gts-stl.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 'examples/gts-horse/gts-horse.py'
--- examples/gts-horse/gts-horse.py	2013-03-28 11:04:00 +0000
+++ examples/gts-horse/gts-horse.py	2014-07-29 17:26:54 +0000
@@ -40,9 +40,9 @@
 	ForceResetter(),
 	InsertionSortCollider([Bo1_Sphere_Aabb(),Bo1_Facet_Aabb()],label='collider'),
 	InteractionLoop(
-		[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(damping=.1,gravity=[0,0,-5000]),
 	PyRunner(iterPeriod=1000,command='timing.stats(); O.pause();'),

=== modified file 'examples/stl-gts/gts-stl.py'
--- examples/stl-gts/gts-stl.py	2013-12-03 07:47:09 +0000
+++ examples/stl-gts/gts-stl.py	2014-07-29 17:26:54 +0000
@@ -20,9 +20,9 @@
 	ForceResetter(),
 	InsertionSortCollider([Bo1_Sphere_Aabb(),Bo1_Facet_Aabb()],label='collider'),
 	InteractionLoop(
-		[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(damping=.1,gravity=[0,0,-500.0]),
 	PyRunner(iterPeriod=1000,command='timing.stats(); O.pause();'),