consistent names for keys

examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml

@@ -1,8 +1,8 @@
 TWIP_Steel_FeMnC:
   lattice: cF
-  mechanics:
-    elasticity: {type: hooke, C_11: 175.0e9, C_12: 115.0e9, C_44: 135.0e9}
-    plasticity:
+  mechanical:
+    elastic: {type: hooke, C_11: 175.0e9, C_12: 115.0e9, C_44: 135.0e9}
+    plastic:
       type: dislotwin
       output: [rho_mob, rho_dip, gamma_sl, Lambda_sl, tau_pass, f_tw, Lambda_tw, tau_hat_tw, f_tr]
       D: 2.0e-5

examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml

@@ -1,8 +1,8 @@
 Tungsten:
   lattice: cI
-  mechanics:
-    elasticity: {type: hooke, C_11: 523.0e9, C_12: 202.0e9, C_44: 161.0e9} # Marinica et al. Journal of Physics: Condensed Matter(2013)
-    plasticity:
+  mechanical:
+    elastic: {type: hooke, C_11: 523.0e9, C_12: 202.0e9, C_44: 161.0e9} # Marinica et al. Journal of Physics: Condensed Matter(2013)
+    plastic:
       type: dislotwin
       D: 2.0e-5              # Average grain size / m
       N_sl: [12]

examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.yaml

@@ -1,10 +1,10 @@
 # Kuo, J. C., Mikrostrukturmechanik von Bikristallen mit Kippkorngrenzen. Shaker-Verlag 2004. http://edoc.mpg.de/204079
 Aluminum:
   lattice: aP
-  mechanics:
+  mechanical:
     output: [F, P, F_e, F_p, L_p]
-    elasticity: {type: hooke, C_11: 110.9e9, C_12: 58.34e9}
-    plasticity:
+    elastic: {type: hooke, C_11: 110.9e9, C_12: 58.34e9}
+    plastic:
       type: isotropic
       output: [xi]
       xi_0: 31e6

examples/ConfigFiles/Phase_Isotropic_FreeSurface.yaml

@@ -1,9 +1,9 @@
-Air:
+FreeSurface:
   lattice: aP
-  mechanics:
+  mechanical:
     output: [F, P, F_e, F_p, L_p]
-    elasticity: {type: hooke, C_11: 1e8, C_12: 1e6}
-    plasticity:
+    elastic: {type: hooke, C_11: 1e8, C_12: 1e6}
+    plastic:
       type: isotropic
       output: [xi]
       xi_0: 0.3e6

examples/ConfigFiles/Phase_Phenopowerlaw_Aluminum.yaml

@@ -1,9 +1,9 @@
 Aluminum:
   lattice: cF
-  mechanics:
+  mechanical:
     output: [F, P, F_e, F_p, L_p, O]
-    elasticity: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke}
-    plasticity:
+    elastic: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke}
+    plastic:
       N_sl: [12]
       a_sl: 2.25
       dot_gamma_0_sl: 0.001

examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Ferrite.yaml

@@ -3,9 +3,9 @@
 # Diehl et.al. 2015 Meccanica
 Ferrite:
   lattice: cI
-  mechanics:
-    elasticity: {C_11: 233.3e9, C_12: 135.5e9, C_44: 118.0e9, type: hooke}
-    plasticity:
+  mechanical:
+    elastic: {C_11: 233.3e9, C_12: 135.5e9, C_44: 118.0e9, type: hooke}
+    plastic:
       N_sl: [12, 12]
       a_sl: 2.0
       dot_gamma_0_sl: 0.001

examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Martensite.yaml

@@ -3,9 +3,9 @@
 # Diehl et.al. 2015 Meccanica
 Martensite:
   lattice: cI
-  mechanics:
-    elasticity: {C_11: 417.4e9, C_12: 242.4e9, C_44: 211.1e9, type: hooke}
-    plasticity:
+  mechanical:
+    elastic: {C_11: 417.4e9, C_12: 242.4e9, C_44: 211.1e9, type: hooke}
+    plastic:
       N_sl: [12, 12]
       a_sl: 2.0
       dot_gamma_0_sl: 0.001

examples/ConfigFiles/Phase_Phenopowerlaw_Gold.yaml

@@ -5,10 +5,10 @@
 
 Gold:
   lattice: cF
-  mechanics:
+  mechanical:
     output: [F, P, F_e, F_p, L_p, O]
-    elasticity: {type: hooke, C_11: 191e9, C_12: 162e9, C_44: 42.2e9}
-    plasticity:
+    elastic: {type: hooke, C_11: 191e9, C_12: 162e9, C_44: 42.2e9}
+    plastic:
       type: phenopowerlaw
       output: [xi_sl]
       N_sl: [12]

examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.yaml

@@ -2,10 +2,10 @@
 Magnesium:
   lattice: hP
   c/a: 1.62350
-  mechanics:
+  mechanical:
     output: [F, P, F_e, F_p, L_p, O]
-    elasticity: {C_11: 59.3e9, C_12: 25.7e9, C_13: 21.4e9, C_33: 61.5e9, C_44: 16.4e9, type: hooke}
-    plasticity:
+    elastic: {C_11: 59.3e9, C_12: 25.7e9, C_13: 21.4e9, C_33: 61.5e9, C_44: 16.4e9, type: hooke}
+    plastic:
       N_sl: [3, 3, 0, 6, 0, 6]
       N_tw: [6, 0, 0, 6]
       h_0_tw_tw: 50.0e6
@@ -20,9 +20,6 @@ Magnesium:
       xi_0_sl: [10.0e6, 55.0e6, 0, 60.0e6, 0.0, 60.0e6]
       xi_inf_sl: [40.0e6, 135.0e6, 0, 150.0e6, 0.0, 150.0e6]
       xi_0_tw: [40e6, 0.0, 0.0, 60.0e6]
-####################################################
-# open for discussion
-####################################################
       a_sl: 2.25
       dot_gamma_0_sl: 0.001
       dot_gamma_0_tw: 0.001

examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml

@@ -4,10 +4,10 @@
 cpTi:
   lattice: hP
   c/a: 1.587
-  mechanics:
+  mechanical:
     output: [F, P, F_e, F_p, L_p, O]
-    elasticity: {C_11: 160.0e9, C_12: 90.0e9, C_13: 66.0e9, C_33: 181.7e9, C_44: 46.5e9, type: hooke}
-    plasticity:
+    elastic: {C_11: 160.0e9, C_12: 90.0e9, C_13: 66.0e9, C_33: 181.7e9, C_44: 46.5e9, type: hooke}
+    plastic:
       N_sl: [3, 3, 0, 6, 12]
       a_sl: 2.0
       dot_gamma_0_sl: 0.001

examples/grid/material.yaml

@@ -2,7 +2,7 @@
 homogenization:
   SX:
     N_constituents: 1
-    mechanics: {type: pass}
+    mechanical: {type: pass}
 
 material:
   - homogenization: SX
@@ -109,10 +109,10 @@ material:
 phase:
   Aluminum:
     lattice: cF
-    mechanics:
+    mechanical:
       output: [F, P, F_e, F_p, L_p, O]
-      elasticity: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke}
-      plasticity:
+      elastic: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke}
+      plastic:
         N_sl: [12]
         a_sl: 2.25
         atol_xi: 1.0