From 0aea32b3c588ada14032c7962c18322cbf8a5736 Mon Sep 17 00:00:00 2001 From: David Minton Date: Fri, 23 Jul 2021 13:07:41 -0400 Subject: [PATCH] Checked out from main branch --- src/crater/crater_tally_observed.f90 | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/crater/crater_tally_observed.f90 b/src/crater/crater_tally_observed.f90 index 97acd465..af8211eb 100644 --- a/src/crater/crater_tally_observed.f90 +++ b/src/crater/crater_tally_observed.f90 @@ -88,7 +88,7 @@ subroutine crater_tally_observed(user,surf,domain,nkilled,onum,obsdist,obslist,o allocate(mlist(max(mnum,1))) - allocate(mposlist(2,max(mnum,1))) + allocate(mposlist(3,max(mnum,1))) allocate(mpxlist(2,max(mnum,1))) allocate(mlayerlist(max(mnum,1))) allocate(ind(max(mnum,1))) @@ -111,6 +111,7 @@ subroutine crater_tally_observed(user,surf,domain,nkilled,onum,obsdist,obslist,o ! Save the crater center coordinates mposlist(1,imnum) = surf(m,n)%xl(layer) mposlist(2,imnum) = surf(m,n)%yl(layer) + mposlist(3,imnum) = surf(m,n)%timestamp(layer) ! Save the pixel index location mpxlist(1,imnum) = m mpxlist(2,imnum) = n @@ -143,7 +144,7 @@ subroutine crater_tally_observed(user,surf,domain,nkilled,onum,obsdist,obslist,o iend(tnum) = mnum allocate(totpix(tnum)) - allocate(poslist(2,tnum)) + allocate(poslist(3,tnum)) allocate(tlist(tnum)) allocate(tmp_depthdiam(tnum)) allocate(countable(tnum)) @@ -200,11 +201,14 @@ subroutine crater_tally_observed(user,surf,domain,nkilled,onum,obsdist,obslist,o bowl = bowl / nbowl outer = outer / nouter tmp_depthdiam(craternum) = (rim - bowl) / crater%fcrat - if (crater%fcrat < 20e3_DP) then - dd = DDCUTOFF - else - dd = DDCUTOFF - (crater%fcrat - 20e3_DP) * 2e-7 - end if + + !if (crater%fcrat < 20e3_DP) then + ! dd = DDCUTOFF + !else + ! dd = DDCUTOFF - (crater%fcrat - 20e3_DP) * 2e-7 + !end if + dd = min(DDCUTOFF, 24.897 * crater%fcrat ** (-0.632545)) + if (((tmp_depthdiam(craternum) > dd).and.((outer - rim) / crater%fcrat < OCUTOFF)).and.& (nrim /= 0).and.(nbowl /= 0).and.(nouter /= 0)) then countable(craternum) = .true. @@ -239,7 +243,7 @@ subroutine crater_tally_observed(user,surf,domain,nkilled,onum,obsdist,obslist,o if (present(obsdist)) then allocate(depthdiam(onum)) allocate(obslist(onum)) - allocate(oposlist(2,onum)) + allocate(oposlist(3,onum)) ! Reset all the distribution bins do i=1,domain%distl obsdist(1,i) = 1e3_DP*SQRT2**(domain%plo+(i-1))