Skip to content
Snippets Groups Projects
Commit a45b7039 authored by Dave Whipp's avatar Dave Whipp
Browse files

Resolved conflicts merging douar_sediment

parents 544ce7d4 d960748b
No related branches found
No related tags found
No related merge requests found
......@@ -221,3 +221,4 @@
return
end
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment