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

Merge branch 'Adaptive-Euler-one-loop' into RKCK45-one-loop

This commit is contained in:
Martin Diehl 2020-03-26 10:56:51 +01:00
parent a4674a6461 fe8ee825d6
commit adbf6739a9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -10,8 +10,8 @@
*.pdf binary *.pdf binary
# ignore files from MSC.Marc in language statistics # ignore files from MSC.Marc in language statistics
installation/mods_MarcMentat/* linguist-vendored installation/mods_MarcMentat/20*/* linguist-vendored
src/MarcInclude/* linguist-vendored src/marc/include/* linguist-vendored
# ignore reference files for tests in language statistics # ignore reference files for tests in language statistics
python/tests/reference/* linguist-vendored python/tests/reference/* linguist-vendored

2
VERSION
View File

@ -1 +1 @@
v2.0.3-1942-g3d8e8cfe v2.0.3-2145-gb6103cc7

4
src/crystallite.f90
View File

@ -1199,7 +1199,7 @@ subroutine integrateStateEuler
nonlocalBroken = .true. nonlocalBroken = .true.
if(.not. crystallite_todo(g,i,e)) cycle 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), & crystallite_Fp(1:3,1:3,g,i,e), &
g, i, e) g, i, e)
@ -1275,7 +1275,7 @@ subroutine integrateStateAdaptiveEuler
nonlocalBroken = .true. nonlocalBroken = .true.
if(.not. crystallite_todo(g,i,e)) cycle 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), & crystallite_Fp(1:3,1:3,g,i,e), &
g, i, e) g, i, e)