From 11046f708e8078cf4147cada034b6375aa2980a7 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 26 Jan 2021 07:54:24 +0100 Subject: [PATCH] simplified --- src/phase_mechanics_plastic_dislotungsten.f90 | 4 ++-- src/phase_mechanics_plastic_dislotwin.f90 | 2 +- src/phase_mechanics_plastic_isotropic.f90 | 2 +- src/phase_mechanics_plastic_kinehardening.f90 | 2 +- src/phase_mechanics_plastic_none.f90 | 2 +- src/phase_mechanics_plastic_nonlocal.f90 | 2 +- src/phase_mechanics_plastic_phenopowerlaw.f90 | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/phase_mechanics_plastic_dislotungsten.f90 b/src/phase_mechanics_plastic_dislotungsten.f90 index 0f4b92af7..08da6f1dc 100644 --- a/src/phase_mechanics_plastic_dislotungsten.f90 +++ b/src/phase_mechanics_plastic_dislotungsten.f90 @@ -103,7 +103,7 @@ module function plastic_dislotungsten_init() result(myPlasticity) Ninstances = count(myPlasticity) print'(a,i2)', ' # instances: ',Ninstances; flush(IO_STDOUT) if(Ninstances == 0) return - + print*, 'Cereceda et al., International Journal of Plasticity 78:242–256, 2016' print*, 'https://dx.doi.org/10.1016/j.ijplas.2015.09.002' @@ -222,7 +222,7 @@ module function plastic_dislotungsten_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt == p) * discretization_nIPs + Nconstituents = count(material_phaseAt2 == p) sizeDotState = size(['rho_mob ','rho_dip ','gamma_sl']) * prm%sum_N_sl sizeState = sizeDotState diff --git a/src/phase_mechanics_plastic_dislotwin.f90 b/src/phase_mechanics_plastic_dislotwin.f90 index 7fb73f1c8..8c7ae78ba 100644 --- a/src/phase_mechanics_plastic_dislotwin.f90 +++ b/src/phase_mechanics_plastic_dislotwin.f90 @@ -408,7 +408,7 @@ module function plastic_dislotwin_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt == p) * discretization_nIPs + Nconstituents = count(material_phaseAt2 == p) sizeDotState = size(['rho_mob ','rho_dip ','gamma_sl']) * prm%sum_N_sl & + size(['f_tw']) * prm%sum_N_tw & + size(['f_tr']) * prm%sum_N_tr diff --git a/src/phase_mechanics_plastic_isotropic.f90 b/src/phase_mechanics_plastic_isotropic.f90 index 9fb6bcae5..a2ef157d4 100644 --- a/src/phase_mechanics_plastic_isotropic.f90 +++ b/src/phase_mechanics_plastic_isotropic.f90 @@ -131,7 +131,7 @@ module function plastic_isotropic_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt == p) * discretization_nIPs + Nconstituents = count(material_phaseAt2 == p) sizeDotState = size(['xi ','gamma']) sizeState = sizeDotState diff --git a/src/phase_mechanics_plastic_kinehardening.f90 b/src/phase_mechanics_plastic_kinehardening.f90 index 69322e234..1fb8588d8 100644 --- a/src/phase_mechanics_plastic_kinehardening.f90 +++ b/src/phase_mechanics_plastic_kinehardening.f90 @@ -175,7 +175,7 @@ module function plastic_kinehardening_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt == p) * discretization_nIPs + Nconstituents = count(material_phaseAt2 == p) sizeDotState = size(['crss ','crss_back', 'accshear ']) * prm%sum_N_sl!ToDo: adjust names, ask Philip sizeDeltaState = size(['sense ', 'chi0 ', 'gamma0' ]) * prm%sum_N_sl !ToDo: adjust names sizeState = sizeDotState + sizeDeltaState diff --git a/src/phase_mechanics_plastic_none.f90 b/src/phase_mechanics_plastic_none.f90 index 88fa6a5c2..b09b4fc39 100644 --- a/src/phase_mechanics_plastic_none.f90 +++ b/src/phase_mechanics_plastic_none.f90 @@ -43,7 +43,7 @@ module function plastic_none_init() result(myPlasticity) do p = 1, phases%length phase => phases%get(p) if(.not. myPlasticity(p)) cycle - Nconstituents = count(material_phaseAt == p) * discretization_nIPs + Nconstituents = count(material_phaseAt2 == p) call constitutive_allocateState(plasticState(p),Nconstituents,0,0,0) enddo diff --git a/src/phase_mechanics_plastic_nonlocal.f90 b/src/phase_mechanics_plastic_nonlocal.f90 index 1d37907cf..c023e685e 100644 --- a/src/phase_mechanics_plastic_nonlocal.f90 +++ b/src/phase_mechanics_plastic_nonlocal.f90 @@ -393,7 +393,7 @@ module function plastic_nonlocal_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt==p) * discretization_nIPs + Nconstituents = count(material_phaseAt2 == p) sizeDotState = size([ 'rhoSglEdgePosMobile ','rhoSglEdgeNegMobile ', & 'rhoSglScrewPosMobile ','rhoSglScrewNegMobile ', & 'rhoSglEdgePosImmobile ','rhoSglEdgeNegImmobile ', & diff --git a/src/phase_mechanics_plastic_phenopowerlaw.f90 b/src/phase_mechanics_plastic_phenopowerlaw.f90 index 802bfa9b8..60951e7c4 100644 --- a/src/phase_mechanics_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanics_plastic_phenopowerlaw.f90 @@ -225,7 +225,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt == p) * discretization_nIPs + Nconstituents = count(material_phaseAt2 == p) sizeDotState = size(['xi_sl ','gamma_sl']) * prm%sum_N_sl & + size(['xi_tw ','gamma_tw']) * prm%sum_N_tw sizeState = sizeDotState