223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development' into HDF5-out-3

This commit is contained in:
Martin Diehl 2019-04-05 21:50:19 +02:00
parent 7c30be47b0 8cc2a540f1
commit ccaea6b9d9
11 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

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

2
PRIVATE

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

2
VERSION
View File

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

6
examples/ConfigFiles/Homogenization_Isostrain_Parallel3.config
View File

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

4
examples/ConfigFiles/Homogenization_Isostrain_SX.config
View File

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

4
examples/ConfigFiles/Homogenization_Isostrain_Taylor2.config
View File

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

6
examples/ConfigFiles/Homogenization_RGC_8Grains.config
View File

@ -1,7 +1,7 @@
[8Grains] [8Grains]
type RGC mech RGC
Ngrains 8 nconstituents 8
clustersize 2 2 2 # product of these numbers must be equal to Ngrains(!) 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 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 26.57 0.0 # [012]
# clusterorientation 0.0 45.00 0.0 # [011] # clusterorientation 0.0 45.00 0.0 # [011]

7
examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.config
View File

@ -14,7 +14,7 @@ elasticity hooke
(output) resolvedstress_twin (output) resolvedstress_twin
lattice_structure hex 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 # - " - c11 59.3e9 # - " -
c33 61.5e9 # - " - c33 61.5e9 # - " -
c44 16.4e9 # - " - 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 # open for discussion
#################################################### ####################################################
atol_resistance 1 atol_resistance 1
atol_shear 0 atol_shear 1e-6
atol_twinfrac 0 atol_twinfrac 1e-6
n_twin 20 n_twin 20
n_slip 20 n_slip 20

4
examples/SpectralMethod/EshelbyInclusion/runAll.sh
View File

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

7
src/plastic_isotropic.f90
View File

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

7
src/plastic_kinematichardening.f90
View File

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