cleaning
This commit is contained in:
parent
d92a732dcc
commit
0f8396c9d3
|
@ -25,7 +25,6 @@ module constitutive
|
||||||
crystallite_dt !< requested time increment of each grain
|
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
|
||||||
crystallite_subFrac, & !< already calculated fraction of increment
|
|
||||||
crystallite_subStep !< size of next integration step
|
crystallite_subStep !< size of next integration step
|
||||||
type(rotation), dimension(:,:,:), allocatable :: &
|
type(rotation), dimension(:,:,:), allocatable :: &
|
||||||
crystallite_orientation !< current orientation
|
crystallite_orientation !< current orientation
|
||||||
|
@ -853,12 +852,7 @@ subroutine crystallite_init
|
||||||
print'(/,a)', ' <<<+- crystallite init -+>>>'
|
print'(/,a)', ' <<<+- crystallite init -+>>>'
|
||||||
|
|
||||||
debug_crystallite => config_debug%get('crystallite', defaultVal=emptyList)
|
debug_crystallite => config_debug%get('crystallite', defaultVal=emptyList)
|
||||||
debugCrystallite%basic = debug_crystallite%contains('basic')
|
|
||||||
debugCrystallite%extensive = debug_crystallite%contains('extensive')
|
debugCrystallite%extensive = debug_crystallite%contains('extensive')
|
||||||
debugCrystallite%selective = debug_crystallite%contains('selective')
|
|
||||||
debugCrystallite%element = config_debug%get_asInt('element', defaultVal=1)
|
|
||||||
debugCrystallite%ip = config_debug%get_asInt('integrationpoint', defaultVal=1)
|
|
||||||
debugCrystallite%grain = config_debug%get_asInt('grain', defaultVal=1)
|
|
||||||
|
|
||||||
cMax = homogenization_maxNconstituents
|
cMax = homogenization_maxNconstituents
|
||||||
iMax = discretization_nIPs
|
iMax = discretization_nIPs
|
||||||
|
@ -880,7 +874,7 @@ subroutine crystallite_init
|
||||||
source = crystallite_partitionedF)
|
source = crystallite_partitionedF)
|
||||||
|
|
||||||
allocate(crystallite_dt(cMax,iMax,eMax),source=0.0_pReal)
|
allocate(crystallite_dt(cMax,iMax,eMax),source=0.0_pReal)
|
||||||
allocate(crystallite_subdt,crystallite_subFrac,crystallite_subStep, &
|
allocate(crystallite_subdt,crystallite_subStep, &
|
||||||
source = crystallite_dt)
|
source = crystallite_dt)
|
||||||
|
|
||||||
allocate(crystallite_orientation(cMax,iMax,eMax))
|
allocate(crystallite_orientation(cMax,iMax,eMax))
|
||||||
|
@ -946,14 +940,10 @@ subroutine crystallite_init
|
||||||
#endif
|
#endif
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
if (debugCrystallite%basic) then
|
|
||||||
print'(a42,1x,i10)', ' # of elements: ', eMax
|
print'(a42,1x,i10)', ' # of elements: ', eMax
|
||||||
print'(a42,1x,i10)', ' # of integration points/element: ', iMax
|
print'(a42,1x,i10)', ' # of integration points/element: ', iMax
|
||||||
print'(a42,1x,i10)', 'max # of constituents/integration point: ', cMax
|
print'(a42,1x,i10)', 'max # of constituents/integration point: ', cMax
|
||||||
flush(IO_STDOUT)
|
flush(IO_STDOUT)
|
||||||
endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
!$OMP PARALLEL DO PRIVATE(i,c)
|
!$OMP PARALLEL DO PRIVATE(i,c)
|
||||||
do e = FEsolving_execElem(1),FEsolving_execElem(2)
|
do e = FEsolving_execElem(1),FEsolving_execElem(2)
|
||||||
|
@ -1011,6 +1001,7 @@ function crystallite_stress()
|
||||||
e, & !< counter in element loop
|
e, & !< counter in element loop
|
||||||
s
|
s
|
||||||
logical, dimension(homogenization_maxNconstituents,discretization_nIPs,discretization_Nelems) :: todo !ToDo: need to set some values to false for different Ngrains
|
logical, dimension(homogenization_maxNconstituents,discretization_nIPs,discretization_Nelems) :: todo !ToDo: need to set some values to false for different Ngrains
|
||||||
|
real(pReal), dimension(homogenization_maxNconstituents,discretization_nIPs,discretization_Nelems) :: subFrac !ToDo: need to set some values to false for different Ngrains
|
||||||
real(pReal), dimension(:,:,:,:,:), allocatable :: &
|
real(pReal), dimension(:,:,:,:,:), allocatable :: &
|
||||||
subLp0,& !< plastic velocity grad at start of crystallite inc
|
subLp0,& !< plastic velocity grad at start of crystallite inc
|
||||||
subLi0 !< intermediate velocity grad at start of crystallite inc
|
subLi0 !< intermediate velocity grad at start of crystallite inc
|
||||||
|
@ -1037,7 +1028,7 @@ function crystallite_stress()
|
||||||
crystallite_subFp0(1:3,1:3,c,i,e) = crystallite_partitionedFp0(1:3,1:3,c,i,e)
|
crystallite_subFp0(1:3,1:3,c,i,e) = crystallite_partitionedFp0(1:3,1:3,c,i,e)
|
||||||
crystallite_subFi0(1:3,1:3,c,i,e) = crystallite_partitionedFi0(1:3,1:3,c,i,e)
|
crystallite_subFi0(1:3,1:3,c,i,e) = crystallite_partitionedFi0(1:3,1:3,c,i,e)
|
||||||
crystallite_subF0(1:3,1:3,c,i,e) = crystallite_partitionedF0(1:3,1:3,c,i,e)
|
crystallite_subF0(1:3,1:3,c,i,e) = crystallite_partitionedF0(1:3,1:3,c,i,e)
|
||||||
crystallite_subFrac(c,i,e) = 0.0_pReal
|
subFrac(c,i,e) = 0.0_pReal
|
||||||
crystallite_subStep(c,i,e) = 1.0_pReal/num%subStepSizeCryst
|
crystallite_subStep(c,i,e) = 1.0_pReal/num%subStepSizeCryst
|
||||||
todo(c,i,e) = .true.
|
todo(c,i,e) = .true.
|
||||||
crystallite_converged(c,i,e) = .false. ! pretend failed step of 1/subStepSizeCryst
|
crystallite_converged(c,i,e) = .false. ! pretend failed step of 1/subStepSizeCryst
|
||||||
|
@ -1062,8 +1053,8 @@ function crystallite_stress()
|
||||||
! wind forward
|
! wind forward
|
||||||
if (crystallite_converged(c,i,e)) then
|
if (crystallite_converged(c,i,e)) then
|
||||||
formerSubStep = crystallite_subStep(c,i,e)
|
formerSubStep = crystallite_subStep(c,i,e)
|
||||||
crystallite_subFrac(c,i,e) = crystallite_subFrac(c,i,e) + crystallite_subStep(c,i,e)
|
subFrac(c,i,e) = subFrac(c,i,e) + crystallite_subStep(c,i,e)
|
||||||
crystallite_subStep(c,i,e) = min(1.0_pReal - crystallite_subFrac(c,i,e), &
|
crystallite_subStep(c,i,e) = min(1.0_pReal - subFrac(c,i,e), &
|
||||||
num%stepIncreaseCryst * crystallite_subStep(c,i,e))
|
num%stepIncreaseCryst * crystallite_subStep(c,i,e))
|
||||||
|
|
||||||
todo(c,i,e) = crystallite_subStep(c,i,e) > 0.0_pReal ! still time left to integrate on?
|
todo(c,i,e) = crystallite_subStep(c,i,e) > 0.0_pReal ! still time left to integrate on?
|
||||||
|
|
Loading…
Reference in New Issue