Merge branch 'main' into new_base

Author: lsirkis

famodel/mooring/mooring.py

@@ -1092,10 +1092,11 @@ def addCorrosion(self,corrosion_mm=10):
         '''
         for i in self.i_sec:
             sec = self.getSubcomponent[i]
-            if sec['material']=='chain':
-                MBL_cor = sec['MBL']*( (sec['d_nom']-(corrosion_mm/1000))/sec['d_nom'] )**2  # corroded MBL
+            if sec['type']['material']=='chain':
+                MBL_cor = sec['type']['MBL']*( (sec['type']['d_nom']-(corrosion_mm/1000))/sec['type']['d_nom'] )**2  # corroded MBL
             else:
-                MBL_cor = sec['MBL']
+                MBL_cor = sec['type']['MBL']
+            sec['type']['MBL'] = MBL_cor
 
 
     def getEnvelope(self,ang_spacing=45,SFs=True):

famodel/project.py

@@ -2193,6 +2193,8 @@ def plot2d(self, ax=None, plot_seabed=True,plot_bathymetry=True, plot_boundary=T
                 X, Y = np.meshgrid(self.grid_x, self.grid_y)
 
                 contourf = ax.contourf(X, Y, self.grid_depth, num_levels, cmap='Blues', vmin=np.min(self.grid_depth), vmax=np.max(self.grid_depth))
+                #contourf = ax.contourf(X, Y, self.grid_depth, num_levels, cmap='Blues', vmin=500, vmax=1300)
+                # >>>> 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)')