Merge branch 'development' into HDF5-out-3

.gitlab-ci.yml

@@ -444,8 +444,6 @@ J2_plasticBehavior:
 grid_all_example:
   stage: example
   script: grid_all_example/test.py
-  only:
-    - development
 
 ###################################################################################################
 SpectralRuntime:

PRIVATE

@@ -1 +1 @@
-Subproject commit c7bc54a26c8b6ed404aabec4653227e93fa028e2
+Subproject commit df55b24d793c0fe71e3a3aaf038ff249e4878d57

VERSION

@@ -1 +1 @@
-v2.0.3-33-g1e20e947
+v2.0.3-36-gbe387ab8

examples/ConfigFiles/Homogenization_Isostrain_Parallel3.config

@@ -1,4 +1,4 @@
 [Parallel3]
-type	isostrain
-Ngrains	3
-mapping	sum		# or 'parallel'
+mech	        isostrain
+nconstituents	3
+mapping	        sum		# or 'parallel'

examples/ConfigFiles/Homogenization_Isostrain_SX.config

@@ -1,3 +1,3 @@
 [SX]
-type	isostrain
-Ngrains	1
+mech	        isostrain
+nconstituents	1

examples/ConfigFiles/Homogenization_Isostrain_Taylor2.config

@@ -1,3 +1,3 @@
 [Taylor2]
-type	isostrain
-Ngrains	2
+mech        	isostrain
+nconstituents	2

examples/ConfigFiles/Homogenization_RGC_8Grains.config

@@ -1,7 +1,7 @@
 [8Grains]
-type			RGC
-Ngrains			8
-clustersize		2	2	2        # product of these numbers must be equal to Ngrains(!)
+mech		    RGC
+nconstituents	8
+clustersize		2	2	2        # product of these numbers must be equal to nconstituents(!)
 clusterorientation	0.0	0.0	0.0      # orientation of cluster in terms of zxz Euler-angles in degree (random if not present)
 # clusterorientation	0.0	26.57	0.0      # [012]
 # clusterorientation	0.0	45.00	0.0      # [011]

examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.config

@@ -14,7 +14,7 @@ elasticity            hooke
 (output)                resolvedstress_twin
 
 lattice_structure       hex
-covera_ratio            1.62350                          # from Tromans 2011, Elastic Anisotropy of HCP Metal Crystals and Polycrystals
+c/a                     1.62350                          # from Tromans 2011, Elastic Anisotropy of HCP Metal Crystals and Polycrystals
 c11                     59.3e9                           #  - " -
 c33                     61.5e9                           #  - " -
 c44                     16.4e9                           #  - " -
@@ -46,9 +46,8 @@ interaction_twinslip    1 1 1 1 1 1 1 1 1 1   1 1 1 1 1 1 1 1 1 1    1 1 1 1
 # open for discussion
 ####################################################
 atol_resistance         1
-atol_shear              0
-atol_twinfrac           0
-
+atol_shear              1e-6
+atol_twinfrac           1e-6
 n_twin                  20
 n_slip                  20
 

examples/SpectralMethod/EshelbyInclusion/runAll.sh

@@ -1,4 +1,4 @@
-#!/usr/local/bin/bash
+#!/usr/bin/env bash
 
 for geom in $(ls geom/*.geom)
 do
@@ -41,14 +41,12 @@ do
      cp geom/${vtr} postProc/${name}_inc${inc}.vtr
      vtk_addRectilinearGridData \
        postProc/${name}_inc${inc}.txt \
-       --inplace \
        --vtk postProc/${name}_inc${inc}.vtr \
        --data 'sph(p)','sph(Cauchy)',temperature \
        --tensor f,fe,fi,fp,p,Cauchy \
       
     vtk_addRectilinearGridData \
       postProc/${name}_inc${inc}_nodal.txt \
-      --inplace \
       --vtk postProc/${name}_inc${inc}.vtr \
       --data 'avg(f).pos','fluct(f).pos' \
 

src/plastic_isotropic.f90

@@ -92,9 +92,6 @@ subroutine plastic_isotropic_init
   use IO, only: &
     IO_error
   use material, only: &
-#ifdef DEBUG
-    phasememberAt, &
-#endif
     phase_plasticity, &
     phase_plasticityInstance, &
     phase_Noutput, &
@@ -103,6 +100,10 @@ subroutine plastic_isotropic_init
     PLASTICITY_ISOTROPIC_ID, &
     material_phase, &
     plasticState
+#ifdef DEBUG
+  use material, only: &
+    phasememberAt
+#endif
   use config, only: &
     config_phase
   use lattice

src/plastic_kinematichardening.f90

@@ -113,9 +113,6 @@ subroutine plastic_kinehardening_init
  use IO, only: &
    IO_error
  use material, only: &
-#ifdef DEBUG
-   phasememberAt, &
-#endif
    phase_plasticity, &
    phase_plasticityInstance, &
    phase_Noutput, &
@@ -124,6 +121,10 @@ subroutine plastic_kinehardening_init
    PLASTICITY_kinehardening_ID, &
    material_phase, &
    plasticState
+#ifdef DEBUG
+ use material, only: &
+   phasememberAt
+#endif
  use config, only: &
    config_phase
  use lattice