frictionAngle in radians

examples/cylinders/bendingbeams.py

@@ -22,10 +22,10 @@ O.engines=[
 ]
 
 #### Create materials and set different properties ####
-O.materials.append(CohFrictMat(young=1e6,poisson=0.3,density=1e1,frictionAngle=10,normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=False,label='mat1'))
-O.materials.append(CohFrictMat(young=1e6,poisson=0.3,density=1e1,frictionAngle=10,normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=True,label='mat2'))
-O.materials.append(CohFrictMat(young=3e6,poisson=0.3,density=1e1,frictionAngle=10,normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=True,label='mat3'))
-O.materials.append(CohFrictMat(young=1e7,poisson=0.3,density=1e1,frictionAngle=10,normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=True,label='mat4'))
+O.materials.append(CohFrictMat(young=1e6,poisson=0.3,density=1e1,frictionAngle=radians(10),normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=False,label='mat1'))
+O.materials.append(CohFrictMat(young=1e6,poisson=0.3,density=1e1,frictionAngle=radians(10),normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=True,label='mat2'))
+O.materials.append(CohFrictMat(young=3e6,poisson=0.3,density=1e1,frictionAngle=radians(10),normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=True,label='mat3'))
+O.materials.append(CohFrictMat(young=1e7,poisson=0.3,density=1e1,frictionAngle=radians(10),normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=True,label='mat4'))
 
 #### Vertices ####
 vertices1=[]

examples/grids/Simple_GridConnection_Falling.py

@@ -19,7 +19,7 @@ O.engines=[
 ]
 
 
-O.materials.append(CohFrictMat(young=3e2,poisson=0.3,density=1e1,frictionAngle=10,normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=True,label='mat'))
+O.materials.append(CohFrictMat(young=3e2,poisson=0.3,density=1e1,frictionAngle=radians(10),normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=True,label='mat'))
 
 
 ### Parameters ###

examples/grids/Simple_Grid_Falling.py

@@ -20,7 +20,7 @@ O.engines=[
 ]
 
 
-O.materials.append(CohFrictMat(young=3e2,poisson=0.3,density=1e1,frictionAngle=10,normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=True,label='spheremat'))
+O.materials.append(CohFrictMat(young=3e2,poisson=0.3,density=1e1,frictionAngle=radians(10),normalCohesion=1e7,shearCohesion=1e7,momentRotationLaw=True,label='spheremat'))
 
 
 ### Parameters of a rectangular grid ###

examples/not-working/insertion-sort-collider.py

@@ -11,7 +11,7 @@ O.engines=[
 	InteractionLoop([Ig2_Facet_Sphere_ScGeom()],[Ip2_FrictMat_FrictMat_FrictPhys()],[Law2_ScGeom_FrictPhys_CundallStrack()],),
 	NewtonIntegrator(damping=0.01,gravity=[0,0,-10]),
 ]
-mat=O.materials.append(FrictMat(young=1e3,poisson=.2,density=1000,frictionAngle=20))
+mat=O.materials.append(FrictMat(young=1e3,poisson=.2,density=1000,frictionAngle=radians(20)))
 O.bodies.append([
 	facet([[-1,-1,0],[1,-1,0],[0,1,0]],fixed=True,color=[1,0,0],material=mat),
 	facet([[1,-1,0],[0,1,0,],[1,.5,.5]],fixed=True,material=mat)

examples/test/Damping_HM.py

@@ -17,7 +17,7 @@ extents=[r2/2.,3*r2,3*r2] # half edge lenght [m]
 young=600.0e6 # [N/m^2]
 poisson=0.6 
 density=2.60e3 # [kg/m^3]
-frictionAngle=26 # [°]
+frictionAngle=radians(26) # [rad]
 
 # Append geometry and material
 O.materials.append(FrictMat(young=young,poisson=poisson,density=density,frictionAngle=frictionAngle))

examples/test/mindlin.py

@@ -22,7 +22,7 @@ O.engines=[
 ]
 
 ## define and append material
-mat=FrictMat(young=600.0e6,poisson=0.6,density=2.60e3,frictionAngle=26,label='Friction')
+mat=FrictMat(young=600.0e6,poisson=0.6,density=2.60e3,frictionAngle=radians(26),label='Friction')
 O.materials.append(mat)
 
 ## create two spheres (one will be fixed) and append them

examples/test/test-sphere-facet-corner.py

@@ -8,7 +8,7 @@ Poisson = 0.2
 Density=2700
 
 # Append a material
-mat=O.materials.append(FrictMat(young=Young,poisson=Poisson,density=Density,frictionAngle=26))
+mat=O.materials.append(FrictMat(young=Young,poisson=Poisson,density=Density,frictionAngle=radians(26)))
 
 O.bodies.append([
         sphere([0,0,0.6],0.25,material=mat),

examples/test/test-sphere-facet.py

@@ -24,7 +24,7 @@ Poisson = 0.2
 Density=2700
 
 # Append a material
-mat=O.materials.append(FrictMat(young=Young,poisson=Poisson,density=Density,frictionAngle=26))
+mat=O.materials.append(FrictMat(young=Young,poisson=Poisson,density=Density,frictionAngle=radians(26)))
 
 O.engines=[
 	ForceResetter(),