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

fixed missing initialization of output in RGC that got lost in Rev 3452

This commit is contained in:
Martin Diehl 2014-09-16 09:50:37 +00:00
parent 74db2ef064
commit 27026c7f6a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/homogenization_RGC.f90
View File

@ -358,6 +358,12 @@ subroutine homogenization_RGC_init(fileUnit)
homogenization_RGC_sizePostResults(i) + mySize
endif outputFound
enddo
homogenization_RGC_sizeState(i) &
= 3_pInt*(homogenization_RGC_Ngrains(1,i)-1_pInt)*homogenization_RGC_Ngrains(2,i)*homogenization_RGC_Ngrains(3,i) &
+ 3_pInt*homogenization_RGC_Ngrains(1,i)*(homogenization_RGC_Ngrains(2,i)-1_pInt)*homogenization_RGC_Ngrains(3,i) &
+ 3_pInt*homogenization_RGC_Ngrains(1,i)*homogenization_RGC_Ngrains(2,i)*(homogenization_RGC_Ngrains(3,i)-1_pInt) &
+ 8_pInt ! (1) Average constitutive work, (2-4) Overall mismatch, (5) Average penalty energy,
! (6) Volume discrepancy, (7) Avg relaxation rate component, (8) Max relaxation rate component
enddo
#endif

4
code/math.f90
View File

@ -2572,7 +2572,7 @@ integer(pInt) pure function math_factorial(n)
integer(pInt), intent(in) :: n
integer(pInt) :: i
math_factorial = product((/(i, i=1,n)/))
math_factorial = product([(i, i=1,n)])
end function math_factorial
@ -2587,7 +2587,7 @@ integer(pInt) pure function math_binomial(n,k)
integer(pInt) :: i, j
j = min(k,n-k)
math_binomial = product((/(i, i=n, n-j+1, -1)/))/math_factorial(j)
math_binomial = product([(i, i=n, n-j+1, -1)])/math_factorial(j)
end function math_binomial