223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

corrected order of arguments for calling functions from python, small polishing in math.f90 (substituting manual summation by sum() )

This commit is contained in:
Martin Diehl 2012-01-25 14:31:21 +00:00
parent fa372523a8
commit e6495c986b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/damask.core.pyf
View File

@ -89,22 +89,22 @@ python module core ! in
integer, dimension(3), intent(in) :: res integer, dimension(3), intent(in) :: res
real*8, dimension(3), intent(in) :: geomdim real*8, dimension(3), intent(in) :: geomdim
integer, intent(in) :: vec_tens integer, intent(in) :: vec_tens
real*8, dimension(res[0], res[1], res[2], 3,vec_tens), intent(in), depend(res[0],res[1],res[2],vec_tens) :: field real*8, dimension(res[0], res[1], res[2], vec_tens,3), intent(in), depend(res[0],res[1],res[2],vec_tens) :: field
! output variables ! output variables
real*8, dimension(res[0], res[1], res[2], vec_tens), intent(out), depend(res[0],res[1],res[2],vec_tens) :: divergence real*8, dimension(res[0], res[1], res[2], vec_tens), intent(out), depend(res[0],res[1],res[2],vec_tens) :: divergence
! variables with dimension depending on input ! variables with dimension depending on input
real*8, dimension(res[0]/2+1,res[1],res[2],3), depend(res[0],res[1],res[2],3) :: xi real*8, dimension(res[0]/2+1,res[1],res[2],3), depend(res[0],res[1],res[2],3) :: xi
end subroutine divergence_fft end subroutine divergence_fft
subroutine divergence_fdm(res,geomdim,vec_tens,order,field,divergence_field) ! in :math:math.f90 subroutine divergence_fdm(res,geomdim,vec_tens,order,field,divergence) ! in :math:math.f90
! input variables ! input variables
integer dimension(3), intent(in) :: res integer dimension(3), intent(in) :: res
real*8 dimension(3), intent(in) :: geomdim real*8 dimension(3), intent(in) :: geomdim
integer intent(in) :: vec_tens integer intent(in) :: vec_tens
integer, intent(in) :: order integer, intent(in) :: order
real*8 dimension(res[0], res[1], res[2], 3,vec_tens), intent(in), depend(res[0],res[1],res[2],vec_tens) :: field real*8 dimension(res[0], res[1], res[2], vec_tens,3), intent(in), depend(res[0],res[1],res[2],vec_tens) :: field
! output variables ! output variables
real*8 dimension(res[0], res[1], res[2], vec_tens), intent(out), depend(res[0],res[1],res[2],vec_tens) :: divergence_field real*8 dimension(res[0], res[1], res[2], vec_tens), intent(out), depend(res[0],res[1],res[2],vec_tens) :: divergence
end subroutine divergence_fdm end subroutine divergence_fdm
subroutine tensor_avg(res,tensor,avg) ! in :math:math.f90 subroutine tensor_avg(res,tensor,avg) ! in :math:math.f90

5
code/math.f90
View File

@ -563,8 +563,7 @@ real(pReal), dimension(4,36), parameter :: math_symOperations = &
real(pReal), dimension(3), intent(in) :: B real(pReal), dimension(3), intent(in) :: B
real(pReal), dimension(3) :: math_mul33x3 real(pReal), dimension(3) :: math_mul33x3
!forall (i=1_pInt:3_pInt) math_mul33x3(i) = A(i,1)*B(1) + A(i,2)*B(2) + A(i,3)*B(3) forall (i=1_pInt:3_pInt) math_mul33x3(i) = sum(A(i,1:3)*B)
forall (i=1_pInt:3_pInt) math_mul33x3(i) = sum(A(i,1:3)*B(1:3))
endfunction math_mul33x3 endfunction math_mul33x3
@ -580,7 +579,7 @@ real(pReal), dimension(4,36), parameter :: math_symOperations = &
real(pReal), dimension(3), intent(in) :: B real(pReal), dimension(3), intent(in) :: B
complex(pReal), dimension(3) :: math_mul33x3_complex complex(pReal), dimension(3) :: math_mul33x3_complex
forall (i=1_pInt:3_pInt) math_mul33x3_complex(i) = sum(A(i,1:3)*B(1:3)) forall (i=1_pInt:3_pInt) math_mul33x3_complex(i) = sum(A(i,1:3)*B)
endfunction math_mul33x3_complex endfunction math_mul33x3_complex