addCablesConnections bug fix, helpers bug fix, connectors pointProps adjust

-- bug fix project.addCablesConnections for calculating cable headings to adjust to updated methods
-- helpers head_adjust adjust to keep headings in compass headings
-- connectors adjust cost function use of pointProps (bug fix)
-- add images for readmes
-- add some comments in cable.py

Author: lsirkis

famodel/cables/cable.py

@@ -139,11 +139,15 @@ 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:
+            # convert headings to unit circle
             headingA = np.pi/2 - self.subcomponents[0].headingA
             headingB = np.pi/2 - self.subcomponents[-1].headingB
         else:
+            # convert headings to unit circle
             headingA = np.pi/2 - headings[0]
+            self.subcomponents[0].headingA = headings[0]
             headingB = np.pi/2 - headings[1]
+            self.subcomponents[-1].headingB = headings[1]
 
         if not isinstance(self.subcomponents[0].attached_to[0], Jtube):
             if not rad_fair:

famodel/helpers.py

@@ -10,6 +10,7 @@
 import moorpy as mp
 from moorpy.helpers import loadPointProps, getPointProps
 import shapely as sh
+from famodel.turbine.turbine import Turbine
 
 
 def cart2pol(x, y):
@@ -232,7 +233,7 @@ def head_adjust(att,heading,rad_buff=np.radians(30),endA_dir=1):
     att : list
         list of objects to attach to. 1 object if only concerned about the attached object associated with that side
     heading : float
-        Cable heading at attachment to att in radians
+        Cable compass heading at attachment to att in radians
     rad_buff : float
         Buffer angle in radians
     endA_dir : float, optional
@@ -249,7 +250,7 @@ def head_adjust(att,heading,rad_buff=np.radians(30),endA_dir=1):
         headnew = np.pi*2 + heading
     else:
         headnew = heading
-    attheadings = []
+    attheadings = [] # complete list of mooring headings to avoid, from all platforms
     flipheads = False # whether to flip headings ( for if you are looking at mooring headings of platform on the other end)
     for at in att:
         mhs = np.radians([m.heading for m in at.getMoorings().values()])
@@ -260,10 +261,11 @@ def head_adjust(att,heading,rad_buff=np.radians(30),endA_dir=1):
                 if a>2*np.pi:
                     atmh[j] = a-2*np.pi
         else:
-            atmh = np.array(mhs) #at.mooring_headings + at.phi
+            atmh = np.array(mhs) #attached platform mooring headings array
         #attheadings.extend(atmh)
-        attheadings.extend(np.pi/2 - atmh) # convert to 0 rad at East going CCW
+        attheadings.extend(atmh) # keep in compass heading
         flipheads = True
+
     interfere_h = check_headings(attheadings,headnew,rad_buff)
     # if the headings interfere, adjust them by angle buffer
     for mhead in interfere_h:
@@ -1307,6 +1309,25 @@ def gothroughlist(dat):
     # return cleaned dictionary           
     return(info)
 
+'''
+def createRAFTDict(project):
+    # Create a RAFT dictionary from a project class to create RAFT model
+    rd = {'keys':['ID', 'turbineID', 'platformID', 'mooringID', 'x_location', 'y_location'],
+          'data':[]}
+    for pf in project.platformList.values():
+        for att in pf.attachments.values():
+            if isinstance(att['obj'],Turbine):
+                turb = att['obj']
+                break
+        rd.append(pf.id, turb.dd['type'], pf.dd['type'], 0, pf.r[0], pf.r[1])
+        rd['site'] = {'water_depth':project.depth,'rho_water':project.rho_water,'rho_air':project.rho_air,'mu_air':project.mu_air}
+        rd['site']['shearExp'] = .12
+        
+    for tt in project.turbineType
+
+    return rd
+'''
+
 def getFromDict(dict, key, shape=0, dtype=float, default=None, index=None):
     '''
     Function to streamline getting values from design dictionary from YAML file, including error checking.

famodel/images/fairleads_and_jtubes.png

@@ -100,8 +100,11 @@ def getProps(self):
                 if self['CdA']>0:
                     details['CdA'] = self['CdA']
                 if self.mpConn:
+                    # add point type to system and assign to point entity if mp connector point exists
                     pt = self.mpConn.sys.setPointType(design,**details)
+                    self.mpConn.entity = pt
                 else:
+                    # otherwise, jsut get the point properties dict and return
                     props = loadPointProps(None)
                     pt = getPointProps(design, Props=props, **details)
                 self.required_safety_factor = pt['FOS']
@@ -115,13 +118,21 @@ def getCost(self,update=True, fx=0.0, fz=0.0, peak_tension=None, MBL=None):
         '''Get cost of the connector from MoorPy pointProps.
         Wrapper for moorpy's getCost_and_MBL helper function'''
         if update:
-            if self.mpConn:
-                # use pointProps to update cost
-                try:
-                    self.getProps()
-                    self.cost['materials'], MBL, info = self.mpConn.getCost_and_MBL(fx=fx, fz=fz, peak_tension=peak_tension)
-                except:
-                    print('Warning: unable to find cost from MoorPy pointProps, cost dictionary not updated')
+            # use pointProps to update cost
+            try:
+                # get point properties from wrapper function
+                ptype = self.getProps()
+                if self.mpConn:
+                    point = self.mpConn
+                else:
+                    from moorpy import System
+                    ms = System() # create a blank moorpy system
+                    point = ms.addPoint(0, r=[0,0]) # add a dummy point
+                    point.entity = ptype # get the point properties and assign to point entity
+                # calculate cost with any given forces/tensions
+                self.cost['materials'], MBL, info = point.getCost_and_MBL(fx=fx, fz=fz, peak_tension=peak_tension)
+            except:
+                print('Warning: unable to find cost from MoorPy pointProps, cost dictionary not updated')
         # if update == False, just return existing costs
 
         return sum(self.cost.values())

famodel/images/parallel_sections.png

@@ -2026,12 +2026,11 @@ def addCablesConnections(self,connDict,cableType_def='dynamic_cable_66',oss=Fals
                         attB = pf
                         # update platform location
                         pf.r[:2] = connDict[i]['coordinates'][-1]
-
-            # get heading of cable from attached object coordinates 
-            headingA = np.radians(90) - np.arctan2((connDict[i]['coordinates'][-1][0]-connDict[i]['coordinates'][0][0]),
-                                                   (connDict[i]['coordinates'][-1][1]-connDict[i]['coordinates'][0][1]))
-            headingB = np.radians(90) - np.arctan2((connDict[i]['coordinates'][0][0]-connDict[i]['coordinates'][-1][0]),
-                                                   (connDict[i]['coordinates'][0][1]-connDict[i]['coordinates'][-1][1]))
+            
+            # get heading of cable from attached object coordinates (compass heading)
+            headingA = calc_heading(connDict[i]['coordinates'][-1],
+                                    connDict[i]['coordinates'][0])
+            headingB = headingA + np.pi
 
             # figure out approx. depth at location
             initial_depths = []
@@ -2127,8 +2126,8 @@ def addCablesConnections(self,connDict,cableType_def='dynamic_cable_66',oss=Fals
                             stat_cable = cab.subcomponents[ind+ind_of_stat]
                             # get new coordinate routing point
                             stat_cable_end = stat_cable.rA if ind==0 else stat_cable.rB
-                            coord = [stat_cable_end[0] + np.cos(heads[ii])*spandiff,
-                                        stat_cable_end[1] + np.sin(heads[ii])*spandiff]
+                            coord = [stat_cable_end[0] + np.cos(np.pi/2-heads[ii])*spandiff,
+                                        stat_cable_end[1] + np.sin(np.pi/2-heads[ii])*spandiff]
                             # append it to static cable object coordinates
                             coords.append(coord)
 
@@ -3202,6 +3201,7 @@ def getRAFT(self,RAFTDict,pristine=1):
             See RAFT documentation for requirements for each sub-dictionary
         '''
         print('Creating RAFT object')
+            
         # create RAFT model if necessary components exist
         if 'platforms' in RAFTDict or 'platform' in RAFTDict:
             # set up a dictionary with keys as the table names for each row (ease of use later)