Skip to content

Commit de1641e

Browse files
fredroyfredroy
committed
fix warnings, behavior in scenes
1 parent a3ad75d commit de1641e

4 files changed

Lines changed: 23 additions & 16 deletions

File tree

‎examples/3instruments_collis.scn‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<LocalMinDistance name="localmindistance" alarmDistance="2" contactDistance="1" angleCone="0.5" coneFactor="0.5" />
3636
<CollisionResponse name="Response" response="FrictionContactConstraint" />
3737

38-
<!-- ------------------------- INTERVENTIONAL RADIOLOGY INSTRUMENTS (catheter, guidewire, coil) ------------------------------ -->
38+
<!-- INTERVENTIONAL RADIOLOGY INSTRUMENTS (catheter, guidewire, coil) -->
3939

4040
<Node name="topoLines_cath">
4141
<RodStraightSection name="StraightSection" youngModulus="10000" massDensity="0.00000155" radius="1" nbEdgesCollis="40" nbEdgesVisu="220" length="600.0"/><!--stiff silicone E = 10000 MPa // 1550 Kg/m3-->
@@ -142,14 +142,21 @@
142142
</Node>
143143
</Node>
144144

145-
<Node name="CollisionModel">
146-
<MeshOBJLoader name="meshLoader" filename="mesh/phantom.obj" triangulate="true" flipNormals="1"/>
147-
<MeshTopology position="@meshLoader.position" triangles="@meshLoader.triangles"/>
148-
<MechanicalObject name="DOFs1" position="0 0 400" scale="3" ry="90"/>
149-
<TriangleCollisionModel simulated="0" moving="0"/>
150-
<LineCollisionModel simulated="0" moving="0"/>
151-
<PointCollisionModel simulated="0" moving="0"/>
152-
<OglModel name="Visual" src="@meshLoader" color="1 0 0 0.3" scale="3" ry="90"/>
145+
<Node name="VesselsPhantom">
146+
<MeshOBJLoader name="meshLoader" filename="mesh/phantom.obj" triangulate="true" flipNormals="1" scale="3" rotation="0 90 0"/>
147+
148+
<Node name="Collision">
149+
<MeshTopology position="@../meshLoader.position" triangles="@meshLoader.triangles"/>
150+
<MechanicalObject name="DOFs1"/>
151+
<TriangleCollisionModel simulated="0" moving="0"/>
152+
<LineCollisionModel simulated="0" moving="0"/>
153+
<PointCollisionModel simulated="0" moving="0"/>
154+
</Node>
155+
156+
<Node name="Visual">
157+
<OglModel name="Visual" src="@../meshLoader" color="1 0 0 0.3" />
158+
</Node>
159+
153160
</Node>
154161

155162
</Node>

‎examples/Tool_from_loader.scn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<Node name="GuideCatheter">
2626
<MeshOBJLoader name="loader" filename="mesh/key_tip.obj" />
2727

28-
<RodStraightSection name="StraightSection" youngModulus="1000000" poissonRatio="0.3" radius="0.05" massDensity="0.1" nbEdgesCollis="30" nbEdgesVisu="200" length="980.0"/>
29-
<RodMeshSection name="MeshTipSection" loader="@loader" nbEdgesCollis="300" nbEdgesVisu="300" radius="0.05" massDensity="0.1" youngModulus="1000000" poissonRatio="0.3"/>
28+
<RodStraightSection name="StraightSection" youngModulus="1000000" poissonRatio="0.3" massDensity="0.00000155" radius="0.05" nbEdgesCollis="30" nbEdgesVisu="200" length="980.0"/>
29+
<RodMeshSection name="MeshTipSection" loader="@loader" youngModulus="1000000" poissonRatio="0.3" massDensity="0.00000155" radius="0.05" nbEdgesCollis="300" nbEdgesVisu="300" />
3030

3131
<WireRestShape template="Rigid3d" name="GC_RestShape" printLog="false" wireMaterials="@StraightSection @MeshTipSection" />
3232

‎examples/python3/SingleBeamDeployment.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ def createScene(rootNode):
1313
topoLines.addObject('RodStraightSection', name='StraightSection',
1414
length=980.0, radius=0.9,
1515
nbEdgesCollis=30, nbEdgesVisu=196,
16-
youngModulus=20000)
16+
youngModulus=20000, massDensity=0.00000155)
1717

1818
topoLines.addObject('RodSpireSection', name='SpireSection',
1919
length=20.0, radius=0.9,
2020
nbEdgesCollis=5, nbEdgesVisu=4,
2121
spireDiameter=25, spireHeight=0,
22-
youngModulus=20000)
22+
youngModulus=20000, massDensity=0.00000155)
2323
topoLines.addObject('WireRestShape', name='BeamRestShape', template="Rigid3d",
2424
wireMaterials="@StraightSection @SpireSection")
2525

‎examples/python3/SingleBeamDeploymentCollision.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ def createScene(rootNode):
2121
topoLines.addObject('RodStraightSection', name='StraightSection',
2222
length=980.0, radius=0.9,
2323
nbEdgesCollis=50, nbEdgesVisu=200,
24-
youngModulus=20000, massDensity=0.1, poissonRatio=0.3)
24+
youngModulus=20000, massDensity=0.00000155, poissonRatio=0.3)
2525

2626
topoLines.addObject('RodSpireSection', name='SpireSection',
2727
length=20.0, radius=0.9,
2828
nbEdgesCollis=10, nbEdgesVisu=200,
2929
spireDiameter=25, spireHeight=0,
30-
youngModulus=20000, massDensity=0.1, poissonRatio=0.3)
30+
youngModulus=20000, massDensity=0.00000155, poissonRatio=0.3)
3131
topoLines.addObject('WireRestShape', name='BeamRestShape', template="Rigid3d",
3232
wireMaterials="@StraightSection @SpireSection")
3333

@@ -42,7 +42,7 @@ def createScene(rootNode):
4242
BeamMechanics.addObject('EulerImplicitSolver', rayleighStiffness=0.2, rayleighMass=0.1)
4343
BeamMechanics.addObject('BTDLinearSolver', verification=False, subpartSolve=False, verbose=False)
4444
BeamMechanics.addObject('RegularGridTopology', name='MeshLines',
45-
nx=60, ny=1, nz=1,
45+
nx=61, ny=1, nz=1,
4646
xmax=0.0, xmin=0.0, ymin=0, ymax=0, zmax=0, zmin=0,
4747
p0=[0,0,0])
4848
BeamMechanics.addObject('MechanicalObject', showIndices=False, name='DOFs', template='Rigid3d', ry=-90)

0 commit comments

Comments
 (0)