From a709c807c63428b3096cf60738d4473ff565f098 Mon Sep 17 00:00:00 2001 From: daminton Date: Tue, 6 Dec 2016 15:23:18 +0000 Subject: [PATCH] Removed obsolete tally components. --- src/main/CTEM.f90 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/CTEM.f90 b/src/main/CTEM.f90 index ae735379..d08e77b9 100644 --- a/src/main/CTEM.f90 +++ b/src/main/CTEM.f90 @@ -40,7 +40,7 @@ program CTEM ! Distribution arrays real(DP),dimension(:,:),allocatable :: prod,vdist,pdist,crtscl,truedist,obsdist,truelist real(DP),dimension(:),allocatable :: obslist -real(SP),dimension(:),allocatable :: original_depth,current_depth,p_score,deviation_sigma +real(SP),dimension(:),allocatable :: depthdiam real(SP),dimension(:,:),allocatable :: oposlist integer(I8B),dimension(:),allocatable :: production_list ! Miscellaneous variables @@ -131,12 +131,10 @@ program CTEM write(*,*) "Surface-affecting craters generated: ",ntrue write(*,*) "Visible craters generated: ",vistrue end if -call crater_tally_observed(user,surf,domain,nkilled,onum,& - obsdist,obslist,oposlist,original_depth,current_depth,deviation_sigma,p_score) +call crater_tally_observed(user,surf,domain,nkilled,onum,obsdist,obslist,oposlist,depthdiam) ntotkilled = ntotkilled + nkilled write(*,*) 'Craters killed during tally: ',ntotkilled -call io_write_tally(truedist,truelist(:,1:ntrue),obsdist,obslist,oposlist,& - original_depth,current_depth,deviation_sigma,p_score) +call io_write_tally(truedist,truelist(:,1:ntrue),obsdist,obslist,oposlist,depthdiam) if (.not.user%tallyonly) then write(*,*) "Writing surface files" call io_write_surf(user,surf) @@ -160,7 +158,7 @@ program CTEM ! Deallocate all the allocatables deallocate(seedarr) deallocate(surf,prod,vdist,pdist,crtscl,truedist,truelist,obsdist,obslist,nflux,production_list) -deallocate(oposlist,current_depth,original_depth,p_score,deviation_sigma) +deallocate(oposlist,depthdiam) !$ t2 = omp_get_wtime() !$ write(*,*) 'Timing information'