Skip to content

Commit

Permalink
removed redundancy in filename
Browse files Browse the repository at this point in the history
  • Loading branch information
Austin Michael Blevins committed Nov 15, 2022
1 parent ea4461d commit 19e4cf2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down
Original file line number Diff line number Diff line change
@@ -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
!
Expand All @@ -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
Expand All @@ -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
end function ejecta_ray_func
2 changes: 1 addition & 1 deletion src/ejecta/ejecta_ray_pattern_func.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/ejecta/module_ejecta.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 19e4cf2

Please sign in to comment.