Removed code from main that is now included in the callback function

Author: ssheminway

aeolis/bed.py

@@ -227,82 +227,6 @@ def wet_supply(s, p):
             ix = s['TWL'] > (s['zb'])
             s['zb'][ix] += (s['zb0'][ix] - s['zb'][ix]) * Tbedreset
 
-    # if p['process_wet_supply']:
-
-    #     if p['method_wet_supply'] == 'vertical_beach_growth':
-    #         beach_inc = p['shoreline_change_rate']*math.cos((math.pi/2)-math.atan(p['beach_slope']))
-    #         vrate = (beach_inc*(1/365.25/24/3600))*p['dt'] #(m/timestep)
-    #         ny, nx = s['zb'].shape  
-
-    #         for iy in range(ny):
-    #             x_all = s['x'][iy,:]
-    #             zb_all = s['zb'][iy,:]               
-    #             xi =  (zb_all < p['dune_toe_elevation'])
-    #             beach_z = zb_all[xi]
-    #             b = beach_z[0] + vrate
-    #             x = x_all[xi] 
-    #             slope = p['beach_slope']
-    #             new_beach = slope*x + b 
-    #             s['zb'][iy,xi] = new_beach    
-
-    #     if p['method_wet_supply'] == 'constant_SCR_constant_tanB':
-
-    #         beach_inc = p['shoreline_change_rate']*math.cos((math.pi/2)-math.atan(p['beach_slope']))
-    #         vrate = (beach_inc/(365.25*24*3600))*p['dt'] #(m/timestep)
-    #         ny, nx = s['zb'].shape  
-
-    #         for iy in range(ny):
-
-    #             x_all = s['x'][iy,:]
-    #             zb_all = s['zb'][iy,:]
-
-    #             xi = zb_all < p['dune_toe_elevation']
-    #             beach_z = zb_all[xi]
-    #             x = x_all[xi]
-
-    #             xi3 = np.where(beach_z > p['zshoreline'])
-    #             xi3 = xi3[0][0]
-    #             b = beach_z[xi3] + vrate
-
-    #             new_temp_beach = p['beach_slope']*(x-x[xi3]) + b
-
-    #             xi2 = new_temp_beach <= np.min(zb_all)
-    #             new_temp_beach[xi2] = np.min(zb_all)
-
-    #             s['zb'][iy,xi]= new_temp_beach
-
-    #     if p['method_wet_supply'] == 'constant_SCR_variable_tanB':
-    #         beach_inc = p['shoreline_change_rate']*math.cos((math.pi/2)-math.atan(p['beach_slope']))
-    #         vrate = (beach_inc/(365.25*24*3600))*p['dt'] #(m/timestep)
-    #         hrate = (p['shoreline_change_rate']/(365.25*24*3600))*p['dt'] #(m/timestep)
-    #         ny, nx = s['zb'].shape        
-
-    #         for iy in range(ny):
-    #             x_all = s['x'][iy,:]
-    #             zb_all = s['zb'][iy,:]
-
-    #             xi = zb_all <= p['dune_toe_elevation']
-    #             beach_z = zb_all[xi]
-
-    #             x = x_all[xi]
-
-    #             xi3 = np.where(beach_z > p['zshoreline'])
-    #             xi3 = xi3[0][0]
-    #             beach_x = x-x[xi3]
-
-    #             xy1 = ((np.min(x[xi3])),np.min(beach_z[xi3]))
-    #             xy2 = (np.max(x), np.max(beach_z))
-
-    #             new_slope = (xy2[1]-xy1[1])/(xy2[0]-(xy1[0]))
-    #             b = np.min(beach_z[xi3]) + vrate
-    #             new_temp_beach = new_slope*(beach_x) + b
-
-    #             xi2 = new_temp_beach <= np.min(zb_all)
-    #             new_temp_beach[xi2] = np.min(zb_all)
-
-    #             xi4 = new_temp_beach > p['dune_toe_elevation']
-    #             new_temp_beach[xi4] = p['dune_toe_elevation']
-    #             s['zb'][iy,xi]= new_temp_beach
     return s
 
 

aeolis/vegetation.py

@@ -218,20 +218,7 @@ def grow (s, p): #DURAN 2006
 
     if p['process_tide']:
 
-        elev_dry = s['zb']>=s['TWL']
-
-        try:
-            if elev_dry.flat[0] and s['TWL'].flat[0] < p['veg_min_elevation']:
-                #exception if TWL is below bathymetry & no intersection 
-                limit = 0 
-            else:
-                limit = int(np.where(np.diff(elev_dry))[1][0]) # finds most seaward intersection of TWL and zb 
-            ix_flooded1 = (s['zb'][:,:limit] < s['TWL'][:,:limit]) # identifies flooded area before limit
-            rest = np.full((3, (len(s['TWL'][0])-limit)), False, dtype=bool) # creates a False array to fill in the rest of the profile 
-            ix_flooded = np.concatenate((ix_flooded1, rest), axis=1) # adds the arrays together 
-        except:
-            ix_flooded = (s['zb'] < s['TWL'])
-           
+        ix_flooded = (s['zb'] < s['TWL'])  
         s['rhoveg'][ix_flooded]     = 0. 
         s['hveg'][ix_flooded]       = 0.
         s['vegetated'][ix_flooded]  = False

docs/user/model.rst

@@ -753,7 +753,7 @@ be specified by the user, for example through the BMI interface.
 
 Beach evolution parameters
 ---------------
-The description of implementation of beach sediment supply function is based on :cite:`Heminway2025`:. 
+The description of implementation of beach sediment supply function is based on :cite:`Heminway2026`:. 
 
 Beach shape and size contributes to the overall sediment supply available 
 for aeolian sediment transport. AeoLiS includes numerous approaches to 
@@ -765,7 +765,7 @@ and avoid the need to couple model interfaces with external tools. For the
 purposes of this beach sediment supply function, the shoreline is defined as 
 the seaward boundary of the beach profile (default xshoreline and zshoreline 
 are 0 m; e.g., Figure 1e-f)) and shoreline change rate (SCR) is the rate of 
-change at the 0 m contour. Four specific methods, specified in the input file 
+change at the 0 m contour. Four specific methods, usable in a callback function and specified in the input file 
 as `method_sed_supply`, are implemented, as follows below:
 
 `wet_bed_reset`maintains stability of the bed by assuming any beach volume