From 27026c7f6a45b20a9334df264bcab687a413238d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 16 Sep 2014 09:50:37 +0000 Subject: [PATCH] fixed missing initialization of output in RGC that got lost in Rev 3452 --- code/homogenization_RGC.f90 | 6 ++++++ code/math.f90 | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/homogenization_RGC.f90 b/code/homogenization_RGC.f90 index 6a603493c..13a0e0ec3 100644 --- a/code/homogenization_RGC.f90 +++ b/code/homogenization_RGC.f90 @@ -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 diff --git a/code/math.f90 b/code/math.f90 index 1bdba1d76..c92423cfb 100644 --- a/code/math.f90 +++ b/code/math.f90 @@ -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