nice formatting

will be checked by pre-receive hook
2020-09-30 08:15:02 +02:00 · 2020-09-30 08:15:02 +02:00 · bbed4f9c6e
parent b383a4530e
commit bbed4f9c6e
2 changed files with 108 additions and 107 deletions
--- a/examples/SpectralMethod/Polycrystal/material.yaml
+++ b/examples/SpectralMethod/Polycrystal/material.yaml
@ -1,107 +1,109 @@
 homogenization:
  SX:
    mech: {type: none}
+
 microstructure:
- constituents:
-  - fraction: 1.0
-    orientation: [1.0, 0.0, 0.0, 0.0]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.7936696712125002, -0.28765777461664166, -0.3436487135089419, 0.4113964260949434]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.3986143167493579, -0.7014883552495493, 0.2154871765709027, 0.5500781677772945]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.28645844315788244, -0.022571491243423537, -0.467933059311115, -0.8357456192708106]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.33012772942625784, -0.6781865350268957, 0.6494525351030648, 0.09638521992649676]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.43596817439583935, -0.5982537129781701, 0.046599032277502436, 0.6707106499919265]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.169734823419553, -0.699615227367322, -0.6059581215838098, -0.33844257746495854]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.9698864809294915, 0.1729052643205874, -0.15948307917616958, 0.06315956884687175]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.46205660912967883, 0.3105054068891252, -0.617849551030653, 0.555294529545738]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.4512443497461787, -0.7636045534540555, -0.04739348426715133, -0.45939142396805815]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.2161856212656443, -0.6581450184826598, -0.5498086209601588, 0.4667112513346289]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.8753220715350803, -0.4561599367657419, -0.13298279533852678, -0.08969369719975541]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.11908260752431069, 0.18266024809834172, -0.7144822594012615, -0.664807992845101]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.751104669484278, 0.5585633382623958, -0.34579336397009175, 0.06538900566860861]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.08740438971703973, 0.8991264096610437, -0.4156704205935976, 0.10559485570696363]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.5584325870096193, 0.6016408353068798, -0.14280340445801173, 0.5529814994483859]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.4052725440888093, 0.25253073423599154, 0.5693263597910454, -0.669215876471182]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.7570164606888676, 0.15265448024694664, -0.5998021466848317, 0.20942796551297105]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.6987659297138081, -0.132172211261028, -0.19693254724422338, 0.6748883269678543]
-    phase: Aluminum
-  homogenization: SX
- constituents:
-  - fraction: 1.0
-    orientation: [0.7729330445886478, 0.21682179052722322, -0.5207379472917645, 0.2905078484066341]
-    phase: Aluminum
-  homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [1.0, 0.0, 0.0, 0.0]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.7936696712125002, -0.28765777461664166, -0.3436487135089419, 0.4113964260949434]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.3986143167493579, -0.7014883552495493, 0.2154871765709027, 0.5500781677772945]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.28645844315788244, -0.022571491243423537, -0.467933059311115, -0.8357456192708106]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.33012772942625784, -0.6781865350268957, 0.6494525351030648, 0.09638521992649676]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.43596817439583935, -0.5982537129781701, 0.046599032277502436, 0.6707106499919265]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.169734823419553, -0.699615227367322, -0.6059581215838098, -0.33844257746495854]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.9698864809294915, 0.1729052643205874, -0.15948307917616958, 0.06315956884687175]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.46205660912967883, 0.3105054068891252, -0.617849551030653, 0.555294529545738]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.4512443497461787, -0.7636045534540555, -0.04739348426715133, -0.45939142396805815]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.2161856212656443, -0.6581450184826598, -0.5498086209601588, 0.4667112513346289]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.8753220715350803, -0.4561599367657419, -0.13298279533852678, -0.08969369719975541]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.11908260752431069, 0.18266024809834172, -0.7144822594012615, -0.664807992845101]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.751104669484278, 0.5585633382623958, -0.34579336397009175, 0.06538900566860861]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.08740438971703973, 0.8991264096610437, -0.4156704205935976, 0.10559485570696363]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.5584325870096193, 0.6016408353068798, -0.14280340445801173, 0.5529814994483859]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.4052725440888093, 0.25253073423599154, 0.5693263597910454, -0.669215876471182]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.7570164606888676, 0.15265448024694664, -0.5998021466848317, 0.20942796551297105]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.6987659297138081, -0.132172211261028, -0.19693254724422338, 0.6748883269678543]
+        phase: Aluminum
+    homogenization: SX
+  - constituents:
+      - fraction: 1.0
+        orientation: [0.7729330445886478, 0.21682179052722322, -0.5207379472917645, 0.2905078484066341]
+        phase: Aluminum
+    homogenization: SX
+
 phase:
  Aluminum:
    elasticity: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke}
@ -117,7 +119,6 @@ phase:
      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]
-      type: phenopowerlaw
-
--- a/python/tests/reference/ConfigMaterial/material.yaml
+++ b/python/tests/reference/ConfigMaterial/material.yaml
@ -2,7 +2,7 @@ homogenization:
  SX:
    mech: {type: none}
  Taylor:
-    mech: {type: isostrain, N_constituents: 2}
+    mech: {N_constituents: 2, type: isostrain}

 microstructure:
  - constituents:
@ -20,14 +20,14 @@ microstructure:
        orientation: [0.3986143167493579, -0.7014883552495493, 0.2154871765709027, 0.5500781677772945]
        phase: Aluminum
    homogenization: SX
-  - homogenization: Taylor
-    constituents:
-      - fraction: .5
+  - constituents:
+      - fraction: 0.5
        orientation: [0.28645844315788244, -0.022571491243423537, -0.467933059311115, -0.8357456192708106]
        phase: Aluminum
-      - fraction: .5
+      - fraction: 0.5
        orientation: [0.3986143167493579, -0.7014883552495493, 0.2154871765709027, 0.5500781677772945]
        phase: Steel
+    homogenization: Taylor

 phase:
  Aluminum: