Merge remote-tracking branch 'origin/main' into new_base

Author: lsirkis

famodel/helpers.py

@@ -1178,7 +1178,7 @@ def adjustMooring(mooring, method = 'horizontal', r=[0,0,0], project=None, targe
         mooring.z_anch = mooring.dd['zAnchor']
         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
+        mooring.setEndPosition(r_anch, 'a', sink=True)  # set the anchor position
 
         #move anchor attachments
         for i,att in enumerate(mooring.attached_to):
@@ -1222,7 +1222,6 @@ def eval_func(X, args):
         mooring.span = span
 
     elif method == 'horizontal':
-        
         def func_TH_L(X, args):
             '''Apply specified section L, return the horizontal pretension error.'''
             ss.lineList[i_line].setL(X[0])

famodel/project.py

@@ -2222,7 +2222,8 @@ def plot2d(self, ax=None, plot_seabed=True,plot_bathymetry=True, plot_boundary=T
                 # >>>> TODO: Update the above to add optional inputs for bounds (vmin/vmax) on contour plot colors for bathymetry <<<<
 
                 if not bare:  # Add colorbar with label
-                    cbar = plt.colorbar(contourf, ax=ax, fraction=0.04, label='Water Depth (m)')
+                    import matplotlib.ticker as tkr
+                    cbar = plt.colorbar(contourf, ax=ax, fraction=0.04, label='Water Depth (m)', format=tkr.FormatStrFormatter('%.0f'))
         # if plot_seabed:
         #     if len(self.soil_x) > 1 and len(self.soil_y) > 1:
         #         sX, sY = np.meshgrid(self.soil_x, self.soil_y)
@@ -4805,30 +4806,59 @@ def extractFarmInfo(self, cmax=5, fmax=10/6, Cmeander=1.9):
 
         return wts, yaw_init  
 
-    def FFarmCompatibleMDOutput(self, filename, unrotateTurbines=True, renameBody=True, removeBody=True, MDoptionsDict={}, bathymetryFile=None):
+    def FFarmCompatibleMDOutput(self, filename, MDoptionsDict=None, **kwargs):
         '''
         Function to create FFarm-compatible MoorDyn input file:
 
         Parameters
         ----------
         filename : str
             Name of the MoorDyn output file (.dat)
-        unrotateTurbines: bool, optional
-            A flag to unrotate turbine (body) objects when passing it to MoorPy unload function [FFarm takes fairlead points in the local-unrotated reference frame]
-        renameBody: bool, optional
-            A flag to rename `Body` objects in the output MD file into `Turbine` to be compatible with FFarm. 
-        removeBody: boo., optional
-            A flag to remove 'Body' objects in the Bodies list in the output MD file to be compatible with FFarm.
-        MDoptionsDict: dictionary, optional
-            MoorDyn Options. If not given, default options are considered.            
-        '''          
-        from moorpy.helpers import subsystem2Line    
+        MDoptionsDict: dict, optional
+            MoorDyn Options. If not given, default options are considered.
+        **kwargs : optional
+            unrotateTurbines : bool
+                A flag to unrotate turbine (body) objects when passing it to MoorPy unload function 
+                [FFarm takes fairlead points in the local-unrotated reference frame]
+            renameBody : bool
+                A flag to rename `Body` objects in the output MD file into `Turbine` to be compatible with FFarm.
+            removeBody : bool
+                A flag to remove 'Body' objects in the Bodies list in the output MD file to be compatible with FFarm.
+            outputList : dict
+                Output options for MoorDyn.
+            bathymetryFile : str
+                Path to bathymetry file.
+            flag : str
+                Extra flag to append to MD entries.
+        '''
+
+        # --- Default values ---
+        defaults = {
+            "unrotateTurbines": True,
+            "renameBody": True,
+            "removeBody": True,
+            "outputList": [],
+            "bathymetryFile": None,
+            "flag": "-"
+        }
+
+        # Merge defaults with kwargs
+        opts = {**defaults, **kwargs}
+
+        # Assign variables for convenience
+        unrotateTurbines = opts["unrotateTurbines"]
+        renameBody       = opts["renameBody"]
+        removeBody       = opts["removeBody"]
+        outputList       = opts["outputList"]
+        bathymetryFile   = opts["bathymetryFile"]
+        flag             = opts["flag"]
+
+        if MDoptionsDict is None:
+            MDoptionsDict = {}       
+        from moorpy.helpers import ss2lines    
 
         # convert SS to lines
-        ms_temp = deepcopy(self.ms)  # copy to avoid affecting self.ms
-        lineCount = len(ms_temp.lineList)
-        for _ in range(lineCount):
-            subsystem2Line(ms_temp, 0)
+        ms_temp = ss2lines(self.ms)
 
         # Unrotate turbines if needed
         if unrotateTurbines:
@@ -4839,7 +4869,18 @@ def FFarmCompatibleMDOutput(self, filename, unrotateTurbines=True, renameBody=Tr
         else:
             phi = None
 
-        ms_temp.unload(fileName=filename, phi=phi, MDoptionsDict=MDoptionsDict)
+        # Setup nNodes of lines manually <<< TODO: Need to figure out a more automatic way of signing those numbers
+        for line in ms_temp.lineList:
+            if 0 < line.L < 20:
+                line.nNodes = 3
+            elif 20 <= line.L < 100:
+                line.nNodes = 6
+            elif 100 <= line.L < 700:
+                line.nNodes = 11
+            elif line.L >= 700:
+                line.nNodes = 16
+
+        ms_temp.unload(fileName=filename, phi=phi, MDoptionsDict=MDoptionsDict, outputList=outputList, flag=flag)
 
         # rename Body to Turbine if needed
         if renameBody: