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

no global variables

This commit is contained in:
Martin Diehl 2020-12-23 14:57:53 +01:00
parent 12b1c7e641
commit 18458d34e9
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/constitutive.f90
View File

@ -42,8 +42,6 @@ module constitutive
KINEMATICS_SLIPPLANE_OPENING_ID, & KINEMATICS_SLIPPLANE_OPENING_ID, &
KINEMATICS_THERMAL_EXPANSION_ID KINEMATICS_THERMAL_EXPANSION_ID
end enum end enum
real(pReal), dimension(:,:,:), allocatable, public :: &
crystallite_dt !< requested time increment of each grain
real(pReal), dimension(:,:,:), allocatable :: & real(pReal), dimension(:,:,:), allocatable :: &
crystallite_subdt !< substepped time increment of each grain crystallite_subdt !< substepped time increment of each grain
type(rotation), dimension(:,:,:), allocatable :: & type(rotation), dimension(:,:,:), allocatable :: &
@ -876,9 +874,7 @@ subroutine crystallite_init
crystallite_subFp0,crystallite_subFi0, & crystallite_subFp0,crystallite_subFi0, &
source = crystallite_partitionedF) source = crystallite_partitionedF)
allocate(crystallite_dt(cMax,iMax,eMax),source=0.0_pReal) allocate(crystallite_subdt(cMax,iMax,eMax),source=0.0_pReal)
allocate(crystallite_subdt, &
source = crystallite_dt)
allocate(crystallite_orientation(cMax,iMax,eMax)) allocate(crystallite_orientation(cMax,iMax,eMax))
@ -995,8 +991,9 @@ end subroutine crystallite_init
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief calculate stress (P) !> @brief calculate stress (P)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
function crystallite_stress(co,ip,el) function crystallite_stress(dt,co,ip,el)
real(pReal), intent(in) :: dt
integer, intent(in) :: & integer, intent(in) :: &
co, & co, &
ip, & ip, &
@ -1094,7 +1091,7 @@ function crystallite_stress(co,ip,el)
crystallite_Fe(1:3,1:3,co,ip,el) = matmul(crystallite_subF(1:3,1:3,co,ip,el), & crystallite_Fe(1:3,1:3,co,ip,el) = matmul(crystallite_subF(1:3,1:3,co,ip,el), &
math_inv33(matmul(constitutive_mech_Fi(ph)%data(1:3,1:3,me), & math_inv33(matmul(constitutive_mech_Fi(ph)%data(1:3,1:3,me), &
constitutive_mech_Fp(ph)%data(1:3,1:3,me)))) constitutive_mech_Fp(ph)%data(1:3,1:3,me))))
crystallite_subdt(co,ip,el) = subStep * crystallite_dt(co,ip,el) crystallite_subdt(co,ip,el) = subStep * dt
crystallite_converged(co,ip,el) = .false. crystallite_converged(co,ip,el) = .false.
call integrateState(co,ip,el) call integrateState(co,ip,el)
call integrateSourceState(co,ip,el) call integrateSourceState(co,ip,el)

3
src/homogenization.f90
View File

@ -255,10 +255,9 @@ subroutine materialpoint_stressAndItsTangent(dt)
+ (homogenization_F(1:3,1:3,ce)-homogenization_F0(1:3,1:3,ce))& + (homogenization_F(1:3,1:3,ce)-homogenization_F0(1:3,1:3,ce))&
*(subStep(ip,el)+subFrac(ip,el)), & *(subStep(ip,el)+subFrac(ip,el)), &
ip,el) ip,el)
crystallite_dt(1:myNgrains,ip,el) = dt*subStep(ip,el) ! propagate materialpoint dt to grains
converged(ip,el) = .true. converged(ip,el) = .true.
do co = 1, myNgrains do co = 1, myNgrains
converged(ip,el) = converged(ip,el) .and. crystallite_stress(co,ip,el) converged(ip,el) = converged(ip,el) .and. crystallite_stress(dt*subStep(ip,el),co,ip,el)
enddo enddo
endif endif