misc. updates

-- adjust how cable headings are set
	- now matches moorings, where cable subcomponent headings are
	  absolute in compass headings
-- add loads and safety_factors dictionary to Section objects
	- mooring loads are now stored in Section object dicts
	  insetead of in mooring objects
-- mooring.updateTensions() updated to reflect new location of loads
-- updated mooring.addMarineGrowth() to properly work with new dd setup
-- in Mooring.sections() allow option to input dictionary of subcomponents
   instead of using i_sec values, useful for cases like marine growth
   where new sections are added but the design dicitonary property
   of mooring needs to be the pristine version
-- remove cable heading adjustment when updating platform position
-- update platform.getWatchCircle to use & store Section loads/safety_factors
-- project.loadDesign update how cable headings are loaded in to match moorings
-- project.duplicate update to work with new mooring design dictionaries, fairleads, etc
-- project.addPlatformMS update to work with new mooring design dicts, fairleads, etc
-- project.arrayWatchCircle update to use & store Section loads/safety_factors
-- project.unload update to unload fairleads and jtubes
-- allow rJtube to be provided in cable description (this is how it was before, then was removed)

Author: lsirkis

famodel/cables/cable.py

@@ -122,7 +122,7 @@ def reposition(self,headings=None,project=None,rad_fair=[]):
         Parameters
         ----------
         headings : list, optional
-            List of headings associated with the platform/substation attached
+            List of absolute compass headings associated with the platform/substation attached
             to each end of the cable. The default is None.
         project : FAModel project object, optional
             FAModel project object associated with this cable, only used if 
@@ -139,11 +139,11 @@ def reposition(self,headings=None,project=None,rad_fair=[]):
         '''
         # reposition cable and set end points for the first and last cable sections (or the dynamic cable for a suspended cable)
         if not headings:
-            headingA = self.subcomponents[0].headingA - self.attached_to[0].phi
-            headingB = self.subcomponents[-1].headingB - self.attached_to[1].phi
+            headingA = np.pi/2 - self.subcomponents[0].headingA
+            headingB = np.pi/2 - self.subcomponents[-1].headingB
         else:
-            headingA = headings[0]
-            headingB = headings[1]
+            headingA = np.pi/2 - headings[0]
+            headingB = np.pi/2 - headings[1]
 
         if not isinstance(self.subcomponents[0].attached_to[0], Jtube):
             if not rad_fair:
@@ -154,7 +154,6 @@ def reposition(self,headings=None,project=None,rad_fair=[]):
                 else:
                     rf = rad_fair[0]
 
-
             # calculate fairlead locations
             Aloc = [self.attached_to[0].r[0]+np.cos(headingA)*rf, 
                     self.attached_to[0].r[1]+np.sin(headingA)*rf, 

famodel/cables/dynamic_cable.py

@@ -80,7 +80,7 @@ def __init__(self, id, dd=None, subsystem=None, rA=[0,0,0], rB=[0,0,0],
         elif 'headingB' in self.dd:
             self.headingB = self.dd['headingB'] # <<< ??
             # if there's no headingA, likely a suspended cable - headingA = headingB+180 degrees
-            self.headingA = self.headingB + np.pi
+            self.headingA = 0
 
         else:
             self.headingA = 0

famodel/helpers.py

@@ -657,6 +657,7 @@ def MooringProps(mCon, lineTypes, rho_water, g, checkType=1):
         # else:
         #     d_vol = dd['d']
         dd['w'] = (dd['m']-np.pi/4*d_vol**2*rho_water)*g
+        dd['MBL'] = float(dd['MBL'])
         if 'mooringFamily' in mCon:
             raise Exception('type and moorFamily listed in yaml - use type to reference a mooring type in the mooring_line_types section of the yaml and mooringFamily to obtain mooring properties from MoorProps_default.yaml')
     elif 'mooringFamily' in mCon:
@@ -668,6 +669,7 @@ def MooringProps(mCon, lineTypes, rho_water, g, checkType=1):
         dd = mProps
         dd['name'] = mCon['mooringFamily']
         dd['d_nom'] = mCon['d_nom']
+        dd['MBL'] = float(dd['MBL'])
     elif 'type' in mCon and not mCon['type'] in lineTypes:
         raise Exception(f'Type {mCon["type"]} provided in mooring_line_config {mCon} is not found in mooring_line_types section. Check for errors.')
 
@@ -722,6 +724,7 @@ def getMoorings(lcID, lineConfigs, connectorTypes, pfID, proj):
             config[-1]['type']['name'] = str(ct)+'_'+str(lt['name'])
             # make EA a float not a string
             config[-1]['type']['EA'] = float(lt['EA'])  
+            config[-1]['type']['MBL'] = float(lt['MBL'])
             # set line length
             config[-1]['L'] = lc['length']
 
@@ -789,6 +792,7 @@ def getMoorings(lcID, lineConfigs, connectorTypes, pfID, proj):
                                                'L': subsub['length']})
                         # make EA a float not a string
                         config[-1][-1][-1]['type']['EA'] = float(lt['EA']) 
+                        config[-1][-1][-1]['type']['MBL'] = float(lt['MBL'])
                         sublineLast[ii] = 1
                     else:
                         raise Exception(f"keys in subsection line definitions must either be 'type', 'mooringFamily', or 'connectorType'")

famodel/mooring/README.md

@@ -22,18 +22,23 @@ includes a design dictionary with the following details:
 - rad_fair : Fairlead radius
 - z_fair   : Fairlead depth 
 - span     : 2D distance from fairlead to anchor (or fairlead to fairlead)
-- Sections: List of line segment detail dictionaries, becomes list of section objects
-	- type : Line section type dictionary
-		- d_nom, d_vol : diameter (nominal and volume-equivalent) [m]
-		- material
-		- cost [USD]
-		- m : linear mass [g/m]
-		- w : weight [N/m]
-		- MBL : minimum breaking load [N]
-		- EA : stiffness coefficient [N]
-	- L : Line section length [m]
+- Subcomponents: List of line sections and connectors in order from end A to end B
+    The values in each subcomponent type vary depending on if it is a section or connector. For sections:
+		- type : material property dictionary
+			- d_nom, d_vol : diameter (nominal and volume-equivalent) [m]
+			- material
+			- cost [USD]
+			- m : linear mass [g/m]
+			- w : weight [N/m]
+			- MBL : minimum breaking load [N]
+			- EA : stiffness coefficient [N]
+		- L : Line section length [m]
+	For connectors:
+	    - m : mass [kg]
+		- v : volume [kg/m^3]
+		- CdA 
 
-The Mooring object contains subcomponent objects that represent each component of the full mooring line. Line segments are Section objects, while connectors between segments and at the ends of the lines are Connector objects. These segments alternate.
+The Mooring object contains subcomponent objects that represent each component of the full mooring line. Line segments are Section objects, while connectors between segments and at the ends of the lines are Connector objects. These segments alternate, and are listed in the subcomponents section of the design dictionary in order from end A to end B. If there are parallel sections, such as in the case of a bridle, the parallel sections are described with nested lists.
 
 ## Mooring Properties
 - dd
@@ -55,13 +60,15 @@ The Mooring object contains subcomponent objects that represent each component o
 - rA : end A absolute coordinates
 - rB : end B absolute coordinates
 - heading : compass heading from B to A
+- ss : MoorPy subsystem representation of this Mooring, pristine
+- ss_mod : modified MoorPy subsystem of thie Mooring, could have marine growth etc
+- span : 2D (x-y) distance from fairlead to anchor or fairlead to fairlead. If bridles, the distance is calculated from the midpoint of all bridle fairlead points
 - adjuster : custom function that can adjust mooring
 - shared : int for anchored line (0), shared line (1) or half of a shared line (2)
 - symmetric : boolean for if the mooring line is symmetric shared line
 - rho : water density
 - g : acceleration due to gravity
 - envelopes : 2D motion envelopes, buffers, etc.
-- loads : dictionary of loads on the mooring line
 - reliability : dictionary of reliability information on the line
 - cost : dictionary of line costs
 - failure_probability : dictionary of failure probabilities
@@ -88,7 +95,7 @@ Set the position of an end of the mooring
 Finds the cost based on the MoorPy subsystem cost estimates
 
 ### updateTensions
-Gets tensions from subsystem and updates the max tensions dictionary if it is larger than a previous tension
+Gets tensions from subsystem and updates the max tensions dictionaries of each Section object if it is larger than a previous tension
 
 ### createSubsystem
 
@@ -123,7 +130,7 @@ the following details:
 	- volume 
 	- CdA
 
-The connector class also contains an xyz location of the connector, and a connector object in MoorPy.
+The connector class also contains an xyz location of the connector, and a connector object in MoorPy (mpConn).
 
 ## Connector methods
 
@@ -135,7 +142,11 @@ Create a MoorPy connector object in a MoorPy system. Mass, volume, and CdA are a
 
 The Section class provides a data structure for the mooring line section material and length. The Section class inherits from dict and Edge.
 
-The line material properties (linear mass, material, MBL, Cd, etc) are stored in the type dictionary of the Section class.
+The line material properties (linear mass, material, MBL, Cd, etc) are stored in the type dictionary of the Section class. If a moorpy system is developed, the the line object representing this section is listed in the mpLine parameter. Loads are stored in the loads dictionary, and safety factors are stored in the safety_factors dictionary property.
+
+### Section methods
+- makeMoorPyLine
+Create a moorpy line object in a moorpy system
 
 [Back to Top](#moorings-sections-and-connectors)
 

famodel/mooring/connector.py

@@ -44,6 +44,7 @@ def __init__(self,id, r=[0,0,0], **kwargs):
         # cost dictionary
         self.cost = {}
 
+        
         self.getProps()
 
 
@@ -149,6 +150,12 @@ def __init__(self,id, **kwargs):
 
         # MoorPy Line object for the section
         self.mpLine = None
+        
+        # dictionary of loads on section
+        self.loads = {}
+        
+        # dictionary of safety factors
+        self.safety_factors = {}
 
 
     def makeMoorPyLine(self, ms):

famodel/mooring/mooring.py

@@ -274,7 +274,7 @@ def reposition(self, r_center=None, heading=None, project=None,
                 self.heading = heading
             else:
                 self.heading = np.degrees(heading)
-        #breakpoint()
+
         phi = np.radians(90-self.heading) # heading in x-y radian convention [rad] (CONVERTS FROM COMPASS HEADINGS!)
         # heading 2D unit vector
         u = np.array([np.cos(phi), np.sin(phi)])
@@ -450,21 +450,20 @@ def getCost(self,from_ss=True):
         # sum up the costs in the dictionary and return
         return sum(self.cost.values())
 
-    def updateTensions(self):
+    def updateTensions(self, DAF=1):
         ''' Gets tensions from subsystem and updates the max tensions dictionary if it is larger than a previous tension
         '''
-        if not 'TAmax' in self.loads:
-            self.loads['TAmax'] = 0
-        if not 'TBmax' in self.loads:
-            self.loads['TBmax'] = 0
-        # get anchor tensions
-        if abs(self.ss.TA) > self.loads['TAmax']:
-            self.loads['TAmax'] = deepcopy(self.ss.TA)
-        # get TB tensions
-        if abs(self.ss.TB) > self.loads['TBmax']:
-            self.loads['TBmax'] = deepcopy(self.ss.TB)
+        Ts = []
+        # get tensions for each section
+        for sec in self.sections():
+            if not 'Tmax' in sec.loads:
+                sec.loads['Tmax'] = 0
+            Tmax = max([abs(sec.mpLine.TA), abs(sec.mpLine.TB)])
+            if Tmax*DAF > sec.loads['Tmax']:
+                sec.loads['Tmax'] = deepcopy(Tmax)*DAF
+            Ts.append(sec.loads['Tmax'])
 
-        return(self.loads['TAmax'],self.loads['TBmax'])
+        return max(Ts)
 
 
     def createSubsystem(self, case=0, pristine=True, dd=None, ms=None):
@@ -528,6 +527,11 @@ def createSubsystem(self, case=0, pristine=True, dd=None, ms=None):
             ss.setEndPosition(self.rA,endB=0)
             ss.setEndPosition(self.rB,endB=1)
 
+            for i,sec in enumerate(self.sections(dd)):
+                sec.mpLine = ss.lineList[i]
+            for i,con in enumerate(self.connectors(dd)):
+                con.mpConn = ss.pointList[i]
+            
             # add in connector info to subsystem points
             if case == 0: # has an anchor - need to ignore connection for first point because anchor is a point itself so can't have a point attached to a point
                 startNum = 1
@@ -609,7 +613,6 @@ def positionSubcomponents(self):
             elif isinstance(item, Node) and i > 0 and i < len(self.subcomponents)-1:
                 r = self.rA + (self.rB-self.rA)*Lsum[j-1]/Lsum[-1]
                 item.setPosition(r)
-                print(f'Set position of subcom {i} to {r[0]:5.0f}, {r[1]:5.0f}, {r[2]:5.0f}')
 
 
 
@@ -653,9 +656,6 @@ def positionSubcomponents(self):
 
                     # --- Do the positioning ---
                     Lsum = np.cumsum(np.array(L))
-                    print(f'parallel string ends A and B are at')
-                    print(f'{rA[0]:5.0f}, {rA[1]:5.0f}, {rA[2]:5.0f}')
-                    print(f'{rB[0]:5.0f}, {rB[1]:5.0f}, {rB[2]:5.0f}')
 
                     for subitem in parallel:
                         if isinstance(subitem, Edge):
@@ -666,11 +666,9 @@ def positionSubcomponents(self):
                             if j > 0 and j < n_serial_nodes-1:
                                 r = rA + (rB-rA)*Lsum[j]/Lsum[-1]
                                 item.setPosition(r)
-                                print(f'Set position of Node {j} to {r[0]:5.0f}, {r[1]:5.0f}, {r[2]:5.0f}')
                             else:
                                 print('end of parallel')
                                 breakpoint()
-                                print('yep')
 
     def mirror(self,create_subsystem=True):
         ''' Mirrors a half design dictionary. Useful for symmetrical shared mooring lines where 
@@ -1065,9 +1063,9 @@ def addMarineGrowth(self, mgDict, project=None, idx=None):
         nd1 = deepcopy(self.dd)
         nd1['subcomponents'] = [None]*(len(nd)*2+1)
         for i in range(len(nd)):
-            nd1['subcomponents'][2*i] = connList[i]
-            nd1['subcomponents'][2*i+1] = nd[i]
-        nd1['subcomponents'][2*i+2] = connList[i+1]
+            nd1['subcomponents'][2*i] = Connector('C'+str(i),**connList[i])
+            nd1['subcomponents'][2*i+1] = Section('S'+str(i),**nd[i])
+        nd1['subcomponents'][2*i+2] = Connector('C'+str(i),**connList[i+1])
 
         # call createSubsystem() to make moorpy subsystem with marine growth
         if self.shared:
@@ -1358,6 +1356,14 @@ def sections(self, dd=None):
             for sub in dd['subcomponents']:
                 if 'L' in sub:                    
                     secs.append(sub)
+                elif isinstance(sub, list):
+                    for subsub in sub:
+                        if isinstance(subsub, list):
+                            for sss in subsub:
+                                if 'L' in sss:
+                                    secs.append(sss)
+                        elif 'L' in sss:
+                            secs.append(subsub)
         else:
             for i in self.i_sec:
                 secs.append(self.getSubcomponent(i))
@@ -1372,8 +1378,16 @@ def connectors(self, dd=None):
         # allow option to input dict of subcomponents and pull sections from that
         if dd:
             for sub in dd['subcomponents']:
-                if not 'L' in sub:                    
+                if not 'L' in sub and isinstance(sub, dict):                    
                     conns.append(sub)
+                elif isinstance(sub, list):
+                    for subsub in sub:
+                        if isinstance(subsub, list):
+                            for sss in subsub:
+                                if not 'L' in sss and isinstance(sss, dict):
+                                    conns.append(sss)
+                        elif not 'L' in sss and isinstance(sss, dict):
+                            conns.append(subsub)
         else:
             for i in self.i_con:
                 conns.append(self.getSubcomponent(i))