orientation --> O

2020-10-01 14:01:50 +02:00 · 2020-10-01 14:01:50 +02:00 · 33b0181286
parent 776901cb81
commit 33b0181286
3 changed files with 23 additions and 23 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8f27fc91ca757a1dfdfd04892708af7e94941ef9
+Subproject commit 28e7fb09f06ec324841eac1670ebdcbd8aab4ef3
--- a/examples/SpectralMethod/Polycrystal/material.yaml
+++ b/examples/SpectralMethod/Polycrystal/material.yaml
@ -5,102 +5,102 @@ homogenization:
 material:
  - constituents:
      - fraction: 1.0
-        orientation: [1.0, 0.0, 0.0, 0.0]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [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]
+        O: [0.7729330445886478, 0.21682179052722322, -0.5207379472917645, 0.2905078484066341]
        phase: Aluminum
    homogenization: SX

--- a/src/material.f90
+++ b/src/material.f90
@ -97,7 +97,7 @@ module material
    material_orientation0                                                                           !< initial orientation of each grain,IP,element

  integer, dimension(:), allocatable, private :: &
-    material_Nconstituents                                                                    !< number of constituents in each material
+    material_Nconstituents                                                                          !< number of constituents in each material



@ -385,7 +385,7 @@ subroutine material_parseMicrostructure
        counterPhase(material_phaseAt(c,e)) = counterPhase(material_phaseAt(c,e)) + 1
        material_phaseMemberAt(c,i,e)       = counterPhase(material_phaseAt(c,e))
        
-        call material_orientation0(c,i,e)%fromQuaternion(constituent%get_asFloats('orientation',requiredSize=4))
+        call material_orientation0(c,i,e)%fromQuaternion(constituent%get_asFloats('O',requiredSize=4))
      enddo
    
    enddo