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

Merge branch 'development' into PGI-support

This commit is contained in:
Martin Diehl 2020-01-13 18:35:50 +01:00
parent 93d7d080ec d2806e950d
commit 18a47078f9
5 changed files with 37 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PRIVATE

@ -1 +1 @@
Subproject commit 99b076706a186ec7deb051ae181c2d9697c799fc Subproject commit 66d562c755cd9aa4bbb8280c509383014acd52db

2
VERSION
View File

@ -1 +1 @@
v2.0.3-1354-gef5a8a3a v2.0.3-1406-g5fc1abae

210
examples/FEM/polyXtal/material.config
View File

@ -4,14 +4,6 @@
[SX] [SX]
mech none mech none
#-------------------#
<crystallite>
#-------------------#
[aLittleSomething]
(output) f
(output) p
#-------------------# #-------------------#
<phase> <phase>
#-------------------# #-------------------#
@ -50,408 +42,212 @@ interaction_twinslip 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
interaction_twintwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 interaction_twintwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
atol_resistance 1 atol_resistance 1
(output) f
(output) p
#-------------------# #-------------------#
<microstructure> <microstructure>
#-------------------# #-------------------#
[Grain001] [Grain001]
crystallite 1
(constituent) phase 1 texture 1 fraction 1.0 (constituent) phase 1 texture 1 fraction 1.0
[Grain002] [Grain002]
crystallite 1
(constituent) phase 1 texture 2 fraction 1.0 (constituent) phase 1 texture 2 fraction 1.0
[Grain003] [Grain003]
crystallite 1
(constituent) phase 1 texture 3 fraction 1.0 (constituent) phase 1 texture 3 fraction 1.0
[Grain004] [Grain004]
crystallite 1
(constituent) phase 1 texture 4 fraction 1.0 (constituent) phase 1 texture 4 fraction 1.0
[Grain005] [Grain005]
crystallite 1
(constituent) phase 1 texture 5 fraction 1.0 (constituent) phase 1 texture 5 fraction 1.0
[Grain006] [Grain006]
crystallite 1
(constituent) phase 1 texture 6 fraction 1.0 (constituent) phase 1 texture 6 fraction 1.0
[Grain007] [Grain007]
crystallite 1
(constituent) phase 1 texture 7 fraction 1.0 (constituent) phase 1 texture 7 fraction 1.0
[Grain008] [Grain008]
crystallite 1
(constituent) phase 1 texture 8 fraction 1.0 (constituent) phase 1 texture 8 fraction 1.0
[Grain009] [Grain009]
crystallite 1
(constituent) phase 1 texture 9 fraction 1.0 (constituent) phase 1 texture 9 fraction 1.0
[Grain010] [Grain010]
crystallite 1
(constituent) phase 1 texture 10 fraction 1.0 (constituent) phase 1 texture 10 fraction 1.0
[Grain011] [Grain011]
crystallite 1
(constituent) phase 1 texture 11 fraction 1.0 (constituent) phase 1 texture 11 fraction 1.0
[Grain012] [Grain012]
crystallite 1
(constituent) phase 1 texture 12 fraction 1.0 (constituent) phase 1 texture 12 fraction 1.0
[Grain013] [Grain013]
crystallite 1
(constituent) phase 1 texture 13 fraction 1.0 (constituent) phase 1 texture 13 fraction 1.0
[Grain014] [Grain014]
crystallite 1
(constituent) phase 1 texture 14 fraction 1.0 (constituent) phase 1 texture 14 fraction 1.0
[Grain015] [Grain015]
crystallite 1
(constituent) phase 1 texture 15 fraction 1.0 (constituent) phase 1 texture 15 fraction 1.0
[Grain016] [Grain016]
crystallite 1
(constituent) phase 1 texture 16 fraction 1.0 (constituent) phase 1 texture 16 fraction 1.0
[Grain017] [Grain017]
crystallite 1
(constituent) phase 1 texture 17 fraction 1.0 (constituent) phase 1 texture 17 fraction 1.0
[Grain018] [Grain018]
crystallite 1
(constituent) phase 1 texture 18 fraction 1.0 (constituent) phase 1 texture 18 fraction 1.0
[Grain019] [Grain019]
crystallite 1
(constituent) phase 1 texture 19 fraction 1.0 (constituent) phase 1 texture 19 fraction 1.0
[Grain020] [Grain020]
crystallite 1
(constituent) phase 1 texture 20 fraction 1.0 (constituent) phase 1 texture 20 fraction 1.0
[Grain021] [Grain021]
crystallite 1
(constituent) phase 1 texture 21 fraction 1.0 (constituent) phase 1 texture 21 fraction 1.0
[Grain022] [Grain022]
crystallite 1
(constituent) phase 1 texture 22 fraction 1.0 (constituent) phase 1 texture 22 fraction 1.0
[Grain023] [Grain023]
crystallite 1
(constituent) phase 1 texture 23 fraction 1.0 (constituent) phase 1 texture 23 fraction 1.0
[Grain024] [Grain024]
crystallite 1
(constituent) phase 1 texture 24 fraction 1.0 (constituent) phase 1 texture 24 fraction 1.0
[Grain025] [Grain025]
crystallite 1
(constituent) phase 1 texture 25 fraction 1.0 (constituent) phase 1 texture 25 fraction 1.0
[Grain026] [Grain026]
crystallite 1
(constituent) phase 1 texture 26 fraction 1.0 (constituent) phase 1 texture 26 fraction 1.0
[Grain027] [Grain027]
crystallite 1
(constituent) phase 1 texture 27 fraction 1.0 (constituent) phase 1 texture 27 fraction 1.0
[Grain028] [Grain028]
crystallite 1
(constituent) phase 1 texture 28 fraction 1.0 (constituent) phase 1 texture 28 fraction 1.0
[Grain029] [Grain029]
crystallite 1
(constituent) phase 1 texture 29 fraction 1.0 (constituent) phase 1 texture 29 fraction 1.0
[Grain030] [Grain030]
crystallite 1
(constituent) phase 1 texture 30 fraction 1.0 (constituent) phase 1 texture 30 fraction 1.0
[Grain031] [Grain031]
crystallite 1
(constituent) phase 1 texture 31 fraction 1.0 (constituent) phase 1 texture 31 fraction 1.0
[Grain032] [Grain032]
crystallite 1
(constituent) phase 1 texture 32 fraction 1.0 (constituent) phase 1 texture 32 fraction 1.0
[Grain033] [Grain033]
crystallite 1
(constituent) phase 1 texture 33 fraction 1.0 (constituent) phase 1 texture 33 fraction 1.0
[Grain034] [Grain034]
crystallite 1
(constituent) phase 1 texture 34 fraction 1.0 (constituent) phase 1 texture 34 fraction 1.0
[Grain035] [Grain035]
crystallite 1
(constituent) phase 1 texture 35 fraction 1.0 (constituent) phase 1 texture 35 fraction 1.0
[Grain036] [Grain036]
crystallite 1
(constituent) phase 1 texture 36 fraction 1.0 (constituent) phase 1 texture 36 fraction 1.0
[Grain037] [Grain037]
crystallite 1
(constituent) phase 1 texture 37 fraction 1.0 (constituent) phase 1 texture 37 fraction 1.0
[Grain038] [Grain038]
crystallite 1
(constituent) phase 1 texture 38 fraction 1.0 (constituent) phase 1 texture 38 fraction 1.0
[Grain039] [Grain039]
crystallite 1
(constituent) phase 1 texture 39 fraction 1.0 (constituent) phase 1 texture 39 fraction 1.0
[Grain040] [Grain040]
crystallite 1
(constituent) phase 1 texture 40 fraction 1.0 (constituent) phase 1 texture 40 fraction 1.0
[Grain041] [Grain041]
crystallite 1
(constituent) phase 1 texture 41 fraction 1.0 (constituent) phase 1 texture 41 fraction 1.0
[Grain042] [Grain042]
crystallite 1
(constituent) phase 1 texture 42 fraction 1.0 (constituent) phase 1 texture 42 fraction 1.0
[Grain043] [Grain043]
crystallite 1
(constituent) phase 1 texture 43 fraction 1.0 (constituent) phase 1 texture 43 fraction 1.0
[Grain044] [Grain044]
crystallite 1
(constituent) phase 1 texture 44 fraction 1.0 (constituent) phase 1 texture 44 fraction 1.0
[Grain045] [Grain045]
crystallite 1
(constituent) phase 1 texture 45 fraction 1.0 (constituent) phase 1 texture 45 fraction 1.0
[Grain046] [Grain046]
crystallite 1
(constituent) phase 1 texture 46 fraction 1.0 (constituent) phase 1 texture 46 fraction 1.0
[Grain047] [Grain047]
crystallite 1
(constituent) phase 1 texture 47 fraction 1.0 (constituent) phase 1 texture 47 fraction 1.0
[Grain048] [Grain048]
crystallite 1
(constituent) phase 1 texture 48 fraction 1.0 (constituent) phase 1 texture 48 fraction 1.0
[Grain049] [Grain049]
crystallite 1
(constituent) phase 1 texture 49 fraction 1.0 (constituent) phase 1 texture 49 fraction 1.0
[Grain050] [Grain050]
crystallite 1
(constituent) phase 1 texture 50 fraction 1.0 (constituent) phase 1 texture 50 fraction 1.0
[Grain051] [Grain051]
crystallite 1
(constituent) phase 1 texture 51 fraction 1.0 (constituent) phase 1 texture 51 fraction 1.0
[Grain052] [Grain052]
crystallite 1
(constituent) phase 1 texture 52 fraction 1.0 (constituent) phase 1 texture 52 fraction 1.0
[Grain053] [Grain053]
crystallite 1
(constituent) phase 1 texture 53 fraction 1.0 (constituent) phase 1 texture 53 fraction 1.0
[Grain054] [Grain054]
crystallite 1
(constituent) phase 1 texture 54 fraction 1.0 (constituent) phase 1 texture 54 fraction 1.0
[Grain055] [Grain055]
crystallite 1
(constituent) phase 1 texture 55 fraction 1.0 (constituent) phase 1 texture 55 fraction 1.0
[Grain056] [Grain056]
crystallite 1
(constituent) phase 1 texture 56 fraction 1.0 (constituent) phase 1 texture 56 fraction 1.0
[Grain057] [Grain057]
crystallite 1
(constituent) phase 1 texture 57 fraction 1.0 (constituent) phase 1 texture 57 fraction 1.0
[Grain058] [Grain058]
crystallite 1
(constituent) phase 1 texture 58 fraction 1.0 (constituent) phase 1 texture 58 fraction 1.0
[Grain059] [Grain059]
crystallite 1
(constituent) phase 1 texture 59 fraction 1.0 (constituent) phase 1 texture 59 fraction 1.0
[Grain060] [Grain060]
crystallite 1
(constituent) phase 1 texture 60 fraction 1.0 (constituent) phase 1 texture 60 fraction 1.0
[Grain061] [Grain061]
crystallite 1
(constituent) phase 1 texture 61 fraction 1.0 (constituent) phase 1 texture 61 fraction 1.0
[Grain062] [Grain062]
crystallite 1
(constituent) phase 1 texture 62 fraction 1.0 (constituent) phase 1 texture 62 fraction 1.0
[Grain063] [Grain063]
crystallite 1
(constituent) phase 1 texture 63 fraction 1.0 (constituent) phase 1 texture 63 fraction 1.0
[Grain064] [Grain064]
crystallite 1
(constituent) phase 1 texture 64 fraction 1.0 (constituent) phase 1 texture 64 fraction 1.0
[Grain065] [Grain065]
crystallite 1
(constituent) phase 1 texture 65 fraction 1.0 (constituent) phase 1 texture 65 fraction 1.0
[Grain066] [Grain066]
crystallite 1
(constituent) phase 1 texture 66 fraction 1.0 (constituent) phase 1 texture 66 fraction 1.0
[Grain067] [Grain067]
crystallite 1
(constituent) phase 1 texture 67 fraction 1.0 (constituent) phase 1 texture 67 fraction 1.0
[Grain068] [Grain068]
crystallite 1
(constituent) phase 1 texture 68 fraction 1.0 (constituent) phase 1 texture 68 fraction 1.0
[Grain069] [Grain069]
crystallite 1
(constituent) phase 1 texture 69 fraction 1.0 (constituent) phase 1 texture 69 fraction 1.0
[Grain070] [Grain070]
crystallite 1
(constituent) phase 1 texture 70 fraction 1.0 (constituent) phase 1 texture 70 fraction 1.0
[Grain071] [Grain071]
crystallite 1
(constituent) phase 1 texture 71 fraction 1.0 (constituent) phase 1 texture 71 fraction 1.0
[Grain072] [Grain072]
crystallite 1
(constituent) phase 1 texture 72 fraction 1.0 (constituent) phase 1 texture 72 fraction 1.0
[Grain073] [Grain073]
crystallite 1
(constituent) phase 1 texture 73 fraction 1.0 (constituent) phase 1 texture 73 fraction 1.0
[Grain074] [Grain074]
crystallite 1
(constituent) phase 1 texture 74 fraction 1.0 (constituent) phase 1 texture 74 fraction 1.0
[Grain075] [Grain075]
crystallite 1
(constituent) phase 1 texture 75 fraction 1.0 (constituent) phase 1 texture 75 fraction 1.0
[Grain076] [Grain076]
crystallite 1
(constituent) phase 1 texture 76 fraction 1.0 (constituent) phase 1 texture 76 fraction 1.0
[Grain077] [Grain077]
crystallite 1
(constituent) phase 1 texture 77 fraction 1.0 (constituent) phase 1 texture 77 fraction 1.0
[Grain078] [Grain078]
crystallite 1
(constituent) phase 1 texture 78 fraction 1.0 (constituent) phase 1 texture 78 fraction 1.0
[Grain079] [Grain079]
crystallite 1
(constituent) phase 1 texture 79 fraction 1.0 (constituent) phase 1 texture 79 fraction 1.0
[Grain080] [Grain080]
crystallite 1
(constituent) phase 1 texture 80 fraction 1.0 (constituent) phase 1 texture 80 fraction 1.0
[Grain081] [Grain081]
crystallite 1
(constituent) phase 1 texture 81 fraction 1.0 (constituent) phase 1 texture 81 fraction 1.0
[Grain082] [Grain082]
crystallite 1
(constituent) phase 1 texture 82 fraction 1.0 (constituent) phase 1 texture 82 fraction 1.0
[Grain083] [Grain083]
crystallite 1
(constituent) phase 1 texture 83 fraction 1.0 (constituent) phase 1 texture 83 fraction 1.0
[Grain084] [Grain084]
crystallite 1
(constituent) phase 1 texture 84 fraction 1.0 (constituent) phase 1 texture 84 fraction 1.0
[Grain085] [Grain085]
crystallite 1
(constituent) phase 1 texture 85 fraction 1.0 (constituent) phase 1 texture 85 fraction 1.0
[Grain086] [Grain086]
crystallite 1
(constituent) phase 1 texture 86 fraction 1.0 (constituent) phase 1 texture 86 fraction 1.0
[Grain087] [Grain087]
crystallite 1
(constituent) phase 1 texture 87 fraction 1.0 (constituent) phase 1 texture 87 fraction 1.0
[Grain088] [Grain088]
crystallite 1
(constituent) phase 1 texture 88 fraction 1.0 (constituent) phase 1 texture 88 fraction 1.0
[Grain089] [Grain089]
crystallite 1
(constituent) phase 1 texture 89 fraction 1.0 (constituent) phase 1 texture 89 fraction 1.0
[Grain090] [Grain090]
crystallite 1
(constituent) phase 1 texture 90 fraction 1.0 (constituent) phase 1 texture 90 fraction 1.0
[Grain091] [Grain091]
crystallite 1
(constituent) phase 1 texture 91 fraction 1.0 (constituent) phase 1 texture 91 fraction 1.0
[Grain092] [Grain092]
crystallite 1
(constituent) phase 1 texture 92 fraction 1.0 (constituent) phase 1 texture 92 fraction 1.0
[Grain093] [Grain093]
crystallite 1
(constituent) phase 1 texture 93 fraction 1.0 (constituent) phase 1 texture 93 fraction 1.0
[Grain094] [Grain094]
crystallite 1
(constituent) phase 1 texture 94 fraction 1.0 (constituent) phase 1 texture 94 fraction 1.0
[Grain095] [Grain095]
crystallite 1
(constituent) phase 1 texture 95 fraction 1.0 (constituent) phase 1 texture 95 fraction 1.0
[Grain096] [Grain096]
crystallite 1
(constituent) phase 1 texture 96 fraction 1.0 (constituent) phase 1 texture 96 fraction 1.0
[Grain097] [Grain097]
crystallite 1
(constituent) phase 1 texture 97 fraction 1.0 (constituent) phase 1 texture 97 fraction 1.0
[Grain098] [Grain098]
crystallite 1
(constituent) phase 1 texture 98 fraction 1.0 (constituent) phase 1 texture 98 fraction 1.0
[Grain099] [Grain099]
crystallite 1
(constituent) phase 1 texture 99 fraction 1.0 (constituent) phase 1 texture 99 fraction 1.0
[Grain100] [Grain100]
crystallite 1
(constituent) phase 1 texture 100 fraction 1.0 (constituent) phase 1 texture 100 fraction 1.0
#-------------------# #-------------------#

5
examples/MSC.Marc/material.config
View File

@ -419,11 +419,6 @@
[cube] [cube]
(gauss) phi1 0 Phi 0 phi2 0 (gauss) phi1 0 Phi 0 phi2 0
#-------------------#
<crystallite>
#-------------------#
{../ConfigFiles/Crystallite_All.config}
#-------------------# #-------------------#
<phase> <phase>

53
examples/SpectralMethod/EshelbyInclusion/material.config
View File

@ -3,25 +3,12 @@
#-------------------# #-------------------#
[direct] [direct]
mech none # isostrain 1 grain mech none
thermal adiabatic # thermal strain (stress) induced mass transport thermal adiabatic
t0 330.0 t0 330.0
(output) temperature (output) temperature
#-------------------#
<crystallite>
#-------------------#
[aLittleSomething]
(output) texture
(output) f
(output) p
(output) fe
(output) fi
(output) fp
#-------------------# #-------------------#
<phase> <phase>
#-------------------# #-------------------#
@ -34,6 +21,12 @@ plasticity none
{config/elastic_isotropic.config} {config/elastic_isotropic.config}
{config/thermal.config} {config/thermal.config}
(output) f
(output) p
(output) fe
(output) fi
(output) fp
#................. #.................
[Ti matrix] [Ti matrix]
@ -43,6 +36,12 @@ plasticity none
{config/elastic_Ti.config} {config/elastic_Ti.config}
{config/thermal.config} {config/thermal.config}
(output) f
(output) p
(output) fe
(output) fi
(output) fp
#................. #.................
[isotropic inclusion] [isotropic inclusion]
@ -52,6 +51,12 @@ plasticity none
{config/thermal.config} {config/thermal.config}
{config/thermalExpansion_isotropic.config} {config/thermalExpansion_isotropic.config}
(output) f
(output) p
(output) fe
(output) fi
(output) fp
#................. #.................
[anisotropic inclusion] [anisotropic inclusion]
@ -61,6 +66,12 @@ plasticity none
{config/thermal.config} {config/thermal.config}
{config/thermalExpansion_fullyAnisotropic.config} {config/thermalExpansion_fullyAnisotropic.config}
(output) f
(output) p
(output) fe
(output) fi
(output) fp
#................. #.................
[Ti inclusion] [Ti inclusion]
@ -71,32 +82,32 @@ plasticity none
{config/thermal.config} {config/thermal.config}
{config/thermalExpansion_Ti.config} {config/thermalExpansion_Ti.config}
(output) f
(output) p
(output) fe
(output) fi
(output) fp
#--------------------------# #--------------------------#
<microstructure> <microstructure>
#--------------------------# #--------------------------#
[isotropic matrix] [isotropic matrix]
crystallite 1
(constituent) phase 1 texture 1 fraction 1.0 (constituent) phase 1 texture 1 fraction 1.0
[Ti matrix] [Ti matrix]
crystallite 1
(constituent) phase 2 texture 1 fraction 1.0 (constituent) phase 2 texture 1 fraction 1.0
[isotropic inclusion] [isotropic inclusion]
crystallite 1
(constituent) phase 3 texture 1 fraction 1.0 (constituent) phase 3 texture 1 fraction 1.0
[anisotropic inclusion] [anisotropic inclusion]
crystallite 1
(constituent) phase 4 texture 1 fraction 1.0 (constituent) phase 4 texture 1 fraction 1.0
[rotated inclusion] [rotated inclusion]
crystallite 1
(constituent) phase 4 texture 2 fraction 1.0 (constituent) phase 4 texture 2 fraction 1.0
[Ti inclusion] [Ti inclusion]
crystallite 1
(constituent) phase 5 texture 1 fraction 1.0 (constituent) phase 5 texture 1 fraction 1.0
#--------------------------# #--------------------------#