mech --> mechanics

PRIVATE

@@ -1 +1 @@
-Subproject commit 2105ed1c6e4800050010ca4d73b1882022f81551
+Subproject commit 3af7a36cc6b34f24aa6ce5b1e055631d8459a7f7

examples/SpectralMethod/Polycrystal/material.yaml

@@ -2,7 +2,7 @@
 homogenization:
   SX:
     N_constituents: 1
-    mech: {type: none}
+    mechanics: {type: none}
 
 material:
   - homogenization: SX
@@ -109,7 +109,7 @@ material:
 phase:
   Aluminum:
     lattice: fcc
-    mech:
+    mechanics:
       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:

examples/SpectralMethod/Polycrystal/shearXY.yaml

@@ -1,5 +1,5 @@
 step:
-  - mech:
+  - mechanics:
       dot_F: [0,    0, 0,
               1e-3, 0, 0,
               0,    0, 0]

examples/SpectralMethod/Polycrystal/shearZX.yaml

@@ -1,6 +1,6 @@
 ---
 step:
-  - mech:
+  - mechanics:
       dot_F: [0, 0, 1e-3,
               0, 0,    0,
               0, 0,    0]

examples/SpectralMethod/Polycrystal/tensionX.yaml

@@ -1,7 +1,7 @@
 ---
 
 step:
-  - mech:
+  - mechanics:
       dot_F: [1.0e-3, 0, 0,
               0,      x, 0,
               0,      0, x]
@@ -12,7 +12,7 @@ step:
       t: 10
       N: 40
       f_out: 4
-  - mech:
+  - mechanics:
       dot_F: [1.0e-3, 0, 0,
               0,      x, 0,
               0,      0, x]

src/constitutive_mech.f90

@@ -217,7 +217,7 @@ module subroutine mech_init
 
   do p = 1, phases%length
     phase   => phases%get(p)
-    mech    => phase%get('mech')
+    mech    => phase%get('mechanics')
     elastic => mech%get('elasticity')
     if(elastic%get_asString('type') == 'hooke') then
       phase_elasticity(p) = ELASTICITY_HOOKE_ID
@@ -234,7 +234,7 @@ module subroutine mech_init
   if(maxVal(phase_NstiffnessDegradations)/=0) then
     do p = 1, phases%length
       phase => phases%get(p)
-      mech    => phase%get('mech')
+      mech    => phase%get('mechanics')
       stiffDegradation => mech%get('stiffness_degradation',defaultVal=emptyList)
       do stiffDegradationCtr = 1, stiffDegradation%length
         if(stiffDegradation%get_asString(stiffDegradationCtr) == 'damage') &
@@ -285,7 +285,7 @@ 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)
-    mech  => phase%get('mech')
+    mech  => phase%get('mechanics')
     pl    => mech%get('plasticity')
     if(pl%get_asString('type') == plastic_label) active_plastic(p) = .true.
   enddo

src/constitutive_plastic_disloTungsten.f90

@@ -116,7 +116,7 @@ module function plastic_disloTungsten_init() result(myPlasticity)
   i = 0
   do p = 1, phases%length
     phase => phases%get(p)
-    mech  => phase%get('mech')
+    mech  => phase%get('mechanics')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &

src/constitutive_plastic_dislotwin.f90

@@ -169,7 +169,7 @@ module function plastic_dislotwin_init() result(myPlasticity)
   i = 0
   do p = 1, phases%length
     phase => phases%get(p)
-    mech  => phase%get('mech')
+    mech  => phase%get('mechanics')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &

src/constitutive_plastic_isotropic.f90

@@ -86,7 +86,7 @@ module function plastic_isotropic_init() result(myPlasticity)
   i = 0
   do p = 1, phases%length
     phase => phases%get(p)
-    mech  => phase%get('mech')
+    mech  => phase%get('mechanics')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &

src/constitutive_plastic_kinehardening.f90

@@ -96,7 +96,7 @@ module function plastic_kinehardening_init() result(myPlasticity)
   i = 0
   do p = 1, phases%length
     phase => phases%get(p)
-    mech  => phase%get('mech')
+    mech  => phase%get('mechanics')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &

src/constitutive_plastic_none.f90

@@ -31,7 +31,7 @@ module function plastic_none_init() result(myPlasticity)
   allocate(myPlasticity(phases%length), source = .false.)
   do p = 1, phases%length
     phase => phases%get(p)
-    mech  => phase%get('mech')
+    mech  => phase%get('mechanics')
     pl    => mech%get ('plasticity')
     if(pl%get_asString('type') == 'none') myPlasticity(p) = .true.
   enddo

src/constitutive_plastic_nonlocal.f90

@@ -213,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')
+    mech  => phase%get('mechanics')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &

src/constitutive_plastic_phenopowerlaw.f90

@@ -104,7 +104,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity)
   i = 0
   do p = 1, phases%length
     phase => phases%get(p)
-    mech  => phase%get('mech')
+    mech  => phase%get('mechanics')
     if(.not. myPlasticity(p)) cycle
     i = i + 1
     associate(prm => param(i), &

src/crystallite.f90

@@ -240,7 +240,7 @@ subroutine crystallite_init
   allocate(output_constituent(phases%length))
   do c = 1, phases%length
     phase => phases%get(c)
-    mech  => phase%get('mech',defaultVal = emptyDict)
+    mech  => phase%get('mechanics',defaultVal = emptyDict)
 #if defined(__GFORTRAN__)
     output_constituent(c)%label  = output_asStrings(mech)
 #else
@@ -739,7 +739,7 @@ subroutine crystallite_results
   character(len=:), allocatable                 :: group,structureLabel
 
   do p=1,size(material_name_phase)
-    group = trim('current/constituent')//'/'//trim(material_name_phase(p))//'/generic'
+    group = trim('current/constituent')//'/'//trim(material_name_phase(p))//'/mechanics'
 
     call results_closeGroup(results_addGroup(group))
 

src/grid/DAMASK_grid.f90

@@ -176,7 +176,7 @@ program DAMASK_grid
 
     load_step => load_steps%get(l)
 
-    step_mech => load_step%get('mech')
+    step_mech => load_step%get('mechanics')
     loadCases(l)%stress%myType='P'
     readMech: do m = 1, step_mech%length
       select case (step_mech%getKey(m))

src/homogenization_mech_RGC.f90

@@ -145,7 +145,7 @@ module subroutine mech_RGC_init(num_homogMech)
   do h = 1, size(homogenization_type)
     if (homogenization_type(h) /= HOMOGENIZATION_RGC_ID) cycle
     homog => material_homogenization%get(h)
-    homogMech => homog%get('mech')
+    homogMech => homog%get('mechanics')
     associate(prm => param(homogenization_typeInstance(h)), &
               stt => state(homogenization_typeInstance(h)), &
               st0 => state0(homogenization_typeInstance(h)), &

src/homogenization_mech_isostrain.f90

@@ -48,7 +48,7 @@ module subroutine mech_isostrain_init
   do h = 1, size(homogenization_type)
     if (homogenization_type(h) /= HOMOGENIZATION_ISOSTRAIN_ID) cycle
     homog => material_homogenization%get(h)
-    homogMech => homog%get('mech')
+    homogMech => homog%get('mechanics')
     associate(prm => param(homogenization_typeInstance(h)))
 
     prm%N_constituents = homogenization_Nconstituents(h)

src/kinematics_slipplane_opening.f90

@@ -63,7 +63,7 @@ module function kinematics_slipplane_opening_init(kinematics_length) result(myKi
   do p = 1, phases%length
     if(any(myKinematics(:,p))) kinematics_slipplane_opening_instance(p) = count(myKinematics(:,1:p))
     phase => phases%get(p)
-    mech  => phase%get('mech')
+    mech  => phase%get('mechanics')
     pl    => mech%get('plasticity')
     if(count(myKinematics(:,p)) == 0) cycle
     kinematics => phase%get('kinematics')

src/lattice.f90

@@ -476,7 +476,7 @@ subroutine lattice_init
 
   do p = 1, phases%length
     phase => phases%get(p)
-    mech  => phase%get('mech')
+    mech  => phase%get('mechanics')
     elasticity => mech%get('elasticity')
     lattice_C66(1,1,p) = elasticity%get_asFloat('C_11')
     lattice_C66(1,2,p) = elasticity%get_asFloat('C_12')

src/material.f90

@@ -226,7 +226,7 @@ subroutine material_parseHomogenization
 
   do h=1, size(material_name_homogenization)
     homog => material_homogenization%get(h)
-    homogMech => homog%get('mech')
+    homogMech => homog%get('mechanics')
     select case (homogMech%get_asString('type'))
       case('none')
         homogenization_type(h) = HOMOGENIZATION_NONE_ID

src/source_damage_anisoDuctile.f90

@@ -60,7 +60,7 @@ module function source_damage_anisoDuctile_init(source_length) result(mySources)
     phase => phases%get(p)
     if(any(mySources(:,p))) source_damage_anisoDuctile_instance(p) = count(mySources(:,1:p))
     if(count(mySources(:,p)) == 0) cycle
-    mech  => phase%get('mech')
+    mech  => phase%get('mechanics')
     pl    => mech%get('plasticity')
     sources => phase%get('source')
     do sourceOffset = 1, sources%length