Removed obsolete tally components.

MintonGroup · Dec 6, 2016 · ddb4a32 · ddb4a32
1 parent a709c80
commit ddb4a32
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 20 deletions.
diff --git a/src/util/module_util.f90 b/src/util/module_util.f90
@@ -79,15 +79,13 @@ end subroutine util_init_list
 end interface
 
 interface
-   subroutine util_add_to_layer(user,surfi,isrim,fcrat,xl,yl,depth,baseline)
+   subroutine util_add_to_layer(user,surfi,fcrat,xl,yl)
    use module_globals
    implicit none
    type(usertype),intent(in) :: user
    type(surftype),intent(inout) :: surfi
-   integer(I2B),intent(in) :: isrim
    real(DP),intent(in) :: fcrat
    real(SP),intent(in) :: xl,yl
-   real(SP),intent(in) :: depth,baseline
    end subroutine util_add_to_layer
 end interface
 

diff --git a/src/util/util_add_to_layer.f90 b/src/util/util_add_to_layer.f90
@@ -18,18 +18,16 @@
 !  Notes       :  
 !
 !**********************************************************************************************************************************
-subroutine util_add_to_layer(user,surfi,isrim,fcrat,xl,yl,depth,baseline)
+subroutine util_add_to_layer(user,surfi,fcrat,xl,yl)
 use module_globals
 use module_util, EXCEPT_THIS_ONE => util_add_to_layer
 implicit none
 
 ! Arguments
 type(usertype),intent(in) :: user
 type(surftype),intent(inout) :: surfi
-integer(I2B),intent(in) :: isrim
 real(DP),intent(in) :: fcrat
 real(SP),intent(in) :: xl,yl
-real(SP),intent(in) :: depth,baseline
 
 ! Internals
 integer(I4B) :: layer,l
@@ -48,11 +46,8 @@ subroutine util_add_to_layer(user,surfi,isrim,fcrat,xl,yl,depth,baseline)
 ! Emplace a new crater if requested and a spot is available
 if (layer>0) then
    surfi%diam(layer) = fcrat
-   surfi%isrim(layer) = isrim
    surfi%xl(layer) = xl
    surfi%yl(layer) = yl
-   surfi%original_depth(layer) = depth
-   surfi%baseline(layer) = baseline
 else
    write(*,*)
    write(*,*) 'WARNING! No free layer to add crater pixel. Consider increasing NUMLAYERS'

diff --git a/src/util/util_remove_from_layer.f90 b/src/util/util_remove_from_layer.f90
@@ -30,10 +30,7 @@ subroutine util_remove_from_layer(surfi,layer)
 ! Internals
 
 surfi%diam(layer) = 0.0_DP
-surfi%isrim(layer) = 0
 surfi%xl(layer) = 0.0_SP
 surfi%yl(layer) = 0.0_SP
-surfi%original_depth(layer) = 0.0_SP
-surfi%baseline(layer) = 0.0_SP
 
 end subroutine util_remove_from_layer
diff --git a/src/util/util_sort_layer.f90 b/src/util/util_sort_layer.f90
@@ -32,8 +32,6 @@ subroutine util_sort_layer(user,surf,crater)
    integer(I4B),dimension(user%numlayers) :: ind
    real(DP),dimension(user%numlayers) :: tempdiam
    real(SP),dimension(user%numlayers) :: tempxpos,tempypos
-   real(SP),dimension(user%numlayers) :: tempdepth,tempbaseline
-   integer(I2B),dimension(user%numlayers) :: tempisrim
    integer(I4B) :: i,j,k,inc,incsq,mx,my,iradsq
 
    inc = min(crater%rimdispx,(user%gridsize - 1)/2)
@@ -54,22 +52,16 @@ subroutine util_sort_layer(user,surf,crater)
 
             ! Temporarily store layer data
             tempdiam = surf(mx,my)%diam(1:user%numlayers)
-            tempisrim = surf(mx,my)%isrim(1:user%numlayers)
             tempxpos = surf(mx,my)%xl(1:user%numlayers)
             tempypos = surf(mx,my)%yl(1:user%numlayers)
-            tempdepth = surf(mx,my)%original_depth(1:user%numlayers)
-            tempbaseline = surf(mx,my)%baseline(1:user%numlayers)
 
             ! Sort the layers by crater diameter
             call util_mrgrnk(surf(mx,my)%diam(1:user%numlayers),ind)
 
             do k=1,user%numlayers
                surf(mx,my)%diam(k)=tempdiam(ind(k))
-               surf(mx,my)%isrim(k)=tempisrim(ind(k))
                surf(mx,my)%xl(k)=tempxpos(ind(k))
                surf(mx,my)%yl(k)=tempypos(ind(k))
-               surf(mx,my)%original_depth(k)=tempdepth(ind(k))
-               surf(mx,my)%baseline(k)=tempbaseline(ind(k))
             end do
          end if
       end do