cable route adjustment add direction

Author: lsirkis

famodel/helpers.py

@@ -223,7 +223,7 @@ def check_headings(m_headings,c_heading,rad_buff):
         return([])
 
 
-def head_adjust(att,heading,rad_buff=np.radians(30),endA_dir=1):
+def head_adjust(att,heading,rad_buff=np.radians(30),endA_dir=1, adj_dir=1):
     '''
     function to adjust heading of cable based on angle buffer from mooring lines
 
@@ -264,11 +264,12 @@ def head_adjust(att,heading,rad_buff=np.radians(30),endA_dir=1):
         #attheadings.extend(atmh)
         attheadings.extend(np.pi/2 - atmh) # convert to 0 rad at East going CCW
         flipheads = True
+        
     interfere_h = check_headings(attheadings,headnew,rad_buff)
     # if the headings interfere, adjust them by angle buffer
     for mhead in interfere_h:
         ang_diff_dir = np.sign(headnew - mhead) if headnew != mhead else 1
-        headnew = mhead - rad_buff*endA_dir*ang_diff_dir #headnew + np.sign(ang_diff)*(rad_buff - abs(ang_diff))*endA_dir
+        headnew = mhead - adj_dir*rad_buff*endA_dir*ang_diff_dir #headnew + np.sign(ang_diff)*(rad_buff - abs(ang_diff))*endA_dir
         interfere_hi = check_headings(attheadings,headnew,rad_buff)
         for i in interfere_hi:
             # try rotating other way
@@ -282,6 +283,7 @@ def head_adjust(att,heading,rad_buff=np.radians(30),endA_dir=1):
                 newbuff = rad_buff/2
                 headnew = mhead + newbuff*endA_dir*ang_diff_dir
                 return(headnew)
+
     return(headnew)
 
 def getCableDD(dd,selected_cable,cableConfig,cableType_def,connVal):

famodel/project.py

@@ -1900,11 +1900,24 @@ def addCablesConnections(self,connDict,cableType_def='dynamic_cable_66',oss=Fals
                 # consider mooring headings from both ends if close enough
                 pfsp = np.linalg.norm(attA.r-attB.r) 
                 if consider_alternate_side and pfsp-2*attA.rFair < msp+dc0s:
-                    headingA = head_adjust([attA,attB],headingA,rad_buff=rad_buff)
-                    headingB = head_adjust([attB,attA],headingB,rad_buff=rad_buff,endA_dir=-1)
+                    headingA = head_adjust([attA,attB],
+                                           headingA,
+                                           rad_buff=rad_buff,
+                                           adj_dir=adj_dir)
+                    headingB = head_adjust([attB,attA],
+                                           headingB,
+                                           rad_buff=rad_buff,
+                                           endA_dir=-1,
+                                           adj_dir=adj_dir)
                 else:
-                    headingA = head_adjust([attA],headingA,rad_buff=rad_buff)
-                    headingB = head_adjust([attB],headingB,rad_buff=rad_buff)
+                    headingA = head_adjust([attA],
+                                           headingA,
+                                           rad_buff=rad_buff,
+                                           adj_dir=adj_dir)
+                    headingB = head_adjust([attB],
+                                           headingB,
+                                           rad_buff=rad_buff,
+                                           adj_dir=adj_dir)
 
             heads = [headingA,headingB]
             # reposition cable