diff --git a/src/Makefile.am b/src/Makefile.am index 56df03dd..abc481ca 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,7 +66,7 @@ io/io_write_age_depth.f90\ ejecta/ejecta_emplace.f90\ ejecta/ejecta_ray_pattern.f90\ ejecta/ejecta_ray_pattern_func.f90\ -ejecta/ejecta_ray_ray_func.f90\ +ejecta/ejecta_ray_func.f90\ ejecta/ejecta_blanket.f90\ ejecta/ejecta_blanket_func.f90\ ejecta/ejecta_thickness.f90\ diff --git a/src/ejecta/ejecta_ray_ray_func.f90 b/src/ejecta/ejecta_ray_func.f90 similarity index 79% rename from src/ejecta/ejecta_ray_ray_func.f90 rename to src/ejecta/ejecta_ray_func.f90 index 2fbf28f8..693f6fd9 100644 --- a/src/ejecta/ejecta_ray_ray_func.f90 +++ b/src/ejecta/ejecta_ray_func.f90 @@ -1,12 +1,12 @@ !****f* ejecta/ejecta_ray_ray_func ! Name -! ejecta_ray_ray_func -- Calculate ejecta ray +! ejecta_ray_func -- Calculate ejecta ray ! SYNOPSIS ! This uses ! * module_globals ! * module_ejecta ! -! ans = ejecta_ray_ray_func() +! ans = ejecta_ray_func() ! ! DESCRIPTION ! @@ -26,9 +26,9 @@ !*** !********************************************************************************************************** -function ejecta_ray_ray_func(theta,thetar,r,n,w) result(ans) +function ejecta_ray_func(theta,thetar,r,n,w) result(ans) use module_globals - use module_ejecta, EXCEPT_THIS_ONE => ejecta_ray_ray_func + use module_ejecta, EXCEPT_THIS_ONE => ejecta_ray_func implicit none real(DP) :: ans real(DP),intent(in) :: theta,thetar,r,w @@ -42,4 +42,4 @@ function ejecta_ray_ray_func(theta,thetar,r,n,w) result(ans) ans = a * exp(-dtheta**2 / (2 * c**2)) !return -end function ejecta_ray_ray_func \ No newline at end of file +end function ejecta_ray_func \ No newline at end of file diff --git a/src/ejecta/ejecta_ray_pattern_func.f90 b/src/ejecta/ejecta_ray_pattern_func.f90 index 1a93f6dc..8f83a704 100644 --- a/src/ejecta/ejecta_ray_pattern_func.f90 +++ b/src/ejecta/ejecta_ray_pattern_func.f90 @@ -74,7 +74,7 @@ function ejecta_ray_pattern_func(theta,r,rmin,rmax,thetari,ej) result(ans) FF = rayfmult * (20 / rmax)**(0.5_DP) * 0.25_DP f = FF * fpeak * (rtrans / rpeak)**rayq * exp(1._DP / rayq * (1.0_DP - (rtrans / rpeak)**rayq)) !equation 42 Minton et al. 2019 end if - ans = ans + ejecta_ray_ray_func(theta,thetari(i),r,n,rw) * f / a + ans = ans + ejecta_ray_func(theta,thetari(i),r,n,rw) * f / a end do end if diff --git a/src/ejecta/module_ejecta.f90 b/src/ejecta/module_ejecta.f90 index 0a56819f..2fb6bda5 100644 --- a/src/ejecta/module_ejecta.f90 +++ b/src/ejecta/module_ejecta.f90 @@ -66,13 +66,13 @@ end function ejecta_ray_pattern_func end interface interface - function ejecta_ray_ray_func(theta,thetar,r,n,w) result(ans) + function ejecta_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 function ejecta_ray_func end interface interface