From d2560ebb395b460db1f5a8ebd5db234ac1e223a7 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Mon, 12 Jul 2021 21:42:51 +0200 Subject: [PATCH 1/5] function should return either 'true' or 'false' and not bear the responsibility to throw errors We were forcing every colon to indicate either key or key: value --- src/YAML_parse.f90 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/YAML_parse.f90 b/src/YAML_parse.f90 index 8e20e0c29..7ea71f494 100644 --- a/src/YAML_parse.f90 +++ b/src/YAML_parse.f90 @@ -199,11 +199,7 @@ logical function isKeyValue(line) isKeyValue = .false. if( .not. isKey(line) .and. index(IO_rmComment(line),':') > 0 .and. .not. isFlow(line)) then - if(index(IO_rmComment(line),': ') > 0) then - isKeyValue = .true. - else - call IO_error(704,ext_msg=line) - endif + if(index(IO_rmComment(line),': ') > 0) isKeyValue = .true. endif end function isKeyValue From 45abca90c571ea401bfc299996e0443e0f445c51 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Mon, 12 Jul 2021 22:17:02 +0200 Subject: [PATCH 2/5] stricter example of invalid YAML--> mechanical:{type: pass} --- src/YAML_parse.f90 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/YAML_parse.f90 b/src/YAML_parse.f90 index 7ea71f494..971fc208c 100644 --- a/src/YAML_parse.f90 +++ b/src/YAML_parse.f90 @@ -414,6 +414,7 @@ recursive subroutine keyValue_toFlow(flow,s_flow,line) offset_value col_pos = index(line,':') + if(line(col_pos+1:col_pos+1) /= ' ') call IO_error(704,ext_msg=line) if(isFlow(line(col_pos+1:))) then d_flow = len_trim(adjustl(line(:col_pos))) flow(s_flow:s_flow+d_flow+1) = trim(adjustl(line(:col_pos)))//' ' From 3f8753ff6a973a9e685343079e60a672864dc6ce Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 13 Jul 2021 20:12:33 +0200 Subject: [PATCH 3/5] [skip ci] updated version information after successful test of v3.0.0-alpha4-59-g442759a09 --- python/damask/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/damask/VERSION b/python/damask/VERSION index caee80c43..cf3b2651e 100644 --- a/python/damask/VERSION +++ b/python/damask/VERSION @@ -1 +1 @@ -v3.0.0-alpha4-10-g0ad4fd00b +v3.0.0-alpha4-59-g442759a09 From c873123e6d445dda080e915d72f29607f3031172 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 13 Jul 2021 20:46:50 +0200 Subject: [PATCH 4/5] reference can now include comments! --- examples/config/phase/Al.yaml | 2 +- examples/config/phase/Au.yaml | 2 +- examples/config/phase/Cu.yaml | 2 +- examples/config/phase/Fe.yaml | 2 +- examples/config/phase/Mg.yaml | 4 ++-- examples/config/phase/Ni.yaml | 2 +- examples/config/phase/Ti.yaml | 4 ++-- examples/config/phase/W.yaml | 2 +- .../phase/mechanical/eigen/thermalexpansion_Al.yaml | 2 +- .../phase/mechanical/eigen/thermalexpansion_Au.yaml | 2 +- .../phase/mechanical/eigen/thermalexpansion_C35E.yaml | 3 ++- .../phase/mechanical/eigen/thermalexpansion_Cu.yaml | 2 +- .../phase/mechanical/eigen/thermalexpansion_Fe.yaml | 2 +- .../config/phase/mechanical/eigen/thermalexpansion_W.yaml | 2 +- .../phase/mechanical/eigen/thermalexpansion_X20Cr13.yaml | 3 ++- examples/config/phase/mechanical/elastic/Hooke_Al.yaml | 4 ++-- examples/config/phase/mechanical/elastic/Hooke_Cu.yaml | 3 ++- examples/config/phase/mechanical/elastic/Hooke_Mg.yaml | 4 ++-- .../config/phase/mechanical/elastic/Hooke_TWIP-steel.yaml | 8 ++++---- examples/config/phase/mechanical/elastic/Hooke_Ti.yaml | 4 ++-- examples/config/phase/mechanical/elastic/Hooke_W.yaml | 4 ++-- .../mechanical/elastic/Hooke_vanishing-Poisson-ratio.yaml | 4 ++-- .../phase/mechanical/plastic/dislotwin_IF-steel.yaml | 4 ++-- .../phase/mechanical/plastic/isotropic_free-surface.yaml | 4 ++-- examples/config/phase/mechanical/plastic/nonlocal_Al.yaml | 3 ++- examples/config/phase/mechanical/plastic/nonlocal_Ni.yaml | 3 ++- .../config/phase/mechanical/plastic/phenopowerlaw_Al.yaml | 4 ++-- .../config/phase/mechanical/plastic/phenopowerlaw_Au.yaml | 8 ++++---- .../config/phase/mechanical/plastic/phenopowerlaw_Cu.yaml | 4 ++-- .../plastic/phenopowerlaw_DP-steel-ferrite.yaml | 4 ++-- .../config/phase/mechanical/plastic/phenopowerlaw_Ti.yaml | 8 ++++---- examples/config/phase/thermal/Al.yaml | 4 ++-- examples/config/phase/thermal/Au.yaml | 2 +- examples/config/phase/thermal/Cu.yaml | 2 +- examples/config/phase/thermal/Steel-0.5C.yaml | 4 ++-- examples/config/phase/thermal/W.yaml | 2 +- 36 files changed, 64 insertions(+), 59 deletions(-) diff --git a/examples/config/phase/Al.yaml b/examples/config/phase/Al.yaml index 57004df14..f3c19924b 100644 --- a/examples/config/phase/Al.yaml +++ b/examples/config/phase/Al.yaml @@ -1,4 +1,4 @@ references: - - en.wikipedia.org/wiki/Aluminium + - https://en.wikipedia.org/wiki/Aluminium lattice: cF rho: 2700.0 diff --git a/examples/config/phase/Au.yaml b/examples/config/phase/Au.yaml index 23c1f30f1..fab05ad99 100644 --- a/examples/config/phase/Au.yaml +++ b/examples/config/phase/Au.yaml @@ -1,4 +1,4 @@ references: - - en.wikipedia.org/wiki/Gold + - https://en.wikipedia.org/wiki/Gold lattice: cF rho: 19300.0 diff --git a/examples/config/phase/Cu.yaml b/examples/config/phase/Cu.yaml index bcf9e8717..f1e1e9e36 100644 --- a/examples/config/phase/Cu.yaml +++ b/examples/config/phase/Cu.yaml @@ -1,4 +1,4 @@ references: - - en.wikipedia.org/wiki/Copper + - https://en.wikipedia.org/wiki/Copper lattice: cF rho: 8960.0 diff --git a/examples/config/phase/Fe.yaml b/examples/config/phase/Fe.yaml index cce09d634..271ff8661 100644 --- a/examples/config/phase/Fe.yaml +++ b/examples/config/phase/Fe.yaml @@ -1,4 +1,4 @@ references: - - en.wikipedia.org/wiki/Iron + - https://en.wikipedia.org/wiki/Iron lattice: cI rho: 7874.0 diff --git a/examples/config/phase/Mg.yaml b/examples/config/phase/Mg.yaml index 84bc9d943..96eb6ad78 100644 --- a/examples/config/phase/Mg.yaml +++ b/examples/config/phase/Mg.yaml @@ -1,7 +1,7 @@ references: - D. Tromans, - International Journal of Recent Research and Applied Studies 6(4)/462-483, 2011, - www.arpapress.com/Volumes/Vol6Issue4/IJRRAS_6_4_14.pdf + International Journal of Recent Research and Applied Studies 6(4):462-483, 2011, + https://www.arpapress.com/Volumes/Vol6Issue4/IJRRAS_6_4_14.pdf lattice: hP c/a: 1.62350 rho: 1740.0 diff --git a/examples/config/phase/Ni.yaml b/examples/config/phase/Ni.yaml index 1f9316118..575984583 100644 --- a/examples/config/phase/Ni.yaml +++ b/examples/config/phase/Ni.yaml @@ -1,4 +1,4 @@ references: - - en.wikipedia.org/wiki/Nickel + - https://en.wikipedia.org/wiki/Nickel lattice: cF rho: 8908.0 diff --git a/examples/config/phase/Ti.yaml b/examples/config/phase/Ti.yaml index a9811786b..48eae3949 100644 --- a/examples/config/phase/Ti.yaml +++ b/examples/config/phase/Ti.yaml @@ -1,6 +1,6 @@ references: - - www.totalmateria.com/page.aspx?ID=CheckArticle&site=ktn&NM=221 - - en.wikipedia.org/wiki/Titanium + - https://www.totalmateria.com/page.aspx?ID=CheckArticle&site=ktn&NM=221 + - https://en.wikipedia.org/wiki/Titanium lattice: hP c/a: 1.587 rho: 4506.0 diff --git a/examples/config/phase/W.yaml b/examples/config/phase/W.yaml index c770bb891..8be7d38a6 100644 --- a/examples/config/phase/W.yaml +++ b/examples/config/phase/W.yaml @@ -1,4 +1,4 @@ references: - - en.wikipedia.org/wiki/Tungsten + - https://en.wikipedia.org/wiki/Tungsten lattice: cF rho: 19300.0 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_Al.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_Al.yaml index aa132609e..b0db392e1 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_Al.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_Al.yaml @@ -1,5 +1,5 @@ type: thermalexpansion references: - - en.wikipedia.org/wiki/Thermal_expansion + - https://en.wikipedia.org/wiki/Thermal_expansion A_11: 23.1e-6 T_ref: 293.15 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_Au.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_Au.yaml index 37699139b..934b4f721 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_Au.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_Au.yaml @@ -1,5 +1,5 @@ type: thermalexpansion references: - - en.wikipedia.org/wiki/Thermal_expansion + - https://en.wikipedia.org/wiki/Thermal_expansion A_11: 14.e-6 T_ref: 293.15 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_C35E.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_C35E.yaml index 64d772512..13d99b0ed 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_C35E.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_C35E.yaml @@ -1,6 +1,7 @@ type: thermalexpansion references: - - en.wikipedia.org/wiki/Thermal_expansion, fitted from image description + - https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg, + fitted from image description (Scilab code) A_11: 12.70371e-6 A_11,T: 7.54e-9 A_11,T^2: -1.0e-11 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_Cu.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_Cu.yaml index 8d64da8e4..4c82421f3 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_Cu.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_Cu.yaml @@ -1,5 +1,5 @@ type: thermalexpansion references: - - en.wikipedia.org/wiki/Thermal_expansion + - https://en.wikipedia.org/wiki/Thermal_expansion A_11: 17.e-6 T_ref: 293.15 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_Fe.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_Fe.yaml index b104e36f5..c0891ea6a 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_Fe.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_Fe.yaml @@ -1,5 +1,5 @@ type: thermalexpansion references: - - en.wikipedia.org/wiki/Thermal_expansion + - https://en.wikipedia.org/wiki/Thermal_expansion A_11: 11.8e-6 T_ref: 293.15 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_W.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_W.yaml index d223cdd7d..427731186 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_W.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_W.yaml @@ -1,5 +1,5 @@ type: thermalexpansion references: - - en.wikipedia.org/wiki/Thermal_expansion + - https://en.wikipedia.org/wiki/Thermal_expansion A_11: 4.5e-6 T_ref: 293.15 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_X20Cr13.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_X20Cr13.yaml index f7c55d485..19b4cb485 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_X20Cr13.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_X20Cr13.yaml @@ -1,6 +1,7 @@ type: thermalexpansion references: - - en.wikipedia.org/wiki/Thermal_expansion, fitted from image description + - https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg + fitted from image description (Scilab code) A_11: 11.365e-6 A_11,T: 5.0e-9 T_ref: 273.0 diff --git a/examples/config/phase/mechanical/elastic/Hooke_Al.yaml b/examples/config/phase/mechanical/elastic/Hooke_Al.yaml index 2aeb2fb8c..6007f7695 100644 --- a/examples/config/phase/mechanical/elastic/Hooke_Al.yaml +++ b/examples/config/phase/mechanical/elastic/Hooke_Al.yaml @@ -1,8 +1,8 @@ type: Hooke references: - J. Vallin et al., - Journal of Applied Physics 35(6)/1825-1826, 1964, - 10.1063/1.1713749 + Journal of Applied Physics 35(6):1825-1826, 1964, + https://doi.org/10.1063/1.1713749 C_11: 107.3e+9 C_12: 60.8e+9 C_44: 28.3e+9 diff --git a/examples/config/phase/mechanical/elastic/Hooke_Cu.yaml b/examples/config/phase/mechanical/elastic/Hooke_Cu.yaml index 71e1d2cd9..7b458a421 100644 --- a/examples/config/phase/mechanical/elastic/Hooke_Cu.yaml +++ b/examples/config/phase/mechanical/elastic/Hooke_Cu.yaml @@ -1,6 +1,7 @@ type: Hooke references: - - www.mit.edu/~6.777/matprops/copper.htm, fixed typo + - https://www.mit.edu/~6.777/matprops/copper.htm, + fixed typo C_11: 168.3e+9 C_12: 122.1e+9 C_44: 75.7e+9 diff --git a/examples/config/phase/mechanical/elastic/Hooke_Mg.yaml b/examples/config/phase/mechanical/elastic/Hooke_Mg.yaml index e068c0583..1e08a94a9 100644 --- a/examples/config/phase/mechanical/elastic/Hooke_Mg.yaml +++ b/examples/config/phase/mechanical/elastic/Hooke_Mg.yaml @@ -1,8 +1,8 @@ type: Hooke references: - D. Tromans, - International Journal of Recent Research and Applied Studies 6(4)/462-483, 2011, - www.arpapress.com/Volumes/Vol6Issue4/IJRRAS_6_4_14.pdf + International Journal of Recent Research and Applied Studies 6(4):462-483, 2011, + https://www.arpapress.com/Volumes/Vol6Issue4/IJRRAS_6_4_14.pdf C_11: 59.3e+9 C_33: 61.5e+9 C_44: 16.4e+9 diff --git a/examples/config/phase/mechanical/elastic/Hooke_TWIP-steel.yaml b/examples/config/phase/mechanical/elastic/Hooke_TWIP-steel.yaml index 2f8686c49..c31589955 100644 --- a/examples/config/phase/mechanical/elastic/Hooke_TWIP-steel.yaml +++ b/examples/config/phase/mechanical/elastic/Hooke_TWIP-steel.yaml @@ -1,11 +1,11 @@ type: Hooke references: - D. Music et al., - Applied Physics Letters 99(19)/191904, 2007, - 10.1063/1.2807677 + Applied Physics Letters 99(19):191904, 2007, + https://doi.org/10.1063/1.2807677 - S.L. Wong et al., - Acta Materialia 118/140-151, 2016, - 10.1016/j.actamat.2016.07.032 + Acta Materialia 118:140-151, 2016, + https://doi.org/10.1016/j.actamat.2016.07.032 C_11: 175.0e+9 C_12: 115.0e+9 C_44: 135.0e+9 diff --git a/examples/config/phase/mechanical/elastic/Hooke_Ti.yaml b/examples/config/phase/mechanical/elastic/Hooke_Ti.yaml index 986fe9f6a..ee8cae0ad 100644 --- a/examples/config/phase/mechanical/elastic/Hooke_Ti.yaml +++ b/examples/config/phase/mechanical/elastic/Hooke_Ti.yaml @@ -1,8 +1,8 @@ type: Hooke references: - L. Wang et al., - Acta Materialia 132/598-610, 2017, - 10.1016/j.actamat.2017.05.015 + Acta Materialia 132:598-610, 2017, + https://doi.org/10.1016/j.actamat.2017.05.015 C_11: 162.4e+9 C_33: 181.6e+9 C_44: 47.2e+9 diff --git a/examples/config/phase/mechanical/elastic/Hooke_W.yaml b/examples/config/phase/mechanical/elastic/Hooke_W.yaml index f6a02502b..49bb7858a 100644 --- a/examples/config/phase/mechanical/elastic/Hooke_W.yaml +++ b/examples/config/phase/mechanical/elastic/Hooke_W.yaml @@ -1,8 +1,8 @@ type: Hooke references: - D. Cereceda et al., - International Journal of Plasticity 78/242-265, 2016, - 10.1016/j.ijplas.2015.09.002 + International Journal of Plasticity 78:242-265, 2016, + https://doi.org/10.1016/j.ijplas.2015.09.002 C_11: 523.e+9 C_12: 202.e+9 C_44: 161.e+9 diff --git a/examples/config/phase/mechanical/elastic/Hooke_vanishing-Poisson-ratio.yaml b/examples/config/phase/mechanical/elastic/Hooke_vanishing-Poisson-ratio.yaml index 23be81615..9a69dda4e 100644 --- a/examples/config/phase/mechanical/elastic/Hooke_vanishing-Poisson-ratio.yaml +++ b/examples/config/phase/mechanical/elastic/Hooke_vanishing-Poisson-ratio.yaml @@ -1,8 +1,8 @@ type: Hooke references: - T. Maiti and P. Eisenlohr, - Scripta Materialia 145/37-40, 2018, - 10.1016/j.scriptamat.2017.09.047 + Scripta Materialia 145:37-40, 2018, + https://doi.org/10.1016/j.scriptamat.2017.09.047 C_11: 1.e+8 C_12: 1.e+6 C_44: 4.95e+7 diff --git a/examples/config/phase/mechanical/plastic/dislotwin_IF-steel.yaml b/examples/config/phase/mechanical/plastic/dislotwin_IF-steel.yaml index a1a8d01be..5478aa869 100644 --- a/examples/config/phase/mechanical/plastic/dislotwin_IF-steel.yaml +++ b/examples/config/phase/mechanical/plastic/dislotwin_IF-steel.yaml @@ -1,8 +1,8 @@ type: dislotwin references: - K. Sedighiani et al., - International Journal of Plasticity 134/102779, 2020, - 10.1016/j.ijplas.2020.102779 + International Journal of Plasticity 134:102779, 2020, + https://doi.org/10.1016/j.ijplas.2020.102779 - K. Sedighiani et al., Mechanics of Materials, submitted output: [rho_dip, rho_mob] diff --git a/examples/config/phase/mechanical/plastic/isotropic_free-surface.yaml b/examples/config/phase/mechanical/plastic/isotropic_free-surface.yaml index 767486c93..fba7effa8 100644 --- a/examples/config/phase/mechanical/plastic/isotropic_free-surface.yaml +++ b/examples/config/phase/mechanical/plastic/isotropic_free-surface.yaml @@ -1,8 +1,8 @@ type: isotropic references: - T. Maiti and P. Eisenlohr, - Scripta Materialia 145/37-40, 2018, - 10.1016/j.scriptamat.2017.09.047 + Scripta Materialia 145:37-40, 2018, + https://doi.org/10.1016/j.scriptamat.2017.09.047 output: [xi] dot_gamma_0: 0.001 n: 20. diff --git a/examples/config/phase/mechanical/plastic/nonlocal_Al.yaml b/examples/config/phase/mechanical/plastic/nonlocal_Al.yaml index 5b25a4631..7ee79f9e5 100644 --- a/examples/config/phase/mechanical/plastic/nonlocal_Al.yaml +++ b/examples/config/phase/mechanical/plastic/nonlocal_Al.yaml @@ -2,7 +2,8 @@ type: nonlocal references: C. Kords, On the role of dislocation transport in the constitutive description of crystal plasticity, - RWTH Aachen 2013 + RWTH Aachen 2013, + http://publications.rwth-aachen.de/record/229993/files/4862.pdf output: [rho_u_ed_pos, rho_b_ed_pos, rho_u_ed_neg, rho_b_ed_neg, rho_u_sc_pos, rho_b_sc_pos, rho_u_sc_neg, rho_b_sc_neg, rho_d_ed, rho_d_sc] N_sl: [12] diff --git a/examples/config/phase/mechanical/plastic/nonlocal_Ni.yaml b/examples/config/phase/mechanical/plastic/nonlocal_Ni.yaml index d10aea1ae..c14b912b1 100644 --- a/examples/config/phase/mechanical/plastic/nonlocal_Ni.yaml +++ b/examples/config/phase/mechanical/plastic/nonlocal_Ni.yaml @@ -2,7 +2,8 @@ type: nonlocal references: C. Kords, On the role of dislocation transport in the constitutive description of crystal plasticity, - RWTH Aachen 2013 + RWTH Aachen 2013, + http://publications.rwth-aachen.de/record/229993/files/4862.pdf output: [rho_u_ed_pos, rho_b_ed_pos, rho_u_ed_neg, rho_b_ed_neg, rho_u_sc_pos, rho_b_sc_pos, rho_u_sc_neg, rho_b_sc_neg, rho_d_ed, rho_d_sc] N_sl: [12] diff --git a/examples/config/phase/mechanical/plastic/phenopowerlaw_Al.yaml b/examples/config/phase/mechanical/plastic/phenopowerlaw_Al.yaml index 67755bc5b..8a0692c9b 100644 --- a/examples/config/phase/mechanical/plastic/phenopowerlaw_Al.yaml +++ b/examples/config/phase/mechanical/plastic/phenopowerlaw_Al.yaml @@ -1,8 +1,8 @@ type: phenopowerlaw references: - W.F. Hosford et al., - Acta Metallurgica 8(3)/187-199, 1960, - 10.1016/0001-6160(60)90127-9, + Acta Metallurgica 8(3):187-199, 1960, + https://doi.org/10.1016/0001-6160(60)90127-9, fitted from Fig. 5 output: [xi_sl, gamma_sl] N_sl: [12] diff --git a/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml b/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml index ab7c00295..b5a034c60 100644 --- a/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml +++ b/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml @@ -1,11 +1,11 @@ type: phenopowerlaw references: - D. Ma et al., - Acta Materialia 103/796-808, 2016, - 10.1016/j.actamat.2015.11.016 + Acta Materialia 103:796-808, 2016, + https://doi.org/10.1016/j.actamat.2015.11.016 - I. Kovács and G.Vörös, - International Journal of Plasticity 12/35-43, 1996, - 10.1016/S0749-6419(95)00043-7 + International Journal of Plasticity 12:35-43, 1996, + https://doi.org/10.1016/S0749-6419(95)00043-7 output: [xi_sl, gamma_sl] N_sl: [12] n_sl: 83.3 diff --git a/examples/config/phase/mechanical/plastic/phenopowerlaw_Cu.yaml b/examples/config/phase/mechanical/plastic/phenopowerlaw_Cu.yaml index df87f1048..23fd38acd 100644 --- a/examples/config/phase/mechanical/plastic/phenopowerlaw_Cu.yaml +++ b/examples/config/phase/mechanical/plastic/phenopowerlaw_Cu.yaml @@ -1,8 +1,8 @@ type: phenopowerlaw references: - T Takeuchi, - Transactions of the Japan Institute of Metals 16(10)/629-640, 1975, - 10.2320/matertrans1960.16.629, + Transactions of the Japan Institute of Metals 16(10):629-640, 1975, + https://doi.org/10.2320/matertrans1960.16.629, fitted from Fig. 3b output: [xi_sl, gamma_sl] N_sl: [12] diff --git a/examples/config/phase/mechanical/plastic/phenopowerlaw_DP-steel-ferrite.yaml b/examples/config/phase/mechanical/plastic/phenopowerlaw_DP-steel-ferrite.yaml index 1b35f2e2f..40812c89d 100644 --- a/examples/config/phase/mechanical/plastic/phenopowerlaw_DP-steel-ferrite.yaml +++ b/examples/config/phase/mechanical/plastic/phenopowerlaw_DP-steel-ferrite.yaml @@ -1,8 +1,8 @@ type: phenopowerlaw references: - C.C. Tasan et al., - Acta Materialia 81/386-400, 2014, - 10.1016/j.actamat.2014.07.071 + Acta Materialia 81:386-400, 2014, + https://doi.org/10.1016/j.actamat.2014.07.071 output: [xi_sl, gamma_sl] N_sl: [12, 12] n_sl: 20 diff --git a/examples/config/phase/mechanical/plastic/phenopowerlaw_Ti.yaml b/examples/config/phase/mechanical/plastic/phenopowerlaw_Ti.yaml index ffb0f161c..5e05206df 100644 --- a/examples/config/phase/mechanical/plastic/phenopowerlaw_Ti.yaml +++ b/examples/config/phase/mechanical/plastic/phenopowerlaw_Ti.yaml @@ -1,11 +1,11 @@ type: phenopowerlaw references: - C. Zambaldi et al., - Journal of Materials Research 27(1)/356-367, 2021, - 10.1557/jmr.2011.334 + Journal of Materials Research 27(1):356-367, 2021, + https://doi.org/10.1557/jmr.2011.334 - L. Wang et al., - Acta Materialia 132/598-610, 2017, - 10.1016/j.actamat.2017.05.015 + Acta Materialia 132:598-610, 2017, + https://doi.org/10.1016/j.actamat.2017.05.015 output: [gamma_sl] N_sl: [3, 3, 0, 0, 12] n_sl: 20 diff --git a/examples/config/phase/thermal/Al.yaml b/examples/config/phase/thermal/Al.yaml index 1f714c743..50273fde3 100644 --- a/examples/config/phase/thermal/Al.yaml +++ b/examples/config/phase/thermal/Al.yaml @@ -1,5 +1,5 @@ references: - - www.engineeringtoolbox.com/thermal-conductivity-metals-d_858.html - - www.engineeringtoolbox.com/specific-heat-metals-d_152.html + - https://www.engineeringtoolbox.com/thermal-conductivity-metals-d_858.html + - https://www.engineeringtoolbox.com/specific-heat-metals-d_152.html C_p: 910.0 K_11: 236.0 diff --git a/examples/config/phase/thermal/Au.yaml b/examples/config/phase/thermal/Au.yaml index f8f4dda4d..43fe9558e 100644 --- a/examples/config/phase/thermal/Au.yaml +++ b/examples/config/phase/thermal/Au.yaml @@ -1,4 +1,4 @@ references: - - de.wikipedia.org/wiki/Gold + - https://de.wikipedia.org/wiki/Gold C_p: 128.0 K_11: 320.0 diff --git a/examples/config/phase/thermal/Cu.yaml b/examples/config/phase/thermal/Cu.yaml index 7f5b89fcc..c171d3245 100644 --- a/examples/config/phase/thermal/Cu.yaml +++ b/examples/config/phase/thermal/Cu.yaml @@ -1,4 +1,4 @@ references: - - www.mit.edu/~6.777/matprops/copper.htm + - https://www.mit.edu/~6.777/matprops/copper.htm C_p: 385.0 K_11: 401.0 diff --git a/examples/config/phase/thermal/Steel-0.5C.yaml b/examples/config/phase/thermal/Steel-0.5C.yaml index 736969e1e..1b1d8995a 100644 --- a/examples/config/phase/thermal/Steel-0.5C.yaml +++ b/examples/config/phase/thermal/Steel-0.5C.yaml @@ -1,5 +1,5 @@ references: - - www.engineeringtoolbox.com/thermal-conductivity-metals-d_858.html - - www.engineeringtoolbox.com/specific-heat-metals-d_152.html + - https://www.engineeringtoolbox.com/thermal-conductivity-metals-d_858.html + - https://www.engineeringtoolbox.com/specific-heat-metals-d_152.html C_p: 490.0 K_11: 54.0 diff --git a/examples/config/phase/thermal/W.yaml b/examples/config/phase/thermal/W.yaml index eba6ab7bc..95918303f 100644 --- a/examples/config/phase/thermal/W.yaml +++ b/examples/config/phase/thermal/W.yaml @@ -1,4 +1,4 @@ references: - - www.mit.edu/~6.777/matprops/tungsten.htm + - https://www.mit.edu/~6.777/matprops/tungsten.htm C_p: 132.51 K_11: 178.0 From 10b75968f07578c04bf280dc5d0512866448cb37 Mon Sep 17 00:00:00 2001 From: Test User Date: Wed, 14 Jul 2021 01:05:25 +0200 Subject: [PATCH 5/5] [skip ci] updated version information after successful test of v3.0.0-alpha4-65-gae3d844e4 --- python/damask/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/damask/VERSION b/python/damask/VERSION index cf3b2651e..a0034a82e 100644 --- a/python/damask/VERSION +++ b/python/damask/VERSION @@ -1 +1 @@ -v3.0.0-alpha4-59-g442759a09 +v3.0.0-alpha4-65-gae3d844e4