updates to mooring adjustments

-- bug fixes and updates to mooring adjustment helpers and mooring.reposition
	-- add display option in mooring adjustment helper func
	-- calculate unit vec from span and heading (since rA isn't updated from new position yet)
	-- calculate slope from fairlead depth to water depth
	-- updateAnchor location bug fix
	-- small bug fix in anchor.py getCost function

Author: lsirkis

famodel/anchors/anchor.py

@@ -711,7 +711,7 @@ def getCost(self,costDict='default'):
         keyFail = True
         # check if mass info is available
         if not self.mass:
-            if 'soil_properties' in self.dd:               
+            if self.soilProps:               
                 # need mass - call capacity functions
                 self.getAnchorCapacity(plot=False)
             else:

famodel/helpers.py

@@ -923,15 +923,21 @@ def configureAdjuster(mooring, adjuster=None, method='horizontal',
         targetdd = deepcopy(mooring.dd)
         if project == None:
             raise Exception('Project class instance needs to be provided to determine target')
-        targetdd['zAnchor'] = project.depth
-        mooring.createSubsystem()
+        targetdd['zAnchor'] = -project.depth
+        if not mooring.shared:
+            mooring.rA[2] = -project.depth
+        mooring.createSubsystem(dd=targetdd)
 
         if method == 'horizontal':
             mooring.target = np.linalg.norm(mooring.ss.fB_L[:2])
         elif method =='pretension':
             mooring.target = np.linalg.norm(mooring.ss.fB_L)
         else:
             raise Exception('Invalid adjustment method. Must be pretension or horizontal')
+        # return mooring depth to accurate val
+        if not mooring.shared:
+            depth = project.getDepthAtLocation(mooring.rA[0], mooring.rA[1])
+            mooring.rA[2] = -depth
     else:
         mooring.target = target
 
@@ -941,26 +947,25 @@ def configureAdjuster(mooring, adjuster=None, method='horizontal',
 
         # check if method is 'pretension' then save slope
         if method == 'pretension':
-            
             if project == None:
                 raise Exception('Project class instance needs to be provided to determine slope')
 
             if mooring.dd:
 
                 #calculate mooring slope using base depth
                 #**** this assumes that the mooring system is designed for the base depth*****
-                mooring.slope = project.depth / mooring.dd['span']
+                mooring.slope = (project.depth+mooring.rB[2]) / mooring.dd['span']
 
             else:   
                 if span:
-                    mooring.slope = project.depth / span
+                    mooring.slope = (project.depth+mooring.rB[2]) / span
                 else:
                     raise Exception('Span required to perform adjustment')
 
     return(mooring)
 
 def adjustMooring(mooring, method = 'horizontal', r=[0,0,0], project=None, target=1e6,
-                       i_line = 0, slope = 0.58 ):
+                       i_line = 0, slope = 0.58, display=False ):
     '''Custom function to adjust a mooring, called by
     Mooring.adjust. Fairlead point should have already
     been adjusted.
@@ -992,11 +997,12 @@ def adjustMooring(mooring, method = 'horizontal', r=[0,0,0], project=None, targe
         fairlead_rad = mooring.rad_fair
         fairlead_z = mooring.z_fair
 
-        fairlead = ss.rB # fairlead point
+        fairlead = ss.rB # fairlead point (already updated)
 
         #unit direction vector towards ORIGNAL anchor in x,y plane, and inputted slope as the z component
-        xydist = np.linalg.norm([ss.rA[0] - ss.rB[0],ss.rA[1] - ss.rB[1]])
-        direction = np.array([(ss.rA[0] - ss.rB[0])/xydist, (ss.rA[1] - ss.rB[1])/xydist, -slope])
+        xydist = mooring.span # np.linalg.norm([ss.rA[0] - ss.rB[0],ss.rA[1] - ss.rB[1]])
+        phi = np.pi/2 - np.radians(mooring.heading)
+        direction = np.array([np.cos(phi), np.sin(phi), -slope]) # np.array([(ss.rA[0] - ss.rB[0])/xydist, (ss.rA[1] - ss.rB[1])/xydist, -slope])
 
         #use project class to find new anchor interesection point, maintaining original line heading
         if project:
@@ -1005,10 +1011,11 @@ def adjustMooring(mooring, method = 'horizontal', r=[0,0,0], project=None, targe
             print('Project must be inputted for the pretension method')
             return 
         #update mooring properties
-        print('R_anch new ', r_anch)
+        if display:
+            print('R_anch new ', r_anch)
         mooring.dd['zAnchor'] = r_anch[2]
         mooring.z_anch = mooring.dd['zAnchor']
-        mooring.rad_anch = np.linalg.norm(r_anch-r)
+        mooring.rad_anch = np.linalg.norm(r_anch[:2]-r[:2])
         span = mooring.rad_anch - fairlead_rad
         mooring.setEndPosition(r_anch, 'a')  # set the anchor position
 
@@ -1017,12 +1024,17 @@ def adjustMooring(mooring, method = 'horizontal', r=[0,0,0], project=None, targe
             iend = mooring.rA if i == 0 else mooring.rB
             if type(att).__name__ in 'Anchor':
                 # this is an anchor, move anchor location
-                att.r = iend
+                if project:
+                    project.updateAnchor(att) 
+                else: 
+                    att.r = iend
                 if att.mpAnchor:
                     att.mpAnchor.r = att.r
 
-        # Estimate the correct line length to start with
-        ss.lineList[i_line].setL(np.linalg.norm(mooring.rB - mooring.rA))
+        # Estimate the correct line length to start with based on % of total length
+        L_tot = sum([line.L for line in ss.lineList])
+        initial_L_ratio = ss.lineList[i_line].L/L_tot
+        ss.lineList[i_line].setL(np.linalg.norm(mooring.rB - mooring.rA)*initial_L_ratio)
 
         # Next we could adjust the line length/tension (if there's a subsystem)
 
@@ -1034,9 +1046,14 @@ def eval_func(X, args):
 
         # run dsolve2 solver to solve for the line length that matches the initial tension
         X0 = [ss.lineList[i_line].L]  # start with the current section length
-        L_final, T_final, _ = dsolve2(eval_func, X0, Ytarget=[target], 
-                              Xmin=[1], Xmax=[1.1*np.linalg.norm(ss.rB-ss.rA)],
-                              dX_last=[1], tol=[0.01], maxIter=50, stepfac=4)
+        if display:
+            L_final, T_final, _ = dsolve2(eval_func, X0, Ytarget=[target], 
+                                  Xmin=[1], Xmax=[1.1*np.linalg.norm(ss.rB-ss.rA)],
+                                  dX_last=[1], tol=[0.01], maxIter=50, stepfac=4, display=5)
+        else:
+            L_final, T_final, _ = dsolve2(eval_func, X0, Ytarget=[target], 
+                                  Xmin=[1], Xmax=[1.1*np.linalg.norm(ss.rB-ss.rA)],
+                                  dX_last=[1], tol=[0.01], maxIter=50, stepfac=4)
         ss.lineList[i_line].L = L_final[0]
         mooring.dd['sections'][i_line]['L'] = L_final[0]
         mooring.dd['span'] = span
@@ -1055,7 +1072,16 @@ def func_TH_L(X, args):
             return np.array([Fx - target]), dict(status=1) , False
 
         X0 = [ss.lineList[i_line].L]
-        x, y, info = dsolve2(func_TH_L, X0,  tol=[0.01], args=dict(direction='horizontal'), Xmin=[10], Xmax=[2000], dX_last=[10], maxIter=50, stepfac=4, display = 5)
+        if display:
+            x, y, info = dsolve2(func_TH_L, X0,  tol=[0.01], 
+                                 args=dict(direction='horizontal'), 
+                                 Xmin=[10], Xmax=[2000], dX_last=[10], 
+                                 maxIter=50, stepfac=4, display = 5)
+        else:
+            x, y, info = dsolve2(func_TH_L, X0,  tol=[0.01], 
+                                 args=dict(direction='horizontal'), 
+                                 Xmin=[10], Xmax=[2000], dX_last=[10], 
+                                 maxIter=50, stepfac=4)
 
     else:
         print('Invalid method. Must be either pretension or horizontal')

famodel/mooring/mooring.py

@@ -190,7 +190,7 @@ def setSectionType(self, lineType, i):
 
 
     def reposition(self, r_center=None, heading=None, project=None, 
-                   degrees=False, rad_fair=[], z_fair=[], **kwargs):
+                   degrees=False, rad_fair=[], z_fair=[], adjust=True, **kwargs):
         '''Adjusts mooring position based on changed platform location or
         heading. It can call a custom "adjuster" function if one is
         provided. Otherwise it will just update the end positions.
@@ -251,7 +251,7 @@ def reposition(self, r_center=None, heading=None, project=None,
 
         # Run custom function to update the mooring design (and anchor position)
         # this would also szie the anchor maybe?
-        if self.adjuster:
+        if self.adjuster and adjust:
 
             #if i_line is not defined, assumed segment 0 will be adjusted
             if not hasattr(self,'i_line'):
@@ -293,8 +293,11 @@ def reposition(self, r_center=None, heading=None, project=None,
         for i,att in enumerate(self.attached_to):
             iend = self.rA if i == 0 else self.rB
             if type(att).__name__ in 'Anchor':
-                # this is an anchor, move anchor location
-                att.r = iend
+                # this is an anchor, move anchor location & get soil (if possible)
+                if project:
+                    project.updateAnchor(att) 
+                else: 
+                    att.r = iend
                 if att.mpAnchor:
                     att.mpAnchor.r = att.r
 

famodel/project.py

@@ -867,15 +867,15 @@ def loadSite(self, site):
                     for i in range(len(xy)):
                         self.boundary[i,0] = float(xy[i][0])
                         self.boundary[i,1] = float(xy[i][1])
-        
+ 
         if 'seabed' in site and site['seabed']:
             # if there's a file listed in the seabed dictionary
             if 'file' in site['seabed'] and site['seabed']['file']:
                 # without reading the file to tell whether it has soil property information listed, check to see if soil property information is given
                 if 'soil_types' in site['seabed'] and site['seabed']['soil_types']:     # if the yaml does have soil property information
-                    self.loadSoil(filename=site['seabed']['file'], yaml=site['seabed'])
+                    self.loadSoil(filename=str(site['seabed']['file']), yaml=site['seabed'])
                 else:       # if the yaml doesn't have soil property information, read in just the filename to get all the information out of that
-                    self.loadSoil(filename=site['seabed']['file'])
+                    self.loadSoil(filename=str(site['seabed']['file']))
             # if there's no file listed in the seabed dictionary, load in just the yaml information (assuming the ['x', 'y', and 'type_array'] information are there)
             else:
                 self.loadSoil(yaml=site['seabed'])
@@ -1225,6 +1225,7 @@ def getSoilAtLocation(self, x, y):
 
     # # ----- Anchor 
     def updateAnchor(self,anch='all',update_loc=True):
+        #breakpoint()
         if anch == 'all':
             anchList = [anch for anch in self.anchorList.values()]
         elif isinstance(anch, Anchor):
@@ -1234,11 +1235,11 @@ def updateAnchor(self,anch='all',update_loc=True):
             if update_loc:
                 att = next(iter(anchor.attachments.values()), None)
                 if att['end'] in ['a', 'A', 0]:
-                    x,y = att['obj'].rA[:2]
+                    anchor.r = att['obj'].rA
                 else:
-                    x,y = att['obj'].rB[:2]
-            else:
-                x,y = anchor.r[:2]
+                    anchor.r = att['obj'].rB
+
+            x,y = anchor.r[:2]
 
             anchor.r[2] = -self.getDepthAtLocation(x,y) # update depth
             for att in anchor.attachments.values():
@@ -1594,7 +1595,8 @@ def addMooring(self, id=None, endA=None, endB=None, heading=0, dd={},
             if len(r_center)>0:
                 if len(r_center)==1:
                     r_center = r_center[0]
-                mooring.reposition(r_center=r_center, heading=heading, project=self)
+                mooring.reposition(r_center=r_center, heading=heading, 
+                                   adjust=False, project=self)
                 # adjust anchor z location and rA based on location of anchor
                 zAnew, nAngle = self.getDepthAtLocation(mooring.rA[0], 
                                                         mooring.rA[1],