Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Removed some old code
  • Loading branch information
daminton committed Apr 2, 2020
1 parent 6783678 commit c4d37d4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
12 changes: 11 additions & 1 deletion src/crater/crater_realistic_topography.f90
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ subroutine complex_terrace(user,surf,crater,rn,deltaMtot)
real(DP),intent(inout) :: deltaMtot

! Internal variables
real(DP) :: newdem,elchange,rad,xbar,ybar,r,flr
real(DP) :: newdem,elchange,rad,xbar,ybar,r,flr,hprof,tprof
integer(I4B) :: xpi,ypi,i,j,inc,maxhits

! Topographic noise parameters
Expand Down Expand Up @@ -516,6 +516,16 @@ subroutine complex_terrace(user,surf,crater,rn,deltaMtot)
xynoise * ybar + terrace_num * offset * rn(2))* znoise

noise = sqrt(sqrt(dnoise**2))

!TODO: USE SCALLOPS TO MAKE TERRACES
!if (r >= (flr - 1._DP)terrace_num / terracefac) then
!hprof = crater%ejrim * r**(-3) + crater%melev
!tprof = 0.5_DP * crater%ejrim + crater%melev
!else
!hprof = crater%ejrim * (2.0_DP - r)**(-2) + crater%melev
!tprof = 0.5_DP * crater%ejrim + crater%melev
!end if

newdem = max(newdem + noise,crater%melev - crater%floordepth)
end if
elchange = newdem - surf(xpi,ypi)%dem
Expand Down
3 changes: 0 additions & 3 deletions src/crater/crater_slope_collapse.f90
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ subroutine crater_slope_collapse(user,surf,crater,domain,critical,deltaMtot)
logical :: failflag
character(len=MESSAGESIZE) :: message ! message for the progress bar

! testing
!character(STRMAX) :: filename
!integer(I4B) :: ioerr

! Executable Code

Expand Down

0 comments on commit c4d37d4

Please sign in to comment.