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

better readable

This commit is contained in:
Martin Diehl 2019-03-12 09:36:54 +01:00
parent 1df8b22e23
commit 1ece0a1dfd
1 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lattice.f90
View File

@ -2280,15 +2280,16 @@ function buildInteraction(acting_used,reacting_used,acting_max,reacting_max,valu
integer, dimension(:), intent(in) :: &
acting_used, & !< # of acting systems per family as specified in material.config
reacting_used, & !< # of reacting systems per family as specified in material.config
acting_max, &
reacting_max
acting_max, & !< max # of acting systems per family for given lattice
reacting_max !< max # of reacting systems per family for given lattice
real(pReal), dimension(:), intent(in) :: values !< interaction values
integer, dimension(:,:), intent(in) :: matrix !< interaction matrix
integer, dimension(:,:), intent(in) :: matrix !< interaction types
real(pReal), dimension(sum(acting_used),sum(reacting_used)) :: buildInteraction
integer :: &
acting_family_index, reacting_family_index, &
acting_family, acting_system, reacting_family, reacting_system
acting_family_index, acting_family, acting_system, &
reacting_family_index, reacting_family, reacting_system, &
i,j,k,l
do acting_family = 1,size(acting_used,1)
acting_family_index = sum(acting_used(1:acting_family-1))
@ -2298,14 +2299,17 @@ function buildInteraction(acting_used,reacting_used,acting_max,reacting_max,valu
reacting_family_index = sum(reacting_used(1:reacting_family-1))
do reacting_system = 1,reacting_used(reacting_family)
if(matrix(sum(acting_max(1:acting_family-1))+acting_system, &
sum(reacting_max(1:reacting_family-1))+reacting_system) > size(values)) &
call IO_error(138,ext_msg='buildInteraction')
buildInteraction(acting_family_index+acting_system,reacting_family_index+reacting_system) = &
values(matrix(sum(acting_max(1:acting_family-1))+acting_system, &
sum(reacting_max(1:reacting_family-1))+reacting_system))
enddo; enddo
i = sum( acting_max(1: acting_family-1)) + acting_system
j = sum(reacting_max(1:reacting_family-1)) + reacting_system
k = acting_family_index + acting_system
l = reacting_family_index + reacting_system
if (matrix(i,j) > size(values)) call IO_error(138,ext_msg='buildInteraction')
buildInteraction(k,l) = values(matrix(i,j))
enddo; enddo
enddo; enddo
end function buildInteraction