under mech dictionary

examples/SpectralMethod/Polycrystal/material.yaml

@@ -108,10 +108,10 @@ material:
 
 phase:
   Aluminum:
-    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
+    mech:
+      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

src/constitutive_plastic.f90

@@ -201,6 +201,7 @@ module subroutine mech_init
   class(tNode), pointer :: &
     phases, &
     phase, &
+    mech, &
     elastic, &
     stiffDegradation
 
@@ -215,13 +216,14 @@ module subroutine mech_init
 
   do p = 1, phases%length
     phase   => phases%get(p)
-    elastic => phase%get('elasticity')
+    mech    => phase%get('mech')
+    elastic => mech%get('elasticity')
     if(elastic%get_asString('type') == 'hooke') then
       phase_elasticity(p) = ELASTICITY_HOOKE_ID
     else
       call IO_error(200,ext_msg=elastic%get_asString('type'))
     endif
-    stiffDegradation => phase%get('stiffness_degradation',defaultVal=emptyList)     ! check for stiffness degradation mechanisms
+    stiffDegradation => mech%get('stiffness_degradation',defaultVal=emptyList)     ! check for stiffness degradation mechanisms
     phase_NstiffnessDegradations(p) = stiffDegradation%length
   enddo
 
@@ -231,7 +233,8 @@ module subroutine mech_init
   if(maxVal(phase_NstiffnessDegradations)/=0) then
     do p = 1, phases%length
       phase => phases%get(p)
-      stiffDegradation => phase%get('stiffness_degradation',defaultVal=emptyList)
+      mech    => phase%get('mech')
+      stiffDegradation => mech%get('stiffness_degradation',defaultVal=emptyList)
       do stiffDegradationCtr = 1, stiffDegradation%length
         if(stiffDegradation%get_asString(stiffDegradationCtr) == 'damage') &
             phase_stiffnessDegradation(stiffDegradationCtr,p) = STIFFNESS_DEGRADATION_damage_ID
@@ -239,10 +242,6 @@ module subroutine mech_init
     enddo
   endif
 
-  do p = 1, phases%length
-    phase_elasticityInstance(p) = count(phase_elasticity(1:p) == phase_elasticity(p))
-  enddo
-
 
   allocate(plasticState(phases%length))
   allocate(phase_plasticity(phases%length),source = PLASTICITY_undefined_ID)
@@ -258,6 +257,7 @@ module subroutine mech_init
   where(plastic_nonlocal_init())          phase_plasticity = PLASTICITY_NONLOCAL_ID
 
   do p = 1, phases%length
+    phase_elasticityInstance(p) = count(phase_elasticity(1:p) == phase_elasticity(p))
     phase_plasticityInstance(p) = count(phase_plasticity(1:p) == phase_plasticity(p))
   enddo
 
@@ -276,6 +276,7 @@ module function plastic_active(plastic_label)  result(active_plastic)
   class(tNode), pointer :: &
     phases, &
     phase, &
+    mech, &
     pl
   integer :: p
 
@@ -283,7 +284,8 @@ module function plastic_active(plastic_label)  result(active_plastic)
   allocate(active_plastic(phases%length), source = .false. )
   do p = 1, phases%length
     phase => phases%get(p)
-    pl => phase%get('plasticity')
+    mech  => phase%get('mech')
+    pl    => mech%get('plasticity')
     if(pl%get_asString('type') == plastic_label) active_plastic(p) = .true.
   enddo
 

src/constitutive_plastic_disloTungsten.f90

@@ -94,6 +94,7 @@ module function plastic_disloTungsten_init() result(myPlasticity)
   class(tNode), pointer :: &
     phases, &
     phase, &
+    mech, &
     pl
 
   print'(/,a)', ' <<<+-  plastic_dislotungsten init  -+>>>'
@@ -115,14 +116,14 @@ module function plastic_disloTungsten_init() result(myPlasticity)
   i = 0
   do p = 1, phases%length
     phase => phases%get(p)
-
+    mech  => phase%get('mech')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &
               dot => dotState(i), &
               stt => state(i), &
               dst => dependentState(i))
-    pl  => phase%get('plasticity')
+    pl  => mech%get('plasticity')
 
 #if defined (__GFORTRAN__)
     prm%output = output_asStrings(pl)

src/constitutive_plastic_dislotwin.f90

@@ -141,6 +141,7 @@ module function plastic_dislotwin_init() result(myPlasticity)
   class(tNode), pointer :: &
     phases, &
     phase, &
+    mech, &
     pl
 
   print'(/,a)', ' <<<+-  plastic_dislotwin init  -+>>>'
@@ -168,14 +169,14 @@ module function plastic_dislotwin_init() result(myPlasticity)
   i = 0
   do p = 1, phases%length
     phase => phases%get(p)
-
+    mech  => phase%get('mech')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &
               dot => dotState(i), &
               stt => state(i), &
               dst => dependentState(i))
-    pl  => phase%get('plasticity')
+    pl  => mech%get('plasticity')
 
 #if defined (__GFORTRAN__)
     prm%output = output_asStrings(pl)

src/constitutive_plastic_isotropic.f90

@@ -65,6 +65,7 @@ module function plastic_isotropic_init() result(myPlasticity)
   class(tNode), pointer :: &
     phases, &
     phase, &
+    mech, &
     pl
 
   print'(/,a)', ' <<<+-  plastic_isotropic init  -+>>>'
@@ -85,13 +86,13 @@ module function plastic_isotropic_init() result(myPlasticity)
   i = 0
   do p = 1, phases%length
     phase => phases%get(p)
-
+    mech  => phase%get('mech')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &
               dot => dotState(i), &
               stt => state(i))
-    pl  => phase%get('plasticity')
+    pl  => mech%get('plasticity')
 
 
 #if defined (__GFORTRAN__)

src/constitutive_plastic_kinehardening.f90

@@ -77,6 +77,7 @@ module function plastic_kinehardening_init() result(myPlasticity)
   class(tNode), pointer :: &
     phases, &
     phase, &
+    mech, &
     pl
 
   print'(/,a)', ' <<<+-  plastic_kinehardening init  -+>>>'
@@ -95,14 +96,14 @@ module function plastic_kinehardening_init() result(myPlasticity)
   i = 0
   do p = 1, phases%length
     phase => phases%get(p)
-
+    mech  => phase%get('mech')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &
               dot => dotState(i), &
               dlt => deltaState(i), &
               stt => state(i))
-    pl  => phase%get('plasticity')
+    pl  => mech%get('plasticity')
 
 #if defined (__GFORTRAN__)
     prm%output = output_asStrings(pl)

src/constitutive_plastic_none.f90

@@ -22,6 +22,7 @@ module function plastic_none_init() result(myPlasticity)
   class(tNode), pointer :: &
     phases, &
     phase, &
+    mech, &
     pl
 
   print'(/,a)', ' <<<+-  plastic_none init  -+>>>'
@@ -30,7 +31,8 @@ module function plastic_none_init() result(myPlasticity)
   allocate(myPlasticity(phases%length), source = .false.)
   do p = 1, phases%length
     phase => phases%get(p)
-    pl => phase%get('plasticity')
+    mech  => phase%get('mech')
+    pl    => mech%get ('plasticity')
     if(pl%get_asString('type') == 'none') myPlasticity(p) = .true.
   enddo
 

src/constitutive_plastic_nonlocal.f90

@@ -183,6 +183,7 @@ module function plastic_nonlocal_init() result(myPlasticity)
   class(tNode), pointer :: &
     phases, &
     phase, &
+    mech, &
     pl
 
   print'(/,a)', ' <<<+-  plastic_nonlocal init  -+>>>'
@@ -212,7 +213,7 @@ module function plastic_nonlocal_init() result(myPlasticity)
   i = 0
   do p = 1, phases%length
     phase => phases%get(p)
-
+    mech  => phase%get('mech')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &
@@ -221,7 +222,7 @@ module function plastic_nonlocal_init() result(myPlasticity)
               st0 => state0(i), &
               del => deltaState(i), &
               dst => microstructure(i))
-    pl  => phase%get('plasticity')
+    pl  => mech%get('plasticity')
 
     phase_localPlasticity(p)    = .not. pl%contains('nonlocal')
 

src/constitutive_plastic_phenopowerlaw.f90

@@ -86,6 +86,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity)
   class(tNode), pointer :: &
     phases, &
     phase, &
+    mech, &
     pl
 
   print'(/,a)', ' <<<+-  plastic_phenopowerlaw init  -+>>>'
@@ -103,13 +104,13 @@ module function plastic_phenopowerlaw_init() result(myPlasticity)
   i = 0
   do p = 1, phases%length
     phase => phases%get(p)
-
+    mech  => phase%get('mech')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &
               dot => dotState(i), &
               stt => state(i))
-    pl  => phase%get('plasticity')
+    pl  => mech%get('plasticity')
 
 !--------------------------------------------------------------------------------------------------
 ! slip related parameters

src/crystallite.f90

@@ -150,7 +150,7 @@ subroutine crystallite_init
     debug_crystallite, &                                                                            ! pointer to debug options for crystallite
     phases, &
     phase, &
-    generic_param
+    mech
 
   print'(/,a)', ' <<<+-  crystallite init  -+>>>'
 
@@ -240,11 +240,11 @@ subroutine crystallite_init
   allocate(output_constituent(phases%length))
   do c = 1, phases%length
     phase => phases%get(c)
-    generic_param  => phase%get('generic',defaultVal = emptyDict)
+    mech  => phase%get('mech',defaultVal = emptyDict)
 #if defined(__GFORTRAN__)
-    output_constituent(c)%label  = output_asStrings(generic_param)
+    output_constituent(c)%label  = output_asStrings(mech)
 #else
-    output_constituent(c)%label  = generic_param%get_asStrings('output',defaultVal=emptyStringArray)
+    output_constituent(c)%label  = mech%get_asStrings('output',defaultVal=emptyStringArray)
 #endif
   enddo
 

src/lattice.f90

@@ -455,6 +455,7 @@ subroutine lattice_init
   class(tNode), pointer :: &
     phases, &
     phase, &
+    mech, &
     elasticity
  
   print'(/,a)', ' <<<+-  lattice init  -+>>>'; flush(IO_STDOUT)
@@ -475,7 +476,8 @@ subroutine lattice_init
 
   do p = 1, phases%length
     phase => phases%get(p)
-    elasticity => phase%get('elasticity')
+    mech  => phase%get('mech')
+    elasticity => mech%get('elasticity')
     lattice_C66(1,1,p) = elasticity%get_asFloat('C_11')
     lattice_C66(1,2,p) = elasticity%get_asFloat('C_12')