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

Merge remote-tracking branch 'origin/development' into rename-and-restructure

This commit is contained in:
Martin Diehl 2021-01-26 20:31:10 +01:00
parent e0e927d191 a0a7009143
commit 6126e7d221
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
v3.0.0-alpha2-329-gda93031cb v3.0.0-alpha2-355-gbd9bb5c7c

38
src/homogenization.f90
View File

@ -313,25 +313,25 @@ subroutine materialpoint_stressAndItsTangent(dt,FEsolving_execIP,FEsolving_execE
enddo enddo
!$OMP END DO !$OMP END DO
!$OMP DO PRIVATE(ho,ph,ce) ! !$OMP DO PRIVATE(ho,ph,ce)
do el = FEsolving_execElem(1),FEsolving_execElem(2) ! do el = FEsolving_execElem(1),FEsolving_execElem(2)
if (terminallyIll) continue ! if (terminallyIll) continue
ho = material_homogenizationAt(el) ! ho = material_homogenizationAt(el)
do ip = FEsolving_execIP(1),FEsolving_execIP(2) ! do ip = FEsolving_execIP(1),FEsolving_execIP(2)
ce = (el-1)*discretization_nIPs + ip ! ce = (el-1)*discretization_nIPs + ip
! call damage_partition(ce) ! call damage_partition(ce)
! do co = 1, homogenization_Nconstituents(ho) ! do co = 1, homogenization_Nconstituents(ho)
! ph = material_phaseAt(co,el) ! ph = material_phaseAt(co,el)
! if (.not. thermal_stress(dt,ph,material_phaseMemberAt(co,ip,el))) then ! if (.not. thermal_stress(dt,ph,material_phaseMemberAt(co,ip,el))) then
! if (.not. terminallyIll) & ! so first signals terminally ill... ! if (.not. terminallyIll) & ! so first signals terminally ill...
! print*, ' Integration point ', ip,' at element ', el, ' terminally ill' ! print*, ' Integration point ', ip,' at element ', el, ' terminally ill'
! terminallyIll = .true. ! ...and kills all others ! terminallyIll = .true. ! ...and kills all others
! endif ! endif
! call thermal_homogenize(ip,el) ! call thermal_homogenize(ip,el)
! enddo ! enddo
enddo ! enddo
enddo ! enddo
!$OMP END DO ! !$OMP END DO
!$OMP DO PRIVATE(ho) !$OMP DO PRIVATE(ho)
elementLooping3: do el = FEsolving_execElem(1),FEsolving_execElem(2) elementLooping3: do el = FEsolving_execElem(1),FEsolving_execElem(2)