famodel_base updates to support parallel things in edges:

Subcomponents can now include parallel strings of subcomponents
among the subcomponents of an edge, including at the ends. This
gives support for things like bridles or double chain sections.
The assemble function supports this by accepting a nested list
of items, where nesting indicates multiple parallel edges or
sequences of edges and nodes.

Author: mattEhall

famodel/famodel_base.py

@@ -673,7 +673,11 @@ def addSubcomponents(self, items, iA=[0], iB=[-1]):
         # Store them as subcomponents of this edge
         self.subcomponents = items  # dict(enumerate(items))
         for item in items:
-            item.part_of = self
+            if isinstance(item, list):
+                for subitem in item:
+                    subitem.part_of = self
+            else:    
+                item.part_of = self
 
         # Assign ends 
         self.subcons_A = list([items[0]]) # subcomponent for end A (can be multiple)
@@ -1089,10 +1093,42 @@ def assemble(items):
 
     # >>> TODO: adjust this so it can connect parallel elements .eg. for bridles <<<
 
+    '''
+    # If the provided items isn't a list, there's nothing to assemble so return
+    if not isinstance(items[i], List):
+        print('Not a list - returning!')
+        return
+    '''
     n = len(items)
 
     for i in range(n-1):
-        if isinstance(items[i], Node) and isinstance(items[i+1], Edge):
+    
+        if isinstance(items[i], list):
+            for subitem in items[i]:  # go through each parallel subitem
+            
+                if isinstance(subitem, list):  # if it's a concatenation of multiple things
+                    assemble(subitem) # make sure that any sublist is assembled
+                    
+                    # attach the end objects of the subitem to the nodes before and after
+                    if i > 0 and isinstance(items[i-1], Node):  # attach to previous node
+                        items[i-1].attach(subitem[0], end='a')
+                    if i < n-1 and isinstance(items[i+1], Node):  # attach to next node
+                        items[i+1].attach(subitem[-1], end='b')
+                    # note: this requires the end objects to be edges
+                
+                elif isinstance(subitem, Edge): # if the subitem is just one edge
+                    if i > 0 and isinstance(items[i-1], Node):  # attach to previous node
+                        items[i-1].attach(subitem, end='a')
+                    if i < n-1 and isinstance(items[i+1], Node):  # attach to next node
+                        items[i+1].attach(subitem, end='b')
+                else:
+                    raise Exception("Unsupported situation ... parallel subitems must be edges or concatenations")
+                
+        elif isinstance(items[i], Node) and isinstance(items[i+1], list):
+            pass  # this node connects to a bridle or doubled section, 
+            # so it will be hooked up in the next step
+            
+        elif isinstance(items[i], Node) and isinstance(items[i+1], Edge):
             items[i].attach(items[i+1], end='a')
 
         elif isinstance(items[i], Edge) and isinstance(items[i+1], Node):
@@ -1174,7 +1210,24 @@ def rotationMatrix(x3,x2,x1):
 
     assemble([A, E, B])
 
-    E.addSubcomponents([e0,n0,e1,n1,e2])
+    E.addSubcomponents([e0,n0,e1,n1,e2])    
+    
+    
+    # ----- a test for bridles etc -----
+    
+    e0 = Edge(id='e0')
+    n0 = Node(id='n0')
+    e1 = Edge(id='e1')
+    n1 = Node(id='n1')
+    e2a = Edge(id='e2a')
+    e2b = Edge(id='e2b')
+    
+    
+    thelist = [e0, n0, e1, n1, [e2a, e2b]]
+    
+    E = Edge(id='big edge')
+    
+    E.addSubcomponents(thelist)
 
     # ----- try joining two nodes -----
 
@@ -1184,7 +1237,7 @@ def rotationMatrix(x3,x2,x1):
 
 
     # ----- tests connecting multi-level node and edge objects ----
-    '''
+    
     # --- Test 1 ---
     # platform and fairlead
     n1 = Node(id='n1')
@@ -1254,7 +1307,7 @@ def rotationMatrix(x3,x2,x1):
     e1_n2.attach(e1_e1, end='B')
     # attach mooring to platfrom (by lower objects, then upper will be automatic)
     n2.attach(e1_n2)
-    '''
+    
     # --- Test 6 ---
     # platform and fairlead
     n1 = Node(id='n1')

famodel/mooring/mooring.py

@@ -483,7 +483,8 @@ def createSubsystem(self, case=0,pristine=True,dd=None, mooringSys=None):
             # save to modified ss (may have marine growth, corrosion, etc)
             self.ss_mod = ss
             return(self.ss_mod)
-        
+    
+    
     def mirror(self,create_subsystem=True):
         ''' Mirrors a half design dictionary. Useful for symmetrical shared mooring lines where 
         only half of the line is provided 
@@ -1057,6 +1058,3 @@ def connectSubcomponents(self):
         self.i_con = list(range(0, 2*self.n_sec+1, 2))
         self.i_sec = list(range(1, 2*self.n_sec+1, 2))
 
-    
-        
-        

famodel/platform/platform.py

@@ -61,6 +61,7 @@ def __init__(self, id, r=[0,0,0], heading=0, mooring_headings=[60,180,300],rFair
         self.failure_probability = {}
         self.raftResults = {}
 
+    
     def setPosition(self, r, heading=None, degrees=False,project=None):
         '''
         Set the position/orientation of the platform as well as the associated