From 630b89c25a2998f8baf7186d45319188c920a4ad Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 14 Jul 2016 15:29:53 +0200 Subject: [PATCH] bugfixes (did not compile) --- code/crystallite.f90 | 7 +++++-- code/math.f90 | 10 +++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/crystallite.f90 b/code/crystallite.f90 index 2fc5b4083..7abd737f3 100644 --- a/code/crystallite.f90 +++ b/code/crystallite.f90 @@ -145,6 +145,7 @@ subroutine crystallite_init debug_crystallite, & debug_levelBasic use numerics, only: & + worldrank, & usePingPong use math, only: & math_I3, & @@ -3780,11 +3781,12 @@ logical function crystallite_integrateStress(& enddo LpLoop - if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) & + if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then !$OMP CRITICAL (distributionStress) debug_StressLoopLpDistribution(NiterationStressLp,numerics_integrationMode) = & debug_StressLoopLpDistribution(NiterationStressLp,numerics_integrationMode) + 1_pInt !$OMP END CRITICAL (distributionStress) + endif !* calculate intermediate velocity gradient and its tangent from constitutive law @@ -3866,11 +3868,12 @@ logical function crystallite_integrateStress(& Liguess = Liguess + steplengthLi * deltaLi enddo LiLoop - if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) & + if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then !$OMP CRITICAL (distributionStress) debug_StressLoopLiDistribution(NiterationStressLi,numerics_integrationMode) = & debug_StressLoopLiDistribution(NiterationStressLi,numerics_integrationMode) + 1_pInt !$OMP END CRITICAL (distributionStress) + endif !* calculate new plastic and elastic deformation gradient diff --git a/code/math.f90 b/code/math.f90 index 8273b1820..8694e30ee 100644 --- a/code/math.f90 +++ b/code/math.f90 @@ -214,9 +214,9 @@ subroutine math_init call random_number(randTest(i)) enddo - write(6,'(a,I)') 'size of random seed: ', randSize + write(6,'(a,I2)') ' size of random seed: ', randSize do i =1, randSize - write(6,'(a,I,I)') 'value of random seed: ', i, randInit(i) + write(6,'(a,I2,I14)') ' value of random seed: ', i, randInit(i) enddo write(6,'(a,4(/,26x,f17.14),/)') ' start of random sequence: ', randTest @@ -1189,9 +1189,9 @@ function math_qRand() real(pReal), dimension(3) :: rnd call halton(3_pInt,rnd) - math_qRand = [cos(2.0_pReal*PI*rnd(1))*sqrt(rnd(3)), - sin(2.0_pReal*PI*rnd(2))*sqrt(1.0_pReal-rnd(3)), - cos(2.0_pReal*PI*rnd(2))*sqrt(1.0_pReal-rnd(3)), + math_qRand = [cos(2.0_pReal*PI*rnd(1))*sqrt(rnd(3)), & + sin(2.0_pReal*PI*rnd(2))*sqrt(1.0_pReal-rnd(3)), & + cos(2.0_pReal*PI*rnd(2))*sqrt(1.0_pReal-rnd(3)), & sin(2.0_pReal*PI*rnd(1))*sqrt(rnd(3))] end function math_qRand