moved function ray() to its own file for debugging

MintonGroup · Nov 15, 2022 · 058d20d · 058d20d
1 parent 1a4e628
commit 058d20d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 104 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -65,7 +65,8 @@ io/io_write_pindex_map.f90\
 io/io_write_age_depth.f90\
 ejecta/ejecta_emplace.f90\
 ejecta/ejecta_ray_pattern.f90\
-ejecta/ejecta_ray_pattern_function.f90\
+ejecta/ejecta_ray_pattern_func.f90\
+ejecta/ejecta_ray_ray_func.f90\
 ejecta/ejecta_blanket.f90\
 ejecta/ejecta_blanket_func.f90\
 ejecta/ejecta_thickness.f90\

diff --git a/src/ejecta/ejecta_ray_pattern.f90 b/src/ejecta/ejecta_ray_pattern.f90
@@ -106,8 +106,8 @@ subroutine ejecta_ray_pattern(user,surf,crater,inc,xi,xf,yi,yf,diffdistribution,
             areafrac = util_area_intersection(user%ejecta_truncation * crater%frad,xbar,ybar,user%pix) 
             r = sqrt(xbar**2 + ybar**2) / crater%frad
             theta = mod(atan2(ybar,xbar) + pi + rn * 2 * pi,2 * pi)
-            diffdistribution(i,j) = areafrac * ejecta_ray_pattern_function(theta,r,rmin,rmax,thetari,.false.) 
-            ejdistribution(i,j) = areafrac * ejecta_ray_pattern_function(theta,r,rmin,rmax,thetari,.true.) 
+            diffdistribution(i,j) = areafrac * ejecta_ray_pattern_func(theta,r,rmin,rmax,thetari,.false.) 
+            ejdistribution(i,j) = areafrac * ejecta_ray_pattern_func(theta,r,rmin,rmax,thetari,.true.) 
          end do
       end do
       !!$OMP END PARALLEL DO

diff --git a/src/ejecta/ejecta_ray_pattern_function.f90 b/src/ejecta/ejecta_ray_pattern_function.f90
diff --git a/src/ejecta/module_ejecta.f90 b/src/ejecta/module_ejecta.f90
@@ -55,14 +55,24 @@ end subroutine ejecta_ray_pattern
    end interface
 
    interface
-      function ejecta_ray_pattern_function(theta,r,rmin,rmax,thetari,ej) result(ans)
+      function ejecta_ray_pattern_func(theta,r,rmin,rmax,thetari,ej) result(ans)
       use module_globals
       implicit none
       real(DP) :: ans
       real(DP),intent(in) :: r,rmin,rmax,theta
       real(DP),dimension(:),intent(in) :: thetari
       logical,intent(in) :: ej
-      end function ejecta_ray_pattern_function
+      end function ejecta_ray_pattern_func
+   end interface
+
+   interface
+      function ejecta_ray_ray_func(theta,thetar,r,n,w) result(ans)
+      use module_globals
+      implicit none
+      real(DP) :: ans
+      real(DP),intent(in) :: theta,thetar,r,w
+      integer(I4B),intent(in) :: n
+      end function ejecta_ray_ray_func
    end interface
 
    interface