better use names known from numpy
This commit is contained in:
parent
4ab3bfe96d
commit
6dfc48f89e
19
src/math.f90
19
src/math.f90
|
@ -73,6 +73,11 @@ module math
|
|||
3,3 &
|
||||
],[2,9]) !< arrangement in Plain notation
|
||||
|
||||
|
||||
interface math_mul33xx33
|
||||
module procedure math_tensordot
|
||||
end interface math_mul33xx33
|
||||
|
||||
!---------------------------------------------------------------------------------------------------
|
||||
private :: &
|
||||
unitTest
|
||||
|
@ -346,15 +351,15 @@ end function math_inner
|
|||
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
!> @brief matrix multiplication 33xx33 = 1 (double contraction --> ij * ij)
|
||||
!> @brief 3x3 tensor double contraction: ij * ij
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
real(pReal) pure function math_mul33xx33(A,B)
|
||||
real(pReal) pure function math_tensordot(A,B)
|
||||
|
||||
real(pReal), dimension(3,3), intent(in) :: A,B
|
||||
|
||||
math_mul33xx33 = sum(A*B)
|
||||
math_tensordot = sum(A*B)
|
||||
|
||||
end function math_mul33xx33
|
||||
end function math_tensordot
|
||||
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
|
@ -1412,13 +1417,13 @@ subroutine unitTest
|
|||
call IO_error(0,ext_msg='math_invert(t99)')
|
||||
|
||||
if(any(dNeq(math_clip([4.0_pReal,9.0_pReal],5.0_pReal,6.5_pReal),[5.0_pReal,6.5_pReal]))) &
|
||||
call IO_error(0,ext_msg='math_clip')
|
||||
call IO_error(0,ext_msg='math_clip')
|
||||
|
||||
if(math_factorial(10) /= 3628800) &
|
||||
call IO_error(0,ext_msg='math_factorial')
|
||||
call IO_error(0,ext_msg='math_factorial')
|
||||
|
||||
if(math_binomial(49,6) /= 13983816) &
|
||||
call IO_error(0,ext_msg='math_binomial')
|
||||
call IO_error(0,ext_msg='math_binomial')
|
||||
|
||||
end subroutine unitTest
|
||||
|
||||
|
|
Loading…
Reference in New Issue