new format of material.yaml

python/tests/reference/ConfigMaterial/material.yaml

@@ -33,12 +33,12 @@ material:
 
 phase:
   Aluminum:
-    elasticity: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke}
-    generic:
-      output: [F, P, Fe, Fp, Lp]
     lattice: fcc
-  Steel:
+    mech:
-    elasticity: {C_11: 233.3e9, C_12: 135.5e9, C_44: 118.0e9, type: hooke}
-    generic:
       output: [F, P, Fe, Fp, Lp]
+      elasticity: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke}
+  Steel:
     lattice: bcc
+    mech:
+      output: [F, P, Fe, Fp, Lp]
+      elasticity: {C_11: 233.3e9, C_12: 135.5e9, C_44: 118.0e9, type: hooke}

python/tests/reference/Result/material.yaml

@@ -6,39 +6,39 @@ homogenization:
 
 phase:
   pheno_fcc:
-    elasticity: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke}
-    generic:
-      output: [F, P, F_e, F_p, L_p, O]
     lattice: fcc
-    plasticity:
+    mech:
-      N_sl: [12]
-      a_sl: 2.25
-      atol_xi: 1.0
-      dot_gamma_0_sl: 0.001
-      h_0_sl_sl: 75e6
-      h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4]
-      n_sl: 20
-      output: [xi_sl]
-      type: phenopowerlaw
-      xi_0_sl: [31e6]
-      xi_inf_sl: [63e6]
-  pheno_bcc:
-    elasticity: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke}
-    generic:
       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:
+        N_sl: [12]
+        a_sl: 2.25
+        atol_xi: 1.0
+        dot_gamma_0_sl: 0.001
+        h_0_sl_sl: 75e6
+        h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4]
+        n_sl: 20
+        output: [xi_sl]
+        type: phenopowerlaw
+        xi_0_sl: [31e6]
+        xi_inf_sl: [63e6]
+  pheno_bcc:
     lattice: bcc
-    plasticity:
+    mech:
-      N_sl: [12]
+      output: [F, P, F_e, F_p, L_p, O]
-      a_sl: 2.25
+      elasticity: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke}
-      atol_xi: 1.0
+      plasticity:
-      dot_gamma_0_sl: 0.001
+        N_sl: [12]
-      h_0_sl_sl: 75e6
+        a_sl: 2.25
-      h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4]
+        atol_xi: 1.0
-      n_sl: 20
+        dot_gamma_0_sl: 0.001
-      output: [xi_sl]
+        h_0_sl_sl: 75e6
-      type: phenopowerlaw
+        h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4]
-      xi_0_sl: [31e6]
+        n_sl: 20
-      xi_inf_sl: [63e6]
+        output: [xi_sl]
+        type: phenopowerlaw
+        xi_0_sl: [31e6]
+        xi_inf_sl: [63e6]
 
 material:
   - constituents: