update to latest contact detection and model

Author: tomvanmele

src/compas_dem/analysis/cra.py

@@ -3,28 +3,25 @@
 from compas_cra.equilibrium import cra_penalty_solve as _cra_penalty_solve
 from compas_cra.equilibrium import rbe_solve as _rbe_solve
 
-from compas_dem.elements import BlockElement
-from compas_dem.interactions import FrictionContact
 from compas_dem.models import BlockModel
 
 
 def _blockmodel_to_assembly(model: BlockModel) -> Assembly:
-    element: BlockElement
     element_block: dict[int, int] = {}
 
     assembly = Assembly()
 
     for element in model.elements():
         block: Block = element.modelgeometry.copy(cls=Block)
-        x, y, z = block.centroid()
+        x, y, z = element.point
         node = assembly.add_block(block, x=x, y=y, z=z, is_support=element.is_support)
         element_block[element.graphnode] = node
 
     for edge in model.graph.edges():
-        u = element_block[edge[0]]
+        u = element_block[edge[0]]  # type: ignore
         v = element_block[edge[1]]
 
-        contacts: list[FrictionContact] = model.graph.edge_attribute(edge, name="contacts")
+        contacts = model.graph.edge_attribute(edge, name="contacts")  # type: ignore
         assembly.graph.add_edge(u, v, interfaces=contacts)
 
     return assembly
@@ -60,3 +57,9 @@ def cra_penalty_solve(
         verbose=verbose,
         timer=timer,
     )
+    for edge in assembly.graph.edges():
+        interfaces = assembly.graph.edge_attribute(edge, name="interfaces")
+        contacts = model.graph.edge_attribute(edge, name="contacts")
+        if interfaces and contacts:
+            for interface, contact in zip(interfaces, contacts):
+                contact.forces = interface.forces

src/compas_dem/elements/__init__.py

@@ -1,9 +1,7 @@
-from .block import BlockMesh
 from .block import BlockFeature
-from .block import BlockElement
+from .block import Block
 
 __all__ = [
-    "BlockElement",
+    "Block",
     "BlockFeature",
-    "BlockMesh",
 ]

src/compas_dem/viewers/blockmodelviewer.py

@@ -6,8 +6,7 @@
 from compas_viewer.scene import BufferGeometry
 from compas_viewer.scene import GroupObject
 
-from compas_dem.elements import BlockElement
-from compas_dem.elements import BlockMesh
+from compas_dem.elements import Block
 from compas_dem.models import BlockModel
 
 
@@ -57,9 +56,9 @@ def __init__(self, blockmodel, **kwargs):
 
         self.model: BlockModel = blockmodel
 
-        self.supports: GroupObject = None
-        self.blocks: GroupObject = None
-        self.interfaces: GroupObject = None
+        self.supports = None
+        self.blocks = None
+        self.interfaces = None
 
         self.color_block: Color = Color(0.9, 0.9, 0.9)
         self.color_support: Color = Color.red().lightened(75)
@@ -126,11 +125,11 @@ def init_blockmodel(self):
 
     def init_blocks(self):
         """Initialise the blocks."""
-        supports: list[BlockMesh] = []
-        blocks: list[BlockMesh] = []
+        supports: list[tuple] = []
+        blocks: list[tuple] = []
 
         for element in self.model.elements():
-            element: BlockElement
+            element: Block
             if element.is_support:
                 supports.append((element.modelgeometry, {"name": f"Support_{len(supports)}"}))
             else: