Fixed bad merge

MintonGroup · Jul 23, 2021 · eb476c1 · eb476c1
1 parent acef5f0
commit eb476c1
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/init/init_domain.f90 b/src/init/init_domain.f90
@@ -24,7 +24,7 @@ subroutine init_domain(user,crater,domain,prod,pdist,vdist,crtscl,nflux)
    implicit none
 
    ! Arguments
-   type(usertype),intent(in)                       :: user
+   type(usertype),intent(inout)                    :: user
    type(cratertype),intent(inout)                  :: crater
    type(domaintype),intent(inout)                  :: domain
    real(DP),dimension(:,:),intent(inout)           :: prod,vdist
@@ -59,9 +59,9 @@ subroutine init_domain(user,crater,domain,prod,pdist,vdist,crtscl,nflux)
    domain%parea = user%pix**2
    domain%area = domain%side**2
    domain%biggest_crater = domain%side * user%maxcrat
-   domain%smallest_crater = user%pix
+   domain%smallest_crater =  user%pix
    domain%smallest_ejecta = SMALLESTEJECTA * user%pix
-   domain%smallest_counted_crater = 2._DP / (1._DP + COUNTINGRIM) * sqrt(SMALLESTCOUNTABLE / PI) * user%pix 
+   domain%smallest_counted_crater = SMALLESTCOUNTABLE * user%pix 
    domain%vescsq = 2 * user%gaccel * user%trad
 
    ! Set up transition values
@@ -74,6 +74,10 @@ subroutine init_domain(user,crater,domain,prod,pdist,vdist,crtscl,nflux)
       crater%cxtran = SIMCOMKI*(user%gaccel**SIMCOMPI)
    end select
 
+   ! Preliminary seismic property calculations
+   user%seisk = THIRD * user%tvel * user%tfrac
+   user%cohaccel = user%regcoh / user%trho_r
+
    ! Now we build an idealized production population
    domain%initialize = .true.
 
@@ -173,6 +177,7 @@ subroutine init_domain(user,crater,domain,prod,pdist,vdist,crtscl,nflux)
       pdist(4,i) = pdist(4,i) + diffnum      ! Differential number
 
       nflux(3,k) = diffnum / domain%area / user%interval
+
    end do
 
    do i = 1,domain%pdistl