diff --git a/.gitattributes b/.gitattributes index 7ed90d7ba..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/MarcInclude/* 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 diff --git a/VERSION b/VERSION index 6a0c24200..4452b84c0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.3-1942-g3d8e8cfe +v2.0.3-2145-gb6103cc7 diff --git a/src/crystallite.f90 b/src/crystallite.f90 index a359f09b2..0159daab5 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) @@ -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) @@ -1666,7 +1666,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