Resolved conflicts merging douar_sediment

src/BallGeometry.f90

@@ -221,3 +221,4 @@
 
       return
       end
+

src/erosion.f90

@@ -257,9 +257,15 @@ if (length_scale.gt.0.d0) then
    deallocate (hdouarp)
 
 else ! perfect erosion
+!if (iproc.eq.0) write(*,*) 'zerosion: ', zerosion
 
    do i=1,surface%nsurface
-     if (surface%z(i).gt.zerosion) surface%z(i)=zerosion
+!     if (iproc.eq.0) write(*,*) 'Surface height under consideration: ', surface%z(i)
+      if (surface%z(i).gt.zerosion) then
+!        if (iproc.eq.0) write(*,*) 'Elevation before adjustment: ', surface%z(i)
+        surface%z(i)=zerosion
+!        if (iproc.eq.0) write(*,*) 'Elevation after adjustment: ', surface%z(i)
+     endif
    enddo
 
 endif