From 88fb82abc87588beff060a7a798ce9dd72fcd0e5 Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 26 Jan 2021 12:20:11 +0100 Subject: [PATCH 1/2] [skip ci] updated version information after successful test of v3.0.0-alpha2-355-gbd9bb5c7c --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5190c13c9..62377fd35 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-329-gda93031cb +v3.0.0-alpha2-355-gbd9bb5c7c From 7a4ad53b8c12ad9f33cd3843b9a6a88b19766646 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 26 Jan 2021 16:55:19 +0100 Subject: [PATCH 2/2] don't rely on compiler to remove dead loops --- src/homogenization.f90 | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 48919b46d..9b8c33c2e 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -313,25 +313,25 @@ subroutine materialpoint_stressAndItsTangent(dt,FEsolving_execIP,FEsolving_execE enddo !$OMP END DO - !$OMP DO PRIVATE(ho,ph,ce) - do el = FEsolving_execElem(1),FEsolving_execElem(2) - if (terminallyIll) continue - ho = material_homogenizationAt(el) - do ip = FEsolving_execIP(1),FEsolving_execIP(2) - ce = (el-1)*discretization_nIPs + ip - ! call damage_partition(ce) - ! do co = 1, homogenization_Nconstituents(ho) - ! ph = material_phaseAt(co,el) - ! if (.not. thermal_stress(dt,ph,material_phaseMemberAt(co,ip,el))) then - ! if (.not. terminallyIll) & ! so first signals terminally ill... - ! print*, ' Integration point ', ip,' at element ', el, ' terminally ill' - ! terminallyIll = .true. ! ...and kills all others - ! endif - ! call thermal_homogenize(ip,el) - ! enddo - enddo - enddo - !$OMP END DO +! !$OMP DO PRIVATE(ho,ph,ce) +! do el = FEsolving_execElem(1),FEsolving_execElem(2) +! if (terminallyIll) continue +! ho = material_homogenizationAt(el) +! do ip = FEsolving_execIP(1),FEsolving_execIP(2) +! ce = (el-1)*discretization_nIPs + ip +! call damage_partition(ce) +! do co = 1, homogenization_Nconstituents(ho) +! ph = material_phaseAt(co,el) +! if (.not. thermal_stress(dt,ph,material_phaseMemberAt(co,ip,el))) then +! if (.not. terminallyIll) & ! so first signals terminally ill... +! print*, ' Integration point ', ip,' at element ', el, ' terminally ill' +! terminallyIll = .true. ! ...and kills all others +! endif +! call thermal_homogenize(ip,el) +! enddo +! enddo +! enddo +! !$OMP END DO !$OMP DO PRIVATE(ho) elementLooping3: do el = FEsolving_execElem(1),FEsolving_execElem(2)