diff --git a/code/damask.core.pyf b/code/damask.core.pyf index 46465c7c3..aa169fc50 100644 --- a/code/damask.core.pyf +++ b/code/damask.core.pyf @@ -89,22 +89,22 @@ python module core ! in integer, dimension(3), intent(in) :: res real*8, dimension(3), intent(in) :: geomdim 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 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 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 - 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 integer dimension(3), intent(in) :: res real*8 dimension(3), intent(in) :: geomdim integer intent(in) :: vec_tens 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 - 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 subroutine tensor_avg(res,tensor,avg) ! in :math:math.f90 diff --git a/code/math.f90 b/code/math.f90 index 7329c7797..e5d93d76a 100644 --- a/code/math.f90 +++ b/code/math.f90 @@ -563,8 +563,7 @@ real(pReal), dimension(4,36), parameter :: math_symOperations = & real(pReal), dimension(3), intent(in) :: B 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(1:3)) + forall (i=1_pInt:3_pInt) math_mul33x3(i) = sum(A(i,1:3)*B) endfunction math_mul33x3 @@ -580,7 +579,7 @@ real(pReal), dimension(4,36), parameter :: math_symOperations = & real(pReal), dimension(3), intent(in) :: B 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