From 4ffad4cb7ee8aeb8855c4cf331ca7822eb296ee1 Mon Sep 17 00:00:00 2001 From: Test User Date: Sun, 22 Mar 2020 12:11:21 +0100 Subject: [PATCH 1/7] [skip ci] updated version information after successful test of v2.0.3-2118-gd920efb8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6a0c24200..61375a39b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.3-1942-g3d8e8cfe +v2.0.3-2118-gd920efb8 From 4eafab432ef9bbdf6e5361003996f4a8999e19b0 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 23 Mar 2020 08:17:30 +0100 Subject: [PATCH 2/7] follow new directory structure --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 7ed90d7ba..7d9e3d1ce 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11,7 +11,7 @@ # ignore files from MSC.Marc in language statistics installation/mods_MarcMentat/* linguist-vendored -src/MarcInclude/* linguist-vendored +src/marc/include/* linguist-vendored # ignore reference files for tests in language statistics python/tests/reference/* linguist-vendored From 6a9b0d82f07696d5c20273d2b010d53bb298cb56 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 23 Mar 2020 11:28:01 +0100 Subject: [PATCH 3/7] do not ignore our scripts --- .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 7d9e3d1ce..b096658f8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,8 +10,8 @@ *.pdf binary # ignore files from MSC.Marc in language statistics -installation/mods_MarcMentat/* linguist-vendored -src/marc/include/* linguist-vendored +installation/mods_MarcMentat/20*/* linguist-vendored +src/marc/include/* linguist-vendored # ignore reference files for tests in language statistics python/tests/reference/* linguist-vendored From 6dbddb0267901e8b4bd22069243623de1fbd76d4 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 23 Mar 2020 20:57:01 +0100 Subject: [PATCH 4/7] [skip ci] updated version information after successful test of v2.0.3-2130-g20122971 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 61375a39b..07770b6a0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.3-2118-gd920efb8 +v2.0.3-2130-g20122971 From a6f94efa51048ab7e22fa3e4b00168d62c0344fa Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 25 Mar 2020 13:17:48 +0100 Subject: [PATCH 5/7] bugfix, introduced when making nonlocal explicit --- src/crystallite.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/crystallite.f90 b/src/crystallite.f90 index 214b482ba..467c18796 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -1048,7 +1048,7 @@ subroutine integrateStateFPI sourceState(p)%p(s)%previousDotState (:,c) = sourceState(p)%p(s)%dotState(:,c) enddo - call constitutive_dependentState(crystallite_Fe(1:3,1:3,g,i,e), & + call constitutive_dependentState(crystallite_partionedF(1:3,1:3,g,i,e), & crystallite_Fp(1:3,1:3,g,i,e), & g, i, e) @@ -1579,7 +1579,7 @@ subroutine update_dependentState do i = FEsolving_execIP(1),FEsolving_execIP(2) do g = 1,homogenization_Ngrains(material_homogenizationAt(e)) if (crystallite_todo(g,i,e) .and. .not. crystallite_converged(g,i,e)) & - call constitutive_dependentState(crystallite_Fe(1:3,1:3,g,i,e), & + call constitutive_dependentState(crystallite_partionedF(1:3,1:3,g,i,e), & crystallite_Fp(1:3,1:3,g,i,e), & g, i, e) enddo; enddo; enddo From 2d5d48288c00f8f636b8b3b6b11d604421471a95 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 25 Mar 2020 13:20:14 +0100 Subject: [PATCH 6/7] bugfix, related making nonlocal state update explicit --- src/crystallite.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crystallite.f90 b/src/crystallite.f90 index d5d19475b..2711d0cfd 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -1199,7 +1199,7 @@ subroutine integrateStateEuler nonlocalBroken = .true. if(.not. crystallite_todo(g,i,e)) cycle - call constitutive_dependentState(crystallite_Fe(1:3,1:3,g,i,e), & + call constitutive_dependentState(crystallite_partionedF(1:3,1:3,g,i,e), & crystallite_Fp(1:3,1:3,g,i,e), & g, i, e) From d47b636956badc18d02d4b68d6a663c60b81590e Mon Sep 17 00:00:00 2001 From: Test User Date: Thu, 26 Mar 2020 07:57:03 +0100 Subject: [PATCH 7/7] [skip ci] updated version information after successful test of v2.0.3-2145-gb6103cc7 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 07770b6a0..4452b84c0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.3-2130-g20122971 +v2.0.3-2145-gb6103cc7