Resolved conflicts with crater_populate

MintonGroup · Oct 3, 2016 · 572b715 · 572b715
1 parent a701119
commit 572b715
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/crater/crater_populate.f90 b/src/crater/crater_populate.f90
@@ -70,8 +70,8 @@ subroutine crater_populate(user,surf,crater,domain,prod,production_list,vdist,nt
    real(DP)                :: finterval ! fraction of interval so far completed
    character(len=MESSAGESIZE) :: message  ! message for the progress bar
    real(DP)                :: ejbmass
+   logical                 :: makecrater
    TARGET :: surf
-   logical :: makecrater
 
    ! ejecta blanket array
    type(ejbtype),dimension(EJBTABSIZE) :: ejb       ! Ejecta blanket lookup table
@@ -145,7 +145,7 @@ subroutine crater_populate(user,surf,crater,domain,prod,production_list,vdist,nt
       if (crater%fcrat < domain%smallest_crater) makecrater = .false.
 
       if (makecrater) then
-         
+
          ! Find the visible crater parameters
          call crater_find_visible(user,crater,domain)
 
@@ -194,7 +194,7 @@ subroutine crater_populate(user,surf,crater,domain,prod,production_list,vdist,nt
                call ejecta_table_define(user,crater,domain,ejb,ejtble)
                call ejecta_interpolate(crater,domain,crater%frad,ejb(1:ejtble),ejtble,crater%ejrim)
             end if
-            call ejecta_emplace(user,surf,crater,domain,ejb(1:ejtble),ejtble,ejbmass)
+            !call ejecta_emplace(user,surf,crater,domain,ejb(1:ejtble),ejtble,ejbmass)
          else
             ejtble = 0
          end if
@@ -243,7 +243,6 @@ subroutine crater_populate(user,surf,crater,domain,prod,production_list,vdist,nt
             end if
             call io_ejecta_table(crater,domain,ejb,ejtble,"ejecta_table_min.dat")
          end if
-
       end if
 
       ! Do sub-pixel craters vertical mixing
@@ -253,7 +252,6 @@ subroutine crater_populate(user,surf,crater,domain,prod,production_list,vdist,nt
          call regolith_subcrater_mix(user,surf,domain,nflux,finterval,p)
       end if 
 
-
       ! Do periodic subpixel processes on the whole grid
       if (.not.user%testflag) then
          if ((domain%subpixelcoverage / real(user%gridsize**2,kind=DP) > SUBPIXELCOVERAGE).or.(icrater == ntotcrat)) then