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

comments

This commit is contained in:
Martin Diehl 2015-03-15 15:30:14 +00:00
parent 12cb5e56fe
commit 4a0c1c1717
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/CPFEM.f90
View File

@ -77,9 +77,9 @@ subroutine CPFEM_initAll(temperature,el,ip)
#endif
implicit none
integer(pInt), intent(in) :: el, & ! FE el number
ip ! FE integration point number
real(pReal), intent(in) :: temperature ! temperature
integer(pInt), intent(in) :: el, & !< FE el number
ip !< FE integration point number
real(pReal), intent(in) :: temperature !< temperature
!$OMP CRITICAL (init)
if (.not. CPFEM_init_done) then
@ -525,7 +525,7 @@ subroutine CPFEM_general(mode, ffn, ffn1, temperature, dt, elFE, ip)
CPFEM_cs(1:6,ip,elCP) = rnd * CPFEM_odd_stress
CPFEM_dcsde(1:6,1:6,ip,elCP) = CPFEM_odd_jacobian * math_identity2nd(6)
#endif
#if defined(Marc4DAMASK) || defined(Abaqus)
#if defined(Marc4DAMASK) || defined(Abaqus)
call field_putFieldTemperature(ip,elCP,temperature)
#endif
materialpoint_F0(1:3,1:3,ip,elCP) = ffn

2
code/plastic_phenopowerlaw.f90
View File

@ -1019,7 +1019,7 @@ subroutine plastic_phenopowerlaw_dotState(Tstar_v,ipc,ip,el)
c_TwinTwin * left_TwinTwin(j) * &
dot_product(plastic_phenopowerlaw_hardeningMatrix_TwinTwin(j,1:nTwin,instance), &
right_TwinTwin*gdot_twin) ! dot gamma_twin modulated by right-side twin factor
if (plasticState(ph)%state(index_F,of) < 0.98_pReal) & ! ensure twin volume fractions stays below 1.0
if (plasticState(ph)%state(index_F,of) < 0.98_pReal) & ! ensure twin volume fractions stays below 1.0
plasticState(ph)%dotState(index_F,of) = plasticState(ph)%dotState(index_F,of) + &
gdot_twin(j)/lattice_shearTwin(index_myFamily+i,ph)
plasticState(ph)%dotState(offset_accshear_twin+j,of) = abs(gdot_twin(j))