From c60ec4c490244fbc6d06a157da61fe1d3c8efaed Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Fri, 29 Mar 2019 11:30:00 +0000 Subject: [PATCH 1/7] c/a ratio matches the lattice_init name --- examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.config b/examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.config index 137606093..7212ed97e 100644 --- a/examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.config +++ b/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 # - " - From be387ab8cf88d9c44363bad77469d6f0a4ff9413 Mon Sep 17 00:00:00 2001 From: Vitesh Shah Date: Fri, 29 Mar 2019 11:36:30 +0000 Subject: [PATCH 2/7] atol_shear and atol_twinfrac are not allowed to be zero --- examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.config | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.config b/examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.config index 7212ed97e..7f14174cc 100644 --- a/examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.config +++ b/examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.config @@ -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 From 12bc543c6384a21470dd96e1b4d0004928ab914e Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 29 Mar 2019 16:41:27 +0100 Subject: [PATCH 3/7] [skip ci] updated version information after successful test of v2.0.3-36-gbe387ab8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6eef29297..b1cf69273 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.3-33-g1e20e947 +v2.0.3-36-gbe387ab8 From a243d47ef1c0959fa183454eb2f928de092507b4 Mon Sep 17 00:00:00 2001 From: Franz Roters Date: Fri, 5 Apr 2019 11:11:43 +0200 Subject: [PATCH 4/7] adapting to new keywords --- .../ConfigFiles/Homogenization_Isostrain_Parallel3.config | 6 +++--- examples/ConfigFiles/Homogenization_Isostrain_SX.config | 4 ++-- .../ConfigFiles/Homogenization_Isostrain_Taylor2.config | 4 ++-- examples/ConfigFiles/Homogenization_RGC_8Grains.config | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/ConfigFiles/Homogenization_Isostrain_Parallel3.config b/examples/ConfigFiles/Homogenization_Isostrain_Parallel3.config index 8e60a7b72..61f79d89d 100644 --- a/examples/ConfigFiles/Homogenization_Isostrain_Parallel3.config +++ b/examples/ConfigFiles/Homogenization_Isostrain_Parallel3.config @@ -1,4 +1,4 @@ [Parallel3] -type isostrain -Ngrains 3 -mapping sum # or 'parallel' \ No newline at end of file +mech isostrain +nconstituents 3 +mapping sum # or 'parallel' \ No newline at end of file diff --git a/examples/ConfigFiles/Homogenization_Isostrain_SX.config b/examples/ConfigFiles/Homogenization_Isostrain_SX.config index 7eb1e3c87..40b26b554 100644 --- a/examples/ConfigFiles/Homogenization_Isostrain_SX.config +++ b/examples/ConfigFiles/Homogenization_Isostrain_SX.config @@ -1,3 +1,3 @@ [SX] -type isostrain -Ngrains 1 +mech isostrain +nconstituents 1 diff --git a/examples/ConfigFiles/Homogenization_Isostrain_Taylor2.config b/examples/ConfigFiles/Homogenization_Isostrain_Taylor2.config index 12dfa774e..5e1e899e7 100644 --- a/examples/ConfigFiles/Homogenization_Isostrain_Taylor2.config +++ b/examples/ConfigFiles/Homogenization_Isostrain_Taylor2.config @@ -1,3 +1,3 @@ [Taylor2] -type isostrain -Ngrains 2 \ No newline at end of file +mech isostrain +nconstituents 2 \ No newline at end of file diff --git a/examples/ConfigFiles/Homogenization_RGC_8Grains.config b/examples/ConfigFiles/Homogenization_RGC_8Grains.config index bbe9fb6a4..c75c83ce0 100644 --- a/examples/ConfigFiles/Homogenization_RGC_8Grains.config +++ b/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] From 598e8034b4a49a700ba995760efb34b011ab9bd9 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Fri, 5 Apr 2019 09:51:05 -0400 Subject: [PATCH 5/7] [skip ci] removed obsolete --inplace option from vtk_xxx script calls --- examples/SpectralMethod/EshelbyInclusion/runAll.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/SpectralMethod/EshelbyInclusion/runAll.sh b/examples/SpectralMethod/EshelbyInclusion/runAll.sh index 27630bc39..cef1128ef 100755 --- a/examples/SpectralMethod/EshelbyInclusion/runAll.sh +++ b/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' \ From adebbcf5dfee76420af7c07c4895dbfbe3440016 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 5 Apr 2019 20:14:01 +0200 Subject: [PATCH 6/7] preprocessor statements confuse cmake --- .gitlab-ci.yml | 2 -- PRIVATE | 2 +- src/plastic_isotropic.f90 | 7 ++++--- src/plastic_kinematichardening.f90 | 7 ++++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45fb4e4f4..1e1b8fe49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -444,8 +444,6 @@ J2_plasticBehavior: grid_all_example: stage: example script: grid_all_example/test.py - only: - - development ################################################################################################### SpectralRuntime: diff --git a/PRIVATE b/PRIVATE index c7bc54a26..1d1dc5c20 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit c7bc54a26c8b6ed404aabec4653227e93fa028e2 +Subproject commit 1d1dc5c200e4723f501c3cb7a09ce74f5d6fe6b2 diff --git a/src/plastic_isotropic.f90 b/src/plastic_isotropic.f90 index 05a31ab75..d7b071baa 100644 --- a/src/plastic_isotropic.f90 +++ b/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 diff --git a/src/plastic_kinematichardening.f90 b/src/plastic_kinematichardening.f90 index 0a4a6b3bc..ed21b09f7 100644 --- a/src/plastic_kinematichardening.f90 +++ b/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 From 8cc2a540f1aa934da26aa7b00fbf3b50512be247 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 5 Apr 2019 21:49:24 +0200 Subject: [PATCH 7/7] fixed test using old keyword --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 1d1dc5c20..df55b24d7 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 1d1dc5c200e4723f501c3cb7a09ce74f5d6fe6b2 +Subproject commit df55b24d793c0fe71e3a3aaf038ff249e4878d57