Merge branch 'master' of https://github.com/GazzolaLab/PyElastica

GazzolaLab · May 23, 2022 · 2022949 · 2022949
2 parents e5b8692 + 5203746
commit 2022949
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 3 deletions.
diff --git a/examples/AxialStretchingCase/axial_stretching.py b/examples/AxialStretchingCase/axial_stretching.py
@@ -61,6 +61,7 @@ class StretchingBeamSimulator(BaseSystemCollection, Constraints, Forcing, CallBa
 youngs_modulus = 1e4
 # For shear modulus of 1e4, nu is 99!
 poisson_ratio = 0.5
+shear_modulus = youngs_modulus / (poisson_ratio + 1.0)
 
 stretchable_rod = CosseratRod.straight_rod(
     n_elem,
@@ -72,7 +73,7 @@ class StretchingBeamSimulator(BaseSystemCollection, Constraints, Forcing, CallBa
     density,
     nu,
     youngs_modulus,
-    poisson_ratio,
+    shear_modulus=shear_modulus,
 )
 
 stretch_sim.append(stretchable_rod)

diff --git a/examples/ButterflyCase/butterfly.py b/examples/ButterflyCase/butterfly.py
@@ -50,6 +50,7 @@ class ButterflySimulator(BaseSystemCollection, CallBacks):
 nu = 0.0
 youngs_modulus = 1e4
 poisson_ratio = 0.5
+shear_modulus = youngs_modulus / (poisson_ratio + 1.0)
 
 positions = np.empty((MaxDimension.value(), n_elem + 1))
 dl = total_length / n_elem
@@ -77,7 +78,7 @@ class ButterflySimulator(BaseSystemCollection, CallBacks):
     density=density,
     nu=nu,
     youngs_modulus=youngs_modulus,
-    poisson_ratio=poisson_ratio,
+    shear_modulus=shear_modulus,
     position=positions,
 )
 

diff --git a/examples/ContinuumSnakeCase/continuum_snake.py b/examples/ContinuumSnakeCase/continuum_snake.py
@@ -1,6 +1,8 @@
 __doc__ = """Snake friction case from X. Zhang et. al. Nat. Comm. 2021"""
 
 import sys
+import os
+import numpy as np
 
 sys.path.append("../../")
 from elastica import *

diff --git a/examples/FlexibleSwingingPendulumCase/flexible_swinging_pendulum.py b/examples/FlexibleSwingingPendulumCase/flexible_swinging_pendulum.py
@@ -8,7 +8,7 @@
 
 # from collections import defaultdict
 
-# import numpy as np
+import numpy as np
 from matplotlib import pyplot as plt
 
 from elastica import *

diff --git a/examples/MuscularFlagella/muscular_flagella.py b/examples/MuscularFlagella/muscular_flagella.py
@@ -1,6 +1,7 @@
 __doc__ = """Muscular flagella example from Zhang et. al. Nature Comm 2019 paper."""
 
 import sys
+import numpy as np
 
 sys.path.append("../../")
 

diff --git a/examples/MuscularSnake/muscular_snake.py b/examples/MuscularSnake/muscular_snake.py
@@ -1,5 +1,6 @@
 __doc__ = """Muscular snake example from Zhang et. al. Nature Comm 2019 paper."""
 import sys
+import numpy as np
 
 sys.path.append("../../")
 from elastica import *

diff --git a/examples/RestartExample/restart_example.py b/examples/RestartExample/restart_example.py
@@ -3,6 +3,7 @@
 """
 
 import sys
+import numpy as np
 
 sys.path.append("../../")
 from elastica import *

diff --git a/examples/RigidBodyCases/rigid_cylinder_rotational_motion_case.py b/examples/RigidBodyCases/rigid_cylinder_rotational_motion_case.py
@@ -1,4 +1,5 @@
 import sys
+import numpy as np
 
 sys.path.append("../../")
 

diff --git a/examples/RigidBodyCases/rigid_cylinder_translational_motion_case.py b/examples/RigidBodyCases/rigid_cylinder_translational_motion_case.py
@@ -1,4 +1,5 @@
 import sys
+import numpy as np
 
 sys.path.append("../../")
 

diff --git a/examples/RigidBodyCases/rigid_sphere_rotational_motion_case.py b/examples/RigidBodyCases/rigid_sphere_rotational_motion_case.py
@@ -1,4 +1,5 @@
 import sys
+import numpy as np
 
 sys.path.append("../../")
 

diff --git a/examples/RigidBodyCases/rigid_sphere_translational_motion_case.py b/examples/RigidBodyCases/rigid_sphere_translational_motion_case.py
@@ -1,4 +1,5 @@
 import sys
+import numpy as np
 
 sys.path.append("../../")