Unload updates, small mooring/platform fixes

-- unload:
	- cable appendage info (including connectors) now unloads if it's in the design dictionary of the dynamic cable
	- unload cable type info always (even if made with cableprops)
- small bug fixes in platform and mooring
- small update to calcDistance helper function

Author: lsirkis

famodel/helpers.py

@@ -1520,7 +1520,7 @@ def compareDicts(d1, d2):
             return(False)
     return(True)
 
-def calcMinimumDists(obj_list_A,obj_list_B=None, coords_list=None):
+def calcMinimumDists(obj_list_A,obj_list_B=None, coords_list=None, ret_arg=False):
     '''
     Calculates and returns the minimum distance between 2 lists of objects.
 
@@ -1537,24 +1537,33 @@ def calcMinimumDists(obj_list_A,obj_list_B=None, coords_list=None):
     -------
     A2B : float
         Minimum distance between the compared locations
+    ret_arg : list
+        A and (possibly) B indices in list that produced the lowest distance
 
     '''
     A2B=np.inf
 
     if obj_list_B is not None:
-        for objA in obj_list_A:
-            for objB in obj_list_B:
+        for a, objA in enumerate(obj_list_A):
+            for b, objB in enumerate(obj_list_B):
                 if objA != objB:
                     dist = np.linalg.norm(np.array(objA.r[:2]) - np.array(objB.r[:2]))
-                    A2B = min(A2B, dist)
+                    if dist<A2B:
+                        ret_arg = [a,b]
+                        A2B = dist
     elif coords_list!=None:
-        for objA in obj_list_A:
+        for a,objA in enumerate(obj_list_A):
             dist = np.linalg.norm(objA.r[:2] - coords_list, axis=1)
-            A2B = min(A2B, np.min(dist))
+            if dist<A2B:
+                ret_arg = [a]
+                A2B = dist
     else:
         raise Exception('Either obj_list_B or coords_list must not be None')
-        
-    return(A2B)
+    
+    if ret_arg:
+        return(A2B, ret_arg)
+    else:
+        return(A2B)
 
 def calcMaterialMasses(obj_list):
     '''

famodel/mooring/mooring.py

@@ -1230,6 +1230,10 @@ def getMG(mgDict, oldLine=None, ms=None, ss_number=None):
         else:
             ss = deepcopy(self.ss)
         ss_number = ss.number
+        
+        # update ms to the subsystem's sys if no ms given
+        if ms==None:
+            ms = ss.sys
 
         if updateDepths:
             # call getMG in a while loop until the settled depth matches the required change depth

famodel/platform/platform.py

@@ -20,7 +20,7 @@ class Platform(Node):
     Eventually will inherit from Node.
     '''
 
-    def __init__(self, id, r=[0,0,0], heading=0, mooring_headings=[60,180,300],rFair=None,zFair=None):
+    def __init__(self, id, r=[0,0,0], heading=0,rFair=None,zFair=None):
         '''
         
         Parameters
@@ -29,8 +29,6 @@ def __init__(self, id, r=[0,0,0], heading=0, mooring_headings=[60,180,300],rFair
             x and y coordinates [m].
         phi, float (optional)
             The heading of the object [deg].
-        mooring_headings (optional)
-            relative headings of mooring lines [deg].
         '''
         # Initialize as a node
         Node.__init__(self,id)
@@ -345,7 +343,7 @@ def getWatchCircle(self, plot=0, ang_spacing=45, RNAheight=150,
         moorings = [] # list of mooring lines attached
         cables = [] # list of cables attached
         dcs = []
-        lBots = [0]*len(self.mooring_headings)
+        lBots = [0]*len(self.getMoorings())
 
         # find turbines, cables, and mooorings attached to platform
         moorings = self.getMoorings().values()

famodel/project.py

@@ -4716,12 +4716,12 @@ def unload(self,file='project.yaml'):
                     ctA = sub.dd['cable_type']['A'] 
                     cKey = (ctw,ctA)
                     ctf = False
-                    # check if made with getCableProps (then we can skip writing out cable type info)
-                    if 'notes' in sub.dd['cable_type']:
-                        if 'made with getCableProps' in sub.dd['cable_type']['notes']:
-                            ctk = 'cableFamily'
-                            ctn = 'static_cable_'+str(int(sub.voltage))
-                            ctf = True
+                    # # check if made with getCableProps (then we can skip writing out cable type info)
+                    # if 'notes' in sub.dd['cable_type']:
+                    #     if 'made with getCableProps' in sub.dd['cable_type']['notes']:
+                    #         ctk = 'cableFamily'
+                    #         ctn = 'static_cable_'+str(int(sub.voltage))
+                    #         ctf = True
 
                     # create current cable config dictionary
                     if not ctf:
@@ -4764,11 +4764,11 @@ def unload(self,file='project.yaml'):
                     ctA = sub.dd['A'] 
                     cKey = (ctw,ctA)
                     ctf = False; ctk = 'cable_type'
-                    # check if made with getCableProps (then we can skip writing out cable type info)
-                    if 'notes' in sub.dd['cable_type']:
-                        if 'made with getCableProps' in sub.dd['cable_type']['notes']:
-                            ctn = ct+'_cable_'+str(int(sub.voltage))
-                            ctf = True
+                    # # check if made with getCableProps (then we can skip writing out cable type info)
+                    # if 'notes' in sub.dd['cable_type']:
+                    #     if 'made with getCableProps' in sub.dd['cable_type']['notes']:
+                    #         ctn = ct+'_cable_'+str(int(sub.voltage))
+                    #         ctf = True
                     # check if cable type has already been written
                     if not ctf:
                         if not cKey in cUnique:
@@ -4778,8 +4778,13 @@ def unload(self,file='project.yaml'):
                         else:
                             cIdx = cUnique.index(cKey)
                             ctn = 'dyn_cab_'+str(cIdx)
-                    # collect buoyancy sections info if applicable
+                    # collect buoyancy sections (and appendages) info if applicable
                     bs = []
+                    if 'appendages' in sub.dd:
+                        for app in sub.dd['appendages']:
+                            if not app['type'] in appendageTypes:
+                                appendageTypes[app['type']] = app
+                            bs.append({'type':app['type']})
                     if 'buoyancy_sections' in sub.dd:
                         for b in sub.dd['buoyancy_sections']:
                             btw = b['module_props']['w']; btv = b['module_props']['volume']
@@ -4794,9 +4799,6 @@ def unload(self,file='project.yaml'):
                             bs.append({'L_mid':b['L_mid'],'N_modules':b['N_modules'],
                                       'spacing':b['spacing'],'V':b['module_props']['volume'],
                                       'type':btn})
-                    if 'appendages' in sub.dd:
-                        for app in sub.dd['appendages']:
-                            pass # UPDATE TO PULL OUT APPENDAGE INFO AND STORE
 
                     # grab joint info
                     if kk == 0 and len(cab.subcomponents)>1: