small bug fixes for MBL and plot2d edits

-small fixes to check if MBL is in dictionary before loading so that you can still load mooring types without an MBL
-plot2d add setting for whether to show legend
-get legend handles from ax instead of plt.gca()

Author: erickaloz

famodel/helpers.py

@@ -795,7 +795,8 @@ 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 'MBL' in dd:
+            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:
@@ -862,7 +863,8 @@ 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'])
+            if 'MBL' in lt:
+                config[-1]['type']['MBL'] = float(lt['MBL'])
             # set line length
             config[-1]['L'] = lc['length']
 

famodel/project.py

@@ -986,6 +986,7 @@ def loadSite(self, site, dir=''):
         self.rho_air = getFromDict(site['general'], 'rho_air', default=1.225)
         self.mu_air = getFromDict(site['general'], 'mu_air', default=1.81e-5)
 
+        
         # load bathymetry information, if provided
         if 'bathymetry' in site and site['bathymetry']:
             if 'file' in site['bathymetry'] and site['bathymetry']['file']: # make sure there was a file provided even if the key is there
@@ -2179,6 +2180,7 @@ def plot2d(self, ax=None, plot_seabed=False,draw_soil=False,plot_bathymetry=True
         depth_vmin = kwargs.get('depth_vmin', None)
         depth_vmax = kwargs.get('depth_vmax', None)
         bath_levels = kwargs.get('bath_levels', None)
+        show_legend = kwargs.get('show_legend', True)
 
 
         # if axes not passed in, make a new figure
@@ -2383,12 +2385,14 @@ def plot2d(self, ax=None, plot_seabed=False,draw_soil=False,plot_bathymetry=True
         if axis_equal:
             ax.set_aspect('equal',adjustable='box')
 
-        handles, labels = plt.gca().get_legend_handles_labels()
+        handles, labels = ax.get_legend_handles_labels()
         if plot_seabed:
             handles += soil_handles
             labels += [h.get_label() for h in soil_handles]
         by_label = dict(zip(labels, handles))  # Removing duplicate labels
-        ax.legend(by_label.values(), by_label.keys(),loc='upper center',bbox_to_anchor=(0.5, -0.1), fancybox=True, ncol=4)
+        
+        if show_legend:
+            ax.legend(by_label.values(), by_label.keys(),loc='upper center',bbox_to_anchor=(0.5, -0.1), fancybox=True, ncol=4)
         if save:
             plt.savefig('2dfarm.png', dpi=600, bbox_inches='tight')  # Adjust the dpi as needed