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

bugfixes (did not compile)

This commit is contained in:
Martin Diehl 2016-07-14 15:29:53 +02:00
parent 13ee927606
commit 630b89c25a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/crystallite.f90
View File

@ -145,6 +145,7 @@ subroutine crystallite_init
debug_crystallite, & debug_crystallite, &
debug_levelBasic debug_levelBasic
use numerics, only: & use numerics, only: &
worldrank, &
usePingPong usePingPong
use math, only: & use math, only: &
math_I3, & math_I3, &
@ -3780,11 +3781,12 @@ logical function crystallite_integrateStress(&
enddo LpLoop 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) !$OMP CRITICAL (distributionStress)
debug_StressLoopLpDistribution(NiterationStressLp,numerics_integrationMode) = & debug_StressLoopLpDistribution(NiterationStressLp,numerics_integrationMode) = &
debug_StressLoopLpDistribution(NiterationStressLp,numerics_integrationMode) + 1_pInt debug_StressLoopLpDistribution(NiterationStressLp,numerics_integrationMode) + 1_pInt
!$OMP END CRITICAL (distributionStress) !$OMP END CRITICAL (distributionStress)
endif
!* calculate intermediate velocity gradient and its tangent from constitutive law !* calculate intermediate velocity gradient and its tangent from constitutive law
@ -3866,11 +3868,12 @@ logical function crystallite_integrateStress(&
Liguess = Liguess + steplengthLi * deltaLi Liguess = Liguess + steplengthLi * deltaLi
enddo LiLoop 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) !$OMP CRITICAL (distributionStress)
debug_StressLoopLiDistribution(NiterationStressLi,numerics_integrationMode) = & debug_StressLoopLiDistribution(NiterationStressLi,numerics_integrationMode) = &
debug_StressLoopLiDistribution(NiterationStressLi,numerics_integrationMode) + 1_pInt debug_StressLoopLiDistribution(NiterationStressLi,numerics_integrationMode) + 1_pInt
!$OMP END CRITICAL (distributionStress) !$OMP END CRITICAL (distributionStress)
endif
!* calculate new plastic and elastic deformation gradient !* calculate new plastic and elastic deformation gradient

10
code/math.f90
View File

@ -214,9 +214,9 @@ subroutine math_init
call random_number(randTest(i)) call random_number(randTest(i))
enddo enddo
write(6,'(a,I)') 'size of random seed: ', randSize write(6,'(a,I2)') ' size of random seed: ', randSize
do i =1, 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 enddo
write(6,'(a,4(/,26x,f17.14),/)') ' start of random sequence: ', randTest write(6,'(a,4(/,26x,f17.14),/)') ' start of random sequence: ', randTest
@ -1189,9 +1189,9 @@ function math_qRand()
real(pReal), dimension(3) :: rnd real(pReal), dimension(3) :: rnd
call halton(3_pInt,rnd) call halton(3_pInt,rnd)
math_qRand = [cos(2.0_pReal*PI*rnd(1))*sqrt(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)), 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)), cos(2.0_pReal*PI*rnd(2))*sqrt(1.0_pReal-rnd(3)), &
sin(2.0_pReal*PI*rnd(1))*sqrt(rnd(3))] sin(2.0_pReal*PI*rnd(1))*sqrt(rnd(3))]
end function math_qRand end function math_qRand