From d0cbfc087f65c760ff6adab514dfe6303d09efc9 Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Wed, 3 Feb 2021 18:40:52 +0100 Subject: [PATCH 01/17] fixed copy paste error --- src/homogenization.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 2255e83b0..6723b0ae7 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -419,7 +419,7 @@ subroutine homogenization_restartWrite(fileHandle) groupHandle(2) = HDF5_addGroup(groupHandle(1),material_name_homogenization(ho)) - call HDF5_read(groupHandle(2),homogState(ho)%state,'omega') ! ToDo: should be done by mech + call HDF5_write(groupHandle(2),homogState(ho)%state,'omega') ! ToDo: should be done by mech call HDF5_closeGroup(groupHandle(2)) @@ -446,7 +446,7 @@ subroutine homogenization_restartRead(fileHandle) groupHandle(2) = HDF5_openGroup(groupHandle(1),material_name_homogenization(ho)) - call HDF5_write(groupHandle(2),homogState(ho)%state,'omega') ! ToDo: should be done by mech + call HDF5_read(groupHandle(2),homogState(ho)%state,'omega') ! ToDo: should be done by mech call HDF5_closeGroup(groupHandle(2)) From 6a296b276dc4d7d4477039c862bcdb5180bf8a05 Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Mon, 22 Feb 2021 09:45:33 +0100 Subject: [PATCH 02/17] updating private --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index f3cd8f4c4..f78b83680 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit f3cd8f4c4b2d154e179d9bb5f396a77535f88556 +Subproject commit f78b8368092284588d9f98eb79d3994b187fec94 From b09299b606ad220cc40fe56f32fe73cfb93d32a2 Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Mon, 22 Feb 2021 12:54:34 +0100 Subject: [PATCH 03/17] added new test for rgc restart --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index f78b83680..b277e2b1e 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit f78b8368092284588d9f98eb79d3994b187fec94 +Subproject commit b277e2b1e831dd62df321f3999027d320888bf2e From e929da24e8a8683f6a45ba576c4464212f3d4d73 Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Tue, 23 Feb 2021 10:30:40 +0100 Subject: [PATCH 04/17] consistent naming --- src/homogenization.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 497b6cbaf..4d1d87406 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -305,8 +305,8 @@ subroutine materialpoint_stressAndItsTangent(dt,FEsolving_execIP,FEsolving_execE call phase_restore(ce,.false.) ! wrong name (is more a forward function) - if(homogState(ho)%sizeState > 0) homogState(ho)%State(:,me) = homogState(ho)%State0(:,me) - if(damageState_h(ho)%sizeState > 0) damageState_h(ho)%State(:,me) = damageState_h(ho)%State0(:,me) + if(homogState(ho)%sizeState > 0) homogState(ho)%state(:,me) = homogState(ho)%state0(:,me) + if(damageState_h(ho)%sizeState > 0) damageState_h(ho)%state(:,me) = damageState_h(ho)%state0(:,me) call damage_partition(ce) doneAndHappy = [.false.,.true.] From 7d90404e1724ef6699e55f4c89017209e3c1cf3c Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Wed, 24 Feb 2021 18:13:48 +0100 Subject: [PATCH 05/17] we read state0 after restart --- src/homogenization.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 4d1d87406..1de8bb93a 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -478,7 +478,7 @@ subroutine homogenization_restartRead(fileHandle) groupHandle(2) = HDF5_openGroup(groupHandle(1),material_name_homogenization(ho)) - call HDF5_read(groupHandle(2),homogState(ho)%state,'omega') ! ToDo: should be done by mech + call HDF5_read(groupHandle(2),homogState(ho)%state0,'omega') ! ToDo: should be done by mech call HDF5_closeGroup(groupHandle(2)) From c38348240586602027cfbd9e6560940d7d1ddc22 Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Wed, 24 Feb 2021 18:58:57 +0100 Subject: [PATCH 06/17] merged master of PRIVATE --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index b277e2b1e..43255ea1b 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit b277e2b1e831dd62df321f3999027d320888bf2e +Subproject commit 43255ea1ba498f623803cc80afbe0a8e60934626 From 876af174fe7e71cbb88961cd128b0eb1d05cdfcf Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Thu, 25 Feb 2021 11:07:13 +0100 Subject: [PATCH 07/17] loadcase yaml changes reflected in reference --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 43255ea1b..4592551f0 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 43255ea1ba498f623803cc80afbe0a8e60934626 +Subproject commit 4592551f0cf0c466df1a7e9896bc7cfb074fac5d From f870aef19d5e6b1a5e80052c339d1988dee4a1a0 Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Wed, 10 Mar 2021 15:58:10 +0100 Subject: [PATCH 08/17] combined the test --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 4592551f0..c2cc74be4 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 4592551f0cf0c466df1a7e9896bc7cfb074fac5d +Subproject commit c2cc74be4013b8c0c83a006b9d8522ea7fc0570f From b42b1ddb0175c2e10654dc56cf6c4dd4415139e2 Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Mon, 15 Mar 2021 11:50:46 +0100 Subject: [PATCH 09/17] single folder for tests --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index c2cc74be4..7fe6fbf59 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit c2cc74be4013b8c0c83a006b9d8522ea7fc0570f +Subproject commit 7fe6fbf59008b32b506b937349f0286607dac933 From 9c1a43262b60a68c6d78c402529921191de574aa Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Mon, 15 Mar 2021 12:46:08 +0100 Subject: [PATCH 10/17] updated private --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 7fe6fbf59..995e78506 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 7fe6fbf59008b32b506b937349f0286607dac933 +Subproject commit 995e78506c1be37408cfaa68d360c306de23326d From 1739fb55c04605666566a19d06776f192fe71c9f Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Mon, 15 Mar 2021 15:30:17 +0100 Subject: [PATCH 11/17] removed homog none test --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 995e78506..5fffe20cb 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 995e78506c1be37408cfaa68d360c306de23326d +Subproject commit 5fffe20cbd71b44902f856a714280bc743d6aeb9 From ed939c8d69a6e12e71fb69a1e7504cc1392c6c89 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 15 Mar 2021 23:59:09 +0100 Subject: [PATCH 12/17] simplified test for restart --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 5fffe20cb..a4fed7a4b 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 5fffe20cbd71b44902f856a714280bc743d6aeb9 +Subproject commit a4fed7a4b285496f547a7b940f6b6d54419f2384 From 569da91598e1e980d142d9fb8dafdca71dbe3641 Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 16 Mar 2021 19:08:19 +0100 Subject: [PATCH 13/17] [skip ci] updated version information after successful test of v3.0.0-alpha2-619-ga99983145 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index bbcfb4711..06274f014 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-602-ge2d4ab427 +v3.0.0-alpha2-619-ga99983145 From 52a0f0aaa9a5197a3641985ad304f8ac49fb71bb Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 18 Mar 2021 08:02:12 +0100 Subject: [PATCH 14/17] hickup --- src/phase_mechanical.f90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90 index e642b22ef..9da8c49ab 100644 --- a/src/phase_mechanical.f90 +++ b/src/phase_mechanical.f90 @@ -561,7 +561,7 @@ function integrateStress(F,subFp0,subFi0,Delta_t,co,ip,el) result(broken) cycle LpLoop endif - calculateJacobiLi: if (mod(jacoCounterLp, num%iJacoLpresiduum) == 0) then + calculateJacobiLp: if (mod(jacoCounterLp, num%iJacoLpresiduum) == 0) then jacoCounterLp = jacoCounterLp + 1 do o=1,3; do p=1,3 @@ -573,7 +573,7 @@ function integrateStress(F,subFp0,subFi0,Delta_t,co,ip,el) result(broken) call dgesv(9,1,dRLp_dLp,9,devNull_9,temp_9,9,ierr) ! solve dRLp/dLp * delta Lp = -res for delta Lp if (ierr /= 0) return ! error deltaLp = - math_9to33(temp_9) - endif calculateJacobiLi + endif calculateJacobiLp Lpguess = Lpguess & + deltaLp * steplengthLp @@ -601,7 +601,7 @@ function integrateStress(F,subFp0,subFi0,Delta_t,co,ip,el) result(broken) cycle LiLoop endif - calculateJacobiLp: if (mod(jacoCounterLi, num%iJacoLpresiduum) == 0) then + calculateJacobiLi: if (mod(jacoCounterLi, num%iJacoLpresiduum) == 0) then jacoCounterLi = jacoCounterLi + 1 temp_33 = matmul(matmul(A,B),invFi_current) @@ -620,7 +620,7 @@ function integrateStress(F,subFp0,subFi0,Delta_t,co,ip,el) result(broken) call dgesv(9,1,dRLi_dLi,9,devNull_9,temp_9,9,ierr) ! solve dRLi/dLp * delta Li = -res for delta Li if (ierr /= 0) return ! error deltaLi = - math_9to33(temp_9) - endif calculateJacobiLp + endif calculateJacobiLi Liguess = Liguess & + deltaLi * steplengthLi From b174473373b349ba3863d8549f403fac2cbea63a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 18 Mar 2021 08:03:56 +0100 Subject: [PATCH 15/17] no need to duplicated check --- src/homogenization.f90 | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/homogenization.f90 b/src/homogenization.f90 index f6ca104ae..6e9d492c8 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -288,19 +288,17 @@ subroutine materialpoint_stressAndItsTangent(dt,FEsolving_execIP,FEsolving_execE NiterationMPstate = NiterationMPstate + 1 - if (.not. doneAndHappy(1)) then - call mechanical_partition(homogenization_F(1:3,1:3,ce),ce) - converged = .true. - do co = 1, myNgrains - converged = converged .and. crystallite_stress(dt,co,ip,el) - enddo + call mechanical_partition(homogenization_F(1:3,1:3,ce),ce) + converged = .true. + do co = 1, myNgrains + converged = converged .and. crystallite_stress(dt,co,ip,el) + enddo - if (.not. converged) then - doneAndHappy = [.true.,.false.] - else - doneAndHappy = mechanical_updateState(dt,homogenization_F(1:3,1:3,ce),ce) - converged = all(doneAndHappy) - endif + if (.not. converged) then + doneAndHappy = [.true.,.false.] + else + doneAndHappy = mechanical_updateState(dt,homogenization_F(1:3,1:3,ce),ce) + converged = all(doneAndHappy) endif enddo convergenceLooping From 9896a01ea4f7030fc11e29518887755e3e8b8de1 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 18 Mar 2021 08:07:10 +0100 Subject: [PATCH 16/17] easier to read --- src/homogenization.f90 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 6e9d492c8..0cd514c08 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -287,18 +287,17 @@ subroutine materialpoint_stressAndItsTangent(dt,FEsolving_execIP,FEsolving_execE .and. NiterationMPstate < num%nMPstate) NiterationMPstate = NiterationMPstate + 1 - call mechanical_partition(homogenization_F(1:3,1:3,ce),ce) converged = .true. do co = 1, myNgrains converged = converged .and. crystallite_stress(dt,co,ip,el) enddo - if (.not. converged) then - doneAndHappy = [.true.,.false.] - else + if (converged) then doneAndHappy = mechanical_updateState(dt,homogenization_F(1:3,1:3,ce),ce) converged = all(doneAndHappy) + else + doneAndHappy = [.true.,.false.] endif enddo convergenceLooping From be1aeea8f77e04515613d3cf3e94773bde7861ef Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 19 Mar 2021 00:21:38 +0100 Subject: [PATCH 17/17] [skip ci] updated version information after successful test of v3.0.0-alpha2-624-g06a553103 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 06274f014..afe8dd5b6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-619-ga99983145 +v3.0.0-alpha2-624-g06a553103