gkowal/amun-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into reconnection

Browse Source
This commit is contained in:
Grzegorz Kowal 2015-12-10 11:22:43 -02:00
commit c6572027dc
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/interpolations.F90
View File

@ -2954,15 +2954,10 @@ module interpolations
! !
real(kind=8), intent(in) :: x, a, b real(kind=8), intent(in) :: x, a, b
real(kind=8) :: c real(kind=8) :: c
! local variables
!
real(kind=8) :: y
! !
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
! !
y = x - eps c = (sign(x, a) + sign(x, b)) * min(abs(a), abs(b), 2.5d-01 * abs(a + b))
c = (sign(y, a) + sign(y, b)) * min(abs(a), abs(b), 2.5d-01 * abs(a + b))
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
! !
@ -2993,16 +2988,11 @@ module interpolations
! !
real(kind=8), intent(in) :: x, a, b real(kind=8), intent(in) :: x, a, b
real(kind=8) :: c real(kind=8) :: c
! local variables
!
real(kind=8) :: y
! !
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
! !
y = x - eps c = 0.5d+00 * (sign(x, a) + sign(x, b)) &
c = (sign(y, a) + sign(y, b)) & * max(min(2.0d+00 * abs(a), abs(b)), min(abs(a), 2.0d+00 * abs(b)))
* max(min(abs(a), 0.5d+00 * abs(b)), min(0.5d+00 * abs(a), abs(b)))
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
! !
@ -3038,7 +3028,7 @@ module interpolations
! !
c = a * b c = a * b
if (c > 0.0d+00) then if (c > 0.0d+00) then
c = 2.0d+00 * (x - eps) * c / (a + b) c = 2.0d+00 * x * c / (a + b)
else else
c = 0.0d+00 c = 0.0d+00
end if end if