From 9a9d287aed8ae91be49ef077a39eed068f73db0f Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Wed, 24 Feb 2021 12:06:46 +0100 Subject: [PATCH 01/48] tau_0 should be per slip family --- PRIVATE | 2 +- src/phase_mechanical_plastic_dislotwin.f90 | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PRIVATE b/PRIVATE index f654a4143..bbbd3b769 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit f654a4143b1fbbecd137dc5d2193f5cf48ab1448 +Subproject commit bbbd3b7695aa72cffbf6ac37b67ca2f5bef4d5f0 diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index 0c52176ce..55c9c616e 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -24,7 +24,6 @@ submodule(phase:plastic) dislotwin q_sb = 1.0_pReal, & !< q-exponent in shear band velocity D_a = 1.0_pReal, & !< adjustment parameter to calculate minimum dipole distance i_tw = 1.0_pReal, & !< adjustment parameter to calculate MFP for twinning - tau_0 = 1.0_pReal, & !< strength due to elements in solid solution L_tw = 1.0_pReal, & !< Length of twin nuclei in Burgers vectors L_tr = 1.0_pReal, & !< Length of trans nuclei in Burgers vectors x_c_tw = 1.0_pReal, & !< critical distance for formation of twin nucleus @@ -53,6 +52,7 @@ submodule(phase:plastic) dislotwin q, & !< q-exponent in glide velocity r, & !< r-exponent in twin nucleation rate s, & !< s-exponent in trans nucleation rate + tau_0, & !< strength due to elements in solid solution gamma_char, & !< characteristic shear for twins B !< drag coefficient real(pReal), allocatable, dimension(:,:) :: & @@ -213,10 +213,10 @@ module function plastic_dislotwin_init() result(myPlasticity) prm%i_sl = pl%get_asFloats('i_sl', requiredSize=size(N_sl)) prm%p = pl%get_asFloats('p_sl', requiredSize=size(N_sl)) prm%q = pl%get_asFloats('q_sl', requiredSize=size(N_sl)) + prm%tau_0 = pl%get_asFloats('tau_0', requiredSize=size(N_sl)) prm%B = pl%get_asFloats('B', requiredSize=size(N_sl), & defaultVal=[(0.0_pReal, i=1,size(N_sl))]) - prm%tau_0 = pl%get_asFloat('tau_0') prm%D_a = pl%get_asFloat('D_a') prm%D_0 = pl%get_asFloat('D_0') prm%Q_cl = pl%get_asFloat('Q_cl') @@ -242,6 +242,7 @@ module function plastic_dislotwin_init() result(myPlasticity) prm%i_sl = math_expand(prm%i_sl, N_sl) prm%p = math_expand(prm%p, N_sl) prm%q = math_expand(prm%q, N_sl) + prm%tau_0 = math_expand(prm%tau_0, N_sl) prm%B = math_expand(prm%B, N_sl) ! sanity checks From 890e00880b24292dfce38409559226005a1e331b Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Wed, 24 Feb 2021 15:16:43 +0100 Subject: [PATCH 02/48] updated test repo --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index bbbd3b769..5fe205710 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit bbbd3b7695aa72cffbf6ac37b67ca2f5bef4d5f0 +Subproject commit 5fe205710fe079c77d0b4fa142248804cbb91563 From c0e488881ea563c634769e141310f91417d6530f Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Wed, 24 Feb 2021 18:36:06 +0100 Subject: [PATCH 03/48] converted two examples to yaml --- PRIVATE | 2 +- .../Phase_Dislotwin_TWIP-Steel-FeMnC.config | 64 ------------------- .../Phase_Dislotwin_TWIP-Steel-FeMnC.yaml | 41 ++++++++++++ .../Phase_Dislotwin_Tungsten.config | 36 ----------- .../ConfigFiles/Phase_Dislotwin_Tungsten.yaml | 22 +++++++ python/tests/test_ConfigMaterial.py | 1 - 6 files changed, 64 insertions(+), 102 deletions(-) delete mode 100644 examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.config create mode 100644 examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml delete mode 100644 examples/ConfigFiles/Phase_Dislotwin_Tungsten.config create mode 100644 examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml diff --git a/PRIVATE b/PRIVATE index 5fe205710..48dd9972d 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 5fe205710fe079c77d0b4fa142248804cbb91563 +Subproject commit 48dd9972d9023caa8b04226112dcdd57fa0be6af diff --git a/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.config b/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.config deleted file mode 100644 index 3ca635d73..000000000 --- a/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.config +++ /dev/null @@ -1,64 +0,0 @@ -[TWIP_Steel_FeMnC] - -elasticity hooke -plasticity dislotwin - -(output) rho_mob -(output) rho_dip -(output) gamma_sl -(output) lambda_sl -(output) tau_pass -(output) f_tw -(output) lambda_tw -(output) tau_hat_tw -(output) f_tr - - -### Material parameters ### -lattice_structure fcc -C11 175.0e9 # From Music et al. Applied Physics Letters 91, 191904 (2007) -C12 115.0e9 -C44 135.0e9 -grainsize 2.0e-5 # Average grain size [m] -SolidSolutionStrength 1.5e8 # Strength due to elements in solid solution - -### Dislocation glide parameters ### -Nslip 12 -slipburgers 2.56e-10 # Burgers vector of slip system [m] -rhoedgedip0 1.0 # Initial dislocation density [m/m**3] -rhoedge0 1.0e12 # Initial dislocation density [m/m**3] -v0 1.0e-4 # Initial glide velocity [m/s] -Qedge 3.7e-19 # Activation energy for dislocation glide [J] -p_slip 1.0 # p-exponent in glide velocity -q_slip 1.0 # q-exponent in glide velocity - -# hardening of glide -CLambdaSlip 10.0 # Adj. parameter controlling dislocation mean free path -D0 4.0e-5 # Vacancy diffusion prefactor [m**2/s] -Qsd 4.5e-19 # Activation energy for climb [J] -Catomicvolume 1.0 # Adj. parameter controlling the atomic volume [in b^3] -Cedgedipmindistance 1.0 # Adj. parameter controlling the minimum dipole distance [in b] -interactionSlipSlip 0.122 0.122 0.625 0.07 0.137 0.122 # Interaction coefficients (Kubin et al. 2008) - -### Shearband parameters ### -shearbandresistance 180e6 -shearbandvelocity 0e-4 # set to zero to turn shear banding of -QedgePerSbSystem 3.7e-19 # Activation energy for shear banding [J] -p_shearband 1.0 # p-exponent in glide velocity -q_shearband 1.0 # q-exponent in glide velocity - -### Twinning parameters ### -Ntwin 12 -twinburgers 1.47e-10 # Burgers vector of twin system [m] -twinsize 5.0e-8 # Twin stack mean thickness [m] -L0_twin 442.0 # Length of twin nuclei in Burgers vectors -maxtwinfraction 1.0 # Maximum admissible twin volume fraction -xc_twin 1.0e-9 # critical distance for formation of twin nucleus -VcrossSlip 1.67e-29 # cross slip volume -r_twin 10.0 # r-exponent in twin formation probability -Cmfptwin 1.0 # Adj. parameter controlling twin mean free path -Cthresholdtwin 1.0 # Adj. parameter controlling twin threshold stress -interactionSlipTwin 0.0 1.0 1.0 # Dislocation-Twin interaction coefficients -interactionTwinTwin 0.0 1.0 # Twin-Twin interaction coefficients -SFE_0K -0.0396 # stacking fault energy at zero K; TWIP steel: -0.0526; Cu: -0.0396 -dSFE_dT 0.0002 # temperature dependance of stacking fault energy diff --git a/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml b/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml new file mode 100644 index 000000000..e4f325d66 --- /dev/null +++ b/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml @@ -0,0 +1,41 @@ +TWIP_STEEL_FeMnC: + lattice: cF + mechanics: + elasticity: {C_11: 175.0e9, C_12: 115.0e9, C_44: 135.0e9, type: hooke} + plasticity: + type: dislotwin + D: 2.0e-5 + N_sl: [12] + b_sl: [2.56e-10] + rho_mob_0: [1.0e12] + rho_dip_0: [1.0] + v_0: [1.0e-4] + Q_s: [3.7e-19] + p_sl: [1.0] + q_sl: [1.0] + tau_0: [1.5e8] + i_sl: [10.0] # Adj. parameter controlling dislocation mean free path + D_0: 4.0e-5 # Vacancy diffusion prefactor [m**2/s] + D_a: 1.0 # Adj. parameter controlling the minimum dipole distance [in b] + Q_cl: 4.5e-19 # Activation energy for climb [J] + h_sl_sl: [0.122, 0.122, 0.625, 0.07, 0.137, 0.122] # Interaction coefficients (Kubin et al. 2008) +# shear band params + xi_sb: 180.0e6 + Q_sb: 3.7e-19 + p_sb: 1.0 + q_sb: 1.0 + v_sb: 0.0 #set to 0, to turn it off + ### Twinning parameters ### + N_tw: [12] + b_tw: [1.47e-10] # Burgers vector of twin system [m] + t_tw: [5.0e-8] # Twin stack mean thickness [m] + L_tw: 442.0 # Length of twin nuclei in Burgers vectors + x_c_tw: 1.0e-9 # critical distance for formation of twin nucleus + V_cs: 1.67e-29 # cross slip volume + p_tw: [10.0] # r-exponent in twin formation probability + i_tw: 1.0 # Adj. parameter controlling twin mean free path + h_sl_tw: [0.0, 1.0, 1.0] # Dislocation-Twin interaction coefficients + h_tw_tw: [0.0, 1.0] # Twin-Twin interaction coefficients + Gamma_sf_0K: -0.0396 # stacking fault energy at zero K; TWIP steel: -0.0526; Cu: -0.0396 + dGamma_sf_dT: 0.0002 # temperature dependance of stacking fault energy + output: [rho_mob, rho_dip, gamma_sl, Lambda_sl, tau_pass, f_tw, Lambda_tw, tau_hat_tw, f_tr] diff --git a/examples/ConfigFiles/Phase_Dislotwin_Tungsten.config b/examples/ConfigFiles/Phase_Dislotwin_Tungsten.config deleted file mode 100644 index 30c04cb9a..000000000 --- a/examples/ConfigFiles/Phase_Dislotwin_Tungsten.config +++ /dev/null @@ -1,36 +0,0 @@ -[Tungsten] - -elasticity hooke -plasticity dislotwin - -### Material parameters ### -lattice_structure bcc -C11 523.0e9 # From Marinica et al. Journal of Physics: Condensed Matter(2013) -C12 202.0e9 -C44 161.0e9 - -grainsize 2.0e-5 # Average grain size [m] -SolidSolutionStrength 1.5e8 # Strength due to elements in solid solution - -### Dislocation glide parameters ### -#per family -Nslip 12 -slipburgers 2.72e-10 # Burgers vector of slip system [m] -rhoedge0 1.0e12 # Initial edge dislocation density [m/m**3] -rhoedgedip0 1.0 # Initial edged dipole dislocation density [m/m**3] -v0 1.0e-4 # Initial glide velocity [m/s] -Qedge 2.725e-19 # Activation energy for dislocation glide [J] -p_slip 0.78 # p-exponent in glide velocity -q_slip 1.58 # q-exponent in glide velocity -tau_peierls 2.03e9 # peierls stress (for bcc) -dipoleformationfactor 0 # to have hardening due to dipole formation off - -#hardening -CLambdaSlip 10.0 # Adj. parameter controlling dislocation mean free path -D0 4.0e-5 # Vacancy diffusion prefactor [m**2/s] -Qsd 4.5e-19 # Activation energy for climb [J] -Catomicvolume 1.0 # Adj. parameter controlling the atomic volume [in b] -Cedgedipmindistance 1.0 # Adj. parameter controlling the minimum dipole distance [in b] -interaction_slipslip 1 1 1.4 1.4 1.4 1.4 - - diff --git a/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml b/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml new file mode 100644 index 000000000..bbd6d0282 --- /dev/null +++ b/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml @@ -0,0 +1,22 @@ +Tungsten: + lattice: cI + mechanics: + elasticity: {C_11: 523.0e9, C_12: 202.0e9, C_44: 161.0e9, type: hooke} # From Marinica et al. Journal of Physics: Condensed Matter(2013) + plasticity: + type: dislotwin + D: 2.0e-5 # Average grain size [m] + N_sl: [12] + b_sl: [2.72e-10] # Burgers vector of slip system [m] + rho_mob_0: [1.0e12] + rho_dip_0: [1.0] + v_0: [1.0e-4] # Initial glide velocity [m/s] + Q_s: [2.725e-19] # Activation energy for dislocation glide [J] + p_sl: [0.78] # p-exponent in glide velocity + q_sl: [1.58] # q-exponent in glide velocity + tau_0: [1.5e8] + i_sl: [10.0] # Adj. parameter controlling dislocation mean free path + D_0: 4.0e-5 # Vacancy diffusion prefactor [m**2/s] + D_a: 1.0 # Adj. parameter controlling the minimum dipole distance [in b] + Q_cl: 4.5e-19 # Activation energy for climb [J] + h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4] + no_dipole_formation: True diff --git a/python/tests/test_ConfigMaterial.py b/python/tests/test_ConfigMaterial.py index 6c316aeaa..5eb9a6c85 100644 --- a/python/tests/test_ConfigMaterial.py +++ b/python/tests/test_ConfigMaterial.py @@ -87,7 +87,6 @@ class TestConfigMaterial: def test_from_table(self): N = np.random.randint(3,10) a = np.vstack((np.hstack((np.arange(N),np.arange(N)[::-1])),np.ones(N*2),np.zeros(N*2),np.ones(N*2),np.ones(N*2))).T - print(a) t = Table(a,{'varying':1,'constant':4}) c = ConfigMaterial.from_table(t,**{'phase':'varying','O':'constant','homogenization':'4_constant'}) assert len(c['material']) == N From 3ca38dabacd2de82d97843c1a61a98db474e4abe Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Wed, 24 Feb 2021 14:10:40 -0500 Subject: [PATCH 04/48] indicate units according to SI standard --- .../Phase_Dislotwin_TWIP-Steel-FeMnC.yaml | 38 +++++++++---------- .../ConfigFiles/Phase_Dislotwin_Tungsten.yaml | 19 +++++----- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml b/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml index e4f325d66..e3705891f 100644 --- a/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml +++ b/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml @@ -1,9 +1,10 @@ -TWIP_STEEL_FeMnC: +TWIP_Steel_FeMnC: lattice: cF mechanics: - elasticity: {C_11: 175.0e9, C_12: 115.0e9, C_44: 135.0e9, type: hooke} + elasticity: {type: hooke, C_11: 175.0e9, C_12: 115.0e9, C_44: 135.0e9} plasticity: type: dislotwin + output: [rho_mob, rho_dip, gamma_sl, Lambda_sl, tau_pass, f_tw, Lambda_tw, tau_hat_tw, f_tr] D: 2.0e-5 N_sl: [12] b_sl: [2.56e-10] @@ -14,28 +15,27 @@ TWIP_STEEL_FeMnC: p_sl: [1.0] q_sl: [1.0] tau_0: [1.5e8] - i_sl: [10.0] # Adj. parameter controlling dislocation mean free path - D_0: 4.0e-5 # Vacancy diffusion prefactor [m**2/s] - D_a: 1.0 # Adj. parameter controlling the minimum dipole distance [in b] - Q_cl: 4.5e-19 # Activation energy for climb [J] + i_sl: [10.0] # Adj. parameter controlling dislocation mean free path + D_0: 4.0e-5 # Vacancy diffusion prefactor / m^2/s + D_a: 1.0 # minimum dipole distance / b + Q_cl: 4.5e-19 # Activation energy for climb / J h_sl_sl: [0.122, 0.122, 0.625, 0.07, 0.137, 0.122] # Interaction coefficients (Kubin et al. 2008) -# shear band params +# shear band parameters xi_sb: 180.0e6 Q_sb: 3.7e-19 p_sb: 1.0 q_sb: 1.0 - v_sb: 0.0 #set to 0, to turn it off - ### Twinning parameters ### + v_sb: 0.0 # set to 0, to turn it off +# twinning parameters N_tw: [12] - b_tw: [1.47e-10] # Burgers vector of twin system [m] - t_tw: [5.0e-8] # Twin stack mean thickness [m] - L_tw: 442.0 # Length of twin nuclei in Burgers vectors - x_c_tw: 1.0e-9 # critical distance for formation of twin nucleus - V_cs: 1.67e-29 # cross slip volume + b_tw: [1.47e-10] # Burgers vector length of twin system / b + t_tw: [5.0e-8] # Twin stack mean thickness / m + L_tw: 442.0 # Length of twin nuclei / b + x_c_tw: 1.0e-9 # critical distance for formation of twin nucleus / m + V_cs: 1.67e-29 # cross slip volume / m^3 p_tw: [10.0] # r-exponent in twin formation probability i_tw: 1.0 # Adj. parameter controlling twin mean free path - h_sl_tw: [0.0, 1.0, 1.0] # Dislocation-Twin interaction coefficients - h_tw_tw: [0.0, 1.0] # Twin-Twin interaction coefficients - Gamma_sf_0K: -0.0396 # stacking fault energy at zero K; TWIP steel: -0.0526; Cu: -0.0396 - dGamma_sf_dT: 0.0002 # temperature dependance of stacking fault energy - output: [rho_mob, rho_dip, gamma_sl, Lambda_sl, tau_pass, f_tw, Lambda_tw, tau_hat_tw, f_tr] + h_sl_tw: [0.0, 1.0, 1.0] # dislocation-twin interaction coefficients + h_tw_tw: [0.0, 1.0] # twin-twin interaction coefficients + Gamma_sf_0K: -0.0396 # stacking fault energy / J/m^2 at zero K; TWIP steel: -0.0526; Cu: -0.0396 + dGamma_sf_dT: 0.0002 # temperature dependence / J/(m^2 K) of stacking fault energy diff --git a/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml b/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml index bbd6d0282..3863899cb 100644 --- a/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml +++ b/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml @@ -1,22 +1,21 @@ Tungsten: lattice: cI mechanics: - elasticity: {C_11: 523.0e9, C_12: 202.0e9, C_44: 161.0e9, type: hooke} # From Marinica et al. Journal of Physics: Condensed Matter(2013) + elasticity: {type: hooke, C_11: 523.0e9, C_12: 202.0e9, C_44: 161.0e9} # Marinica et al. Journal of Physics: Condensed Matter(2013) plasticity: type: dislotwin - D: 2.0e-5 # Average grain size [m] + D: 2.0e-5 # Average grain size / m N_sl: [12] - b_sl: [2.72e-10] # Burgers vector of slip system [m] + b_sl: [2.72e-10] # Burgers vector length of slip families / m rho_mob_0: [1.0e12] rho_dip_0: [1.0] - v_0: [1.0e-4] # Initial glide velocity [m/s] - Q_s: [2.725e-19] # Activation energy for dislocation glide [J] + v_0: [1.0e-4] # Initial glide velocity / m/s + Q_s: [2.725e-19] # Activation energy for dislocation glide / J p_sl: [0.78] # p-exponent in glide velocity q_sl: [1.58] # q-exponent in glide velocity - tau_0: [1.5e8] + tau_0: [1.5e8] # solid solution strength / Pa i_sl: [10.0] # Adj. parameter controlling dislocation mean free path - D_0: 4.0e-5 # Vacancy diffusion prefactor [m**2/s] - D_a: 1.0 # Adj. parameter controlling the minimum dipole distance [in b] - Q_cl: 4.5e-19 # Activation energy for climb [J] + D_0: 4.0e-5 # Vacancy diffusion prefactor / m^2/s + D_a: 1.0 # minimum dipole distance / b + Q_cl: 4.5e-19 # Activation energy for climb / J h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4] - no_dipole_formation: True From f8bc2bf0c294840a224c5c642af603da2a200aa6 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Wed, 24 Feb 2021 14:12:50 -0500 Subject: [PATCH 05/48] renamed "no_dipole_formation" flag to "omit_dipoles"; shortened dipole dotState logic --- src/phase_mechanical_plastic_dislotwin.f90 | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index 55c9c616e..dad1ad773 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -81,7 +81,7 @@ submodule(phase:plastic) dislotwin logical :: & ExtendedDislocations, & !< consider split into partials for climb calculation fccTwinTransNucleation, & !< twinning and transformation models are for fcc - dipoleFormation !< flag indicating consideration of dipole formation + omitDipoles !< flag controlling consideration of dipole formation end type !< container type for internal constitutive parameters type :: tDislotwinState @@ -226,7 +226,7 @@ module function plastic_dislotwin_init() result(myPlasticity) prm%dGamma_sf_dT = pl%get_asFloat('dGamma_sf_dT') endif - prm%dipoleformation = .not. pl%get_asBool('no_dipole_formation',defaultVal = .false.) + prm%omitDipoles = pl%get_asBool('omit_dipoles',defaultVal = .false.) ! multiplication factor according to crystal structure (nearest neighbors bcc vs fcc/hex) ! details: Argon & Moffat, Acta Metallurgica, Vol. 29, pg 293 to 299, 1981 @@ -676,20 +676,16 @@ module subroutine dislotwin_dotState(Mp,T,ph,me) slipState: do i = 1, prm%sum_N_sl tau = math_tensordot(Mp,prm%P_sl(1:3,1:3,i)) - significantSlipStress: if (dEq0(tau)) then + significantSlipStress: if (dEq0(tau) .or. prm%omitDipoles) then dot_rho_dip_formation(i) = 0.0_pReal dot_rho_dip_climb(i) = 0.0_pReal else significantSlipStress - rho_dip_distance = 3.0_pReal*prm%mu*prm%b_sl(i)/(16.0_pReal*PI*abs(tau)) - rho_dip_distance = math_clip(rho_dip_distance, right = dst%Lambda_sl(i,me)) - rho_dip_distance = math_clip(rho_dip_distance, left = rho_dip_distance_min(i)) + rho_dip_distance = math_clip(3.0_pReal*prm%mu*prm%b_sl(i)/(16.0_pReal*PI*abs(tau)), & + left = rho_dip_distance_min(i), & + right = dst%Lambda_sl(i,me)) - if (prm%dipoleFormation) then - dot_rho_dip_formation(i) = 2.0_pReal*(rho_dip_distance-rho_dip_distance_min(i))/prm%b_sl(i) & - * stt%rho_mob(i,me)*abs(dot_gamma_sl(i)) - else - dot_rho_dip_formation(i) = 0.0_pReal - endif + dot_rho_dip_formation(i) = 2.0_pReal*(rho_dip_distance-rho_dip_distance_min(i))/prm%b_sl(i) & + * stt%rho_mob(i,me)*abs(dot_gamma_sl(i)) if (dEq(rho_dip_distance,rho_dip_distance_min(i))) then dot_rho_dip_climb(i) = 0.0_pReal From 2f205e6123a008edd6f47d9408919275b314f08b Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Wed, 24 Feb 2021 14:28:31 -0500 Subject: [PATCH 06/48] updated to current PRIVATE --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 48dd9972d..effb7fe10 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 48dd9972d9023caa8b04226112dcdd57fa0be6af +Subproject commit effb7fe1016984ed90c1e6ec264da1227bc74cc3 From 533abd97b58674563f2042679fcaf13748283cfe Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Wed, 24 Feb 2021 15:56:34 -0500 Subject: [PATCH 07/48] now hopefully with the correct matching PRIVATE --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index effb7fe10..48dd9972d 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit effb7fe1016984ed90c1e6ec264da1227bc74cc3 +Subproject commit 48dd9972d9023caa8b04226112dcdd57fa0be6af From 59b7565961fc21e0cf77fb77338cc9050d38504d Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Thu, 25 Feb 2021 15:35:32 +0100 Subject: [PATCH 08/48] multiple clips throws NAN, back to sequential way of clipping --- src/phase_mechanical_plastic_dislotwin.f90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index dad1ad773..cc3d40cf3 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -680,12 +680,12 @@ module subroutine dislotwin_dotState(Mp,T,ph,me) dot_rho_dip_formation(i) = 0.0_pReal dot_rho_dip_climb(i) = 0.0_pReal else significantSlipStress - rho_dip_distance = math_clip(3.0_pReal*prm%mu*prm%b_sl(i)/(16.0_pReal*PI*abs(tau)), & - left = rho_dip_distance_min(i), & - right = dst%Lambda_sl(i,me)) + rho_dip_distance = 3.0_pReal*prm%mu*prm%b_sl(i)/(16.0_pReal*PI*abs(tau)) + rho_dip_distance = math_clip(rho_dip_distance, right = dst%Lambda_sl(i,me)) + rho_dip_distance = math_clip(rho_dip_distance, left = rho_dip_distance_min(i)) dot_rho_dip_formation(i) = 2.0_pReal*(rho_dip_distance-rho_dip_distance_min(i))/prm%b_sl(i) & - * stt%rho_mob(i,me)*abs(dot_gamma_sl(i)) + * stt%rho_mob(i,me)*abs(dot_gamma_sl(i)) if (dEq(rho_dip_distance,rho_dip_distance_min(i))) then dot_rho_dip_climb(i) = 0.0_pReal From 988e584d7d07b6dfdb0febc450ee421fdc5ebabb Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 25 Feb 2021 16:44:52 +0100 Subject: [PATCH 09/48] merge simplifies conditional assignment --- src/phase_mechanical_plastic_dislotwin.f90 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index cc3d40cf3..9398f0f6d 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -647,7 +647,6 @@ module subroutine dislotwin_dotState(Mp,T,ph,me) f_unrotated, & rho_dip_distance, & v_cl, & !< climb velocity - Gamma, & !< stacking fault energy tau, & sigma_cl, & !< climb stress b_d !< ratio of Burgers vector to stacking fault width @@ -685,19 +684,17 @@ module subroutine dislotwin_dotState(Mp,T,ph,me) rho_dip_distance = math_clip(rho_dip_distance, left = rho_dip_distance_min(i)) dot_rho_dip_formation(i) = 2.0_pReal*(rho_dip_distance-rho_dip_distance_min(i))/prm%b_sl(i) & - * stt%rho_mob(i,me)*abs(dot_gamma_sl(i)) + * stt%rho_mob(i,me)*abs(dot_gamma_sl(i)) if (dEq(rho_dip_distance,rho_dip_distance_min(i))) then dot_rho_dip_climb(i) = 0.0_pReal else - !@details: Refer: Argon & Moffat, Acta Metallurgica, Vol. 29, pg 293 to 299, 1981 + ! Argon & Moffat, Acta Metallurgica, Vol. 29, pg 293 to 299, 1981 sigma_cl = dot_product(prm%n0_sl(1:3,i),matmul(Mp,prm%n0_sl(1:3,i))) - if (prm%ExtendedDislocations) then - Gamma = prm%Gamma_sf_0K + prm%dGamma_sf_dT * T - b_d = 24.0_pReal*PI*(1.0_pReal - prm%nu)/(2.0_pReal + prm%nu)* Gamma/(prm%mu*prm%b_sl(i)) - else - b_d = 1.0_pReal - endif + b_d = merge(24.0_pReal*PI*(1.0_pReal - prm%nu)/(2.0_pReal + prm%nu) & + * (prm%Gamma_sf_0K + prm%dGamma_sf_dT * T) / (prm%mu*prm%b_sl(i)), & + 1.0_pReal, & + prm%ExtendedDislocations) v_cl = 2.0_pReal*prm%omega*b_d**2.0_pReal*exp(-prm%Q_cl/(kB*T)) & * (exp(abs(sigma_cl)*prm%b_sl(i)**3.0_pReal/(kB*T)) - 1.0_pReal) From 5de1ca0dd74450ade1f2599d63e77b39a18a1ed1 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 25 Feb 2021 23:10:45 +0100 Subject: [PATCH 10/48] more reasonable value used in https://doi.org/10.1016/j.ijplas.2020.102779 --- examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml | 2 +- examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml b/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml index e3705891f..009443284 100644 --- a/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml +++ b/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml @@ -10,7 +10,7 @@ TWIP_Steel_FeMnC: b_sl: [2.56e-10] rho_mob_0: [1.0e12] rho_dip_0: [1.0] - v_0: [1.0e-4] + v_0: [1.0e4] Q_s: [3.7e-19] p_sl: [1.0] q_sl: [1.0] diff --git a/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml b/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml index 3863899cb..36467192b 100644 --- a/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml +++ b/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml @@ -9,7 +9,7 @@ Tungsten: b_sl: [2.72e-10] # Burgers vector length of slip families / m rho_mob_0: [1.0e12] rho_dip_0: [1.0] - v_0: [1.0e-4] # Initial glide velocity / m/s + v_0: [1.0e4] # Initial glide velocity / m/s Q_s: [2.725e-19] # Activation energy for dislocation glide / J p_sl: [0.78] # p-exponent in glide velocity q_sl: [1.58] # q-exponent in glide velocity From 84da6a2deeaf0148e84e5f57f1e8b9f7646c89de Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 25 Feb 2021 23:11:21 +0100 Subject: [PATCH 11/48] not needed anymore --- examples/ConfigFiles/Microstructure_DP_Steel.config | 4 ---- examples/ConfigFiles/Phase_Hydrogen.config | 3 --- 2 files changed, 7 deletions(-) delete mode 100644 examples/ConfigFiles/Microstructure_DP_Steel.config delete mode 100644 examples/ConfigFiles/Phase_Hydrogen.config diff --git a/examples/ConfigFiles/Microstructure_DP_Steel.config b/examples/ConfigFiles/Microstructure_DP_Steel.config deleted file mode 100644 index 6c083e2c7..000000000 --- a/examples/ConfigFiles/Microstructure_DP_Steel.config +++ /dev/null @@ -1,4 +0,0 @@ -[DP_Steel] -crystallite 1 -(constituent) phase 1 texture 1 fraction 0.82 -(constituent) phase 2 texture 2 fraction 0.18 diff --git a/examples/ConfigFiles/Phase_Hydrogen.config b/examples/ConfigFiles/Phase_Hydrogen.config deleted file mode 100644 index c9ccfdc86..000000000 --- a/examples/ConfigFiles/Phase_Hydrogen.config +++ /dev/null @@ -1,3 +0,0 @@ -hydrogenflux_diffusion11 1.0 -hydrogenflux_mobility11 1.0 -hydrogenVolume 1e-28 From 2ca3a824a46ca53feee6b08de8788f3a7cef5f7d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 25 Feb 2021 23:11:36 +0100 Subject: [PATCH 12/48] better fail immediately --- src/math.f90 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/math.f90 b/src/math.f90 index 6b89a9923..6ef942677 100644 --- a/src/math.f90 +++ b/src/math.f90 @@ -1133,6 +1133,7 @@ real(pReal) pure function math_areaTriangle(v1,v2,v3) real(pReal), dimension (3), intent(in) :: v1,v2,v3 + math_areaTriangle = 0.5_pReal * norm2(math_cross(v1-v2,v1-v3)) end function math_areaTriangle @@ -1147,11 +1148,13 @@ real(pReal) pure elemental function math_clip(a, left, right) real(pReal), intent(in) :: a real(pReal), intent(in), optional :: left, right + math_clip = a if (present(left)) math_clip = max(left,math_clip) if (present(right)) math_clip = min(right,math_clip) - if (present(left) .and. present(right)) & - math_clip = merge (IEEE_value(1.0_pReal,IEEE_quiet_NaN),math_clip, left>right) + if (present(left) .and. present(right)) then + if(left>right) error stop 'left > right' + endif end function math_clip @@ -1182,6 +1185,7 @@ subroutine selfTest integer :: d logical :: e + if (any(abs([1.0_pReal,2.0_pReal,2.0_pReal,3.0_pReal,3.0_pReal,3.0_pReal] - & math_expand([1.0_pReal,2.0_pReal,3.0_pReal],[1,2,3,0])) > tol_math_check)) & error stop 'math_expand [1,2,3] by [1,2,3,0] => [1,2,2,3,3,3]' From bf223e8e0022760d23dac7e96399891034e4ba66 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Feb 2021 06:35:42 +0100 Subject: [PATCH 13/48] helpful reporting in case of errors --- python/damask/util.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python/damask/util.py b/python/damask/util.py index cda532bc0..d39adaee9 100644 --- a/python/damask/util.py +++ b/python/damask/util.py @@ -133,6 +133,8 @@ def execute(cmd, stdout = stdout.decode('utf-8').replace('\x08','') stderr = stderr.decode('utf-8').replace('\x08','') if process.returncode != 0: + print(stdout) + print(stderr) raise RuntimeError(f"'{cmd}' failed with returncode {process.returncode}") return stdout, stderr @@ -418,7 +420,7 @@ class _ProgressBar: bar = '█' * filled_length + '░' * (self.bar_length - filled_length) delta_time = datetime.datetime.now() - self.start_time remaining_time = (self.total - (iteration+1)) * delta_time / (iteration+1) - remaining_time -= datetime.timedelta(microseconds=remaining_time.microseconds) # remove μs + remaining_time -= datetime.timedelta(microseconds=remaining_time.microseconds) # remove μs sys.stderr.write(f'\r{self.prefix} {bar} {fraction:>4.0%} ETA {remaining_time}') sys.stderr.flush() From 8b9b0e30b1134042c4ea63119b6b3053ff2c3967 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Feb 2021 07:09:04 +0100 Subject: [PATCH 14/48] read in correct values --- src/phase_mechanical_plastic_dislotwin.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index 9398f0f6d..b151741cc 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -444,14 +444,14 @@ module function plastic_dislotwin_init() result(myPlasticity) endIndex = endIndex + prm%sum_N_tw stt%f_tw=>plasticState(ph)%state(startIndex:endIndex,:) dot%f_tw=>plasticState(ph)%dotState(startIndex:endIndex,:) - plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('f_twin',defaultVal=1.0e-7_pReal) + plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_f_tw',defaultVal=1.0e-7_pReal) if (any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' f_twin' startIndex = endIndex + 1 endIndex = endIndex + prm%sum_N_tr stt%f_tr=>plasticState(ph)%state(startIndex:endIndex,:) dot%f_tr=>plasticState(ph)%dotState(startIndex:endIndex,:) - plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('f_trans',defaultVal=1.0e-6_pReal) + plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_f_tr',defaultVal=1.0e-6_pReal) if (any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' f_trans' allocate(dst%Lambda_sl (prm%sum_N_sl,Nconstituents),source=0.0_pReal) From 657d43308f7523a87755344636c84639ed8c0fe5 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 27 Feb 2021 10:04:08 +0100 Subject: [PATCH 15/48] standardized names --- src/phase_mechanical_plastic_dislotwin.f90 | 60 +++++++++++----------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index b151741cc..ab58e0dd9 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -445,14 +445,14 @@ module function plastic_dislotwin_init() result(myPlasticity) stt%f_tw=>plasticState(ph)%state(startIndex:endIndex,:) dot%f_tw=>plasticState(ph)%dotState(startIndex:endIndex,:) plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_f_tw',defaultVal=1.0e-7_pReal) - if (any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' f_twin' + if (any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' atol_f_tw' startIndex = endIndex + 1 endIndex = endIndex + prm%sum_N_tr stt%f_tr=>plasticState(ph)%state(startIndex:endIndex,:) dot%f_tr=>plasticState(ph)%dotState(startIndex:endIndex,:) plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_f_tr',defaultVal=1.0e-6_pReal) - if (any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' f_trans' + if (any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' atol_f_tr' allocate(dst%Lambda_sl (prm%sum_N_sl,Nconstituents),source=0.0_pReal) allocate(dst%tau_pass (prm%sum_N_sl,Nconstituents),source=0.0_pReal) @@ -536,9 +536,9 @@ module subroutine dislotwin_LpAndItsTangent(Lp,dLp_dMp,Mp,T,ph,me) real(pReal), dimension(param(ph)%sum_N_sl) :: & dot_gamma_sl,ddot_gamma_dtau_slip real(pReal), dimension(param(ph)%sum_N_tw) :: & - dot_gamma_twin,ddot_gamma_dtau_twin + dot_gamma_tw,ddot_gamma_dtau_tw real(pReal), dimension(param(ph)%sum_N_tr) :: & - dot_gamma_tr,ddot_gamma_dtau_trans + dot_gamma_tr,ddot_gamma_dtau_tr real(pReal):: dot_gamma_sb real(pReal), dimension(3,3) :: eigVectors, P_sb real(pReal), dimension(3) :: eigValues @@ -579,20 +579,20 @@ module subroutine dislotwin_LpAndItsTangent(Lp,dLp_dMp,Mp,T,ph,me) + ddot_gamma_dtau_slip(i) * prm%P_sl(k,l,i) * prm%P_sl(m,n,i) enddo slipContribution - call kinetics_twin(Mp,T,dot_gamma_sl,ph,me,dot_gamma_twin,ddot_gamma_dtau_twin) + call kinetics_twin(Mp,T,dot_gamma_sl,ph,me,dot_gamma_tw,ddot_gamma_dtau_tw) twinContibution: do i = 1, prm%sum_N_tw - Lp = Lp + dot_gamma_twin(i)*prm%P_tw(1:3,1:3,i) + Lp = Lp + dot_gamma_tw(i)*prm%P_tw(1:3,1:3,i) forall (k=1:3,l=1:3,m=1:3,n=1:3) & dLp_dMp(k,l,m,n) = dLp_dMp(k,l,m,n) & - + ddot_gamma_dtau_twin(i)* prm%P_tw(k,l,i)*prm%P_tw(m,n,i) + + ddot_gamma_dtau_tw(i)* prm%P_tw(k,l,i)*prm%P_tw(m,n,i) enddo twinContibution - call kinetics_trans(Mp,T,dot_gamma_sl,ph,me,dot_gamma_tr,ddot_gamma_dtau_trans) + call kinetics_trans(Mp,T,dot_gamma_sl,ph,me,dot_gamma_tr,ddot_gamma_dtau_tr) transContibution: do i = 1, prm%sum_N_tr Lp = Lp + dot_gamma_tr(i)*prm%P_tr(1:3,1:3,i) forall (k=1:3,l=1:3,m=1:3,n=1:3) & dLp_dMp(k,l,m,n) = dLp_dMp(k,l,m,n) & - + ddot_gamma_dtau_trans(i)* prm%P_tr(k,l,i)*prm%P_tr(m,n,i) + + ddot_gamma_dtau_tr(i)* prm%P_tr(k,l,i)*prm%P_tr(m,n,i) enddo transContibution Lp = Lp * f_unrotated @@ -656,7 +656,7 @@ module subroutine dislotwin_dotState(Mp,T,ph,me) rho_dip_distance_min, & dot_gamma_sl real(pReal), dimension(param(ph)%sum_N_tw) :: & - dot_gamma_twin + dot_gamma_tw real(pReal), dimension(param(ph)%sum_N_tr) :: & dot_gamma_tr @@ -712,8 +712,8 @@ module subroutine dislotwin_dotState(Mp,T,ph,me) - 2.0_pReal*rho_dip_distance_min/prm%b_sl * stt%rho_dip(:,me)*abs(dot_gamma_sl) & - dot_rho_dip_climb - call kinetics_twin(Mp,T,dot_gamma_sl,ph,me,dot_gamma_twin) - dot%f_tw(:,me) = f_unrotated*dot_gamma_twin/prm%gamma_char + call kinetics_twin(Mp,T,dot_gamma_sl,ph,me,dot_gamma_tw) + dot%f_tw(:,me) = f_unrotated*dot_gamma_tw/prm%gamma_char call kinetics_trans(Mp,T,dot_gamma_sl,ph,me,dot_gamma_tr) dot%f_tr(:,me) = f_unrotated*dot_gamma_tr @@ -735,7 +735,7 @@ module subroutine dislotwin_dependentState(T,ph,me) T real(pReal) :: & - sumf_twin,Gamma,sumf_trans + sumf_tw,Gamma,sumf_tr real(pReal), dimension(param(ph)%sum_N_sl) :: & inv_lambda_sl_sl, & !< 1/mean free distance between 2 forest dislocations seen by a moving dislocation inv_lambda_sl_tw, & !< 1/mean free distance between 2 twin stacks from different systems seen by a moving dislocation @@ -754,28 +754,28 @@ module subroutine dislotwin_dependentState(T,ph,me) stt => state(ph),& dst => dependentState(ph)) - sumf_twin = sum(stt%f_tw(1:prm%sum_N_tw,me)) - sumf_trans = sum(stt%f_tr(1:prm%sum_N_tr,me)) + sumf_tw = sum(stt%f_tw(1:prm%sum_N_tw,me)) + sumf_tr = sum(stt%f_tr(1:prm%sum_N_tr,me)) Gamma = prm%Gamma_sf_0K + prm%dGamma_sf_dT * T !* rescaled volume fraction for topology f_over_t_tw = stt%f_tw(1:prm%sum_N_tw,me)/prm%t_tw ! this is per system ... - f_over_t_tr = sumf_trans/prm%t_tr ! but this not + f_over_t_tr = sumf_tr/prm%t_tr ! but this not ! ToDo ...Physically correct, but naming could be adjusted inv_lambda_sl_sl = sqrt(matmul(prm%forestProjection, & stt%rho_mob(:,me)+stt%rho_dip(:,me)))/prm%i_sl if (prm%sum_N_tw > 0 .and. prm%sum_N_sl > 0) & - inv_lambda_sl_tw = matmul(prm%h_sl_tw,f_over_t_tw)/(1.0_pReal-sumf_twin) + inv_lambda_sl_tw = matmul(prm%h_sl_tw,f_over_t_tw)/(1.0_pReal-sumf_tw) - inv_lambda_tw_tw = matmul(prm%h_tw_tw,f_over_t_tw)/(1.0_pReal-sumf_twin) + inv_lambda_tw_tw = matmul(prm%h_tw_tw,f_over_t_tw)/(1.0_pReal-sumf_tw) if (prm%sum_N_tr > 0 .and. prm%sum_N_sl > 0) & - inv_lambda_sl_tr = matmul(prm%h_sl_tr,f_over_t_tr)/(1.0_pReal-sumf_trans) + inv_lambda_sl_tr = matmul(prm%h_sl_tr,f_over_t_tr)/(1.0_pReal-sumf_tr) - inv_lambda_tr_tr = matmul(prm%h_tr_tr,f_over_t_tr)/(1.0_pReal-sumf_trans) + inv_lambda_tr_tr = matmul(prm%h_tr_tr,f_over_t_tr)/(1.0_pReal-sumf_tr) if ((prm%sum_N_tw > 0) .or. (prm%sum_N_tr > 0)) then ! ToDo: better logic needed here dst%Lambda_sl(:,me) = prm%D & @@ -951,7 +951,7 @@ end subroutine kinetics_slip ! have the optional arguments at the end. !-------------------------------------------------------------------------------------------------- pure subroutine kinetics_twin(Mp,T,dot_gamma_sl,ph,me,& - dot_gamma_twin,ddot_gamma_dtau_twin) + dot_gamma_tw,ddot_gamma_dtau_tw) real(pReal), dimension(3,3), intent(in) :: & Mp !< Mandel stress @@ -964,9 +964,9 @@ pure subroutine kinetics_twin(Mp,T,dot_gamma_sl,ph,me,& dot_gamma_sl real(pReal), dimension(param(ph)%sum_N_tw), intent(out) :: & - dot_gamma_twin + dot_gamma_tw real(pReal), dimension(param(ph)%sum_N_tw), optional, intent(out) :: & - ddot_gamma_dtau_twin + ddot_gamma_dtau_tw real, dimension(param(ph)%sum_N_tw) :: & tau, & @@ -998,16 +998,16 @@ pure subroutine kinetics_twin(Mp,T,dot_gamma_sl,ph,me,& significantStress: where(tau > tol_math_check) StressRatio_r = (dst%tau_hat_tw(:,me)/tau)**prm%r - dot_gamma_twin = prm%gamma_char * dst%V_tw(:,me) * Ndot0*exp(-StressRatio_r) - ddot_gamma_dtau = (dot_gamma_twin*prm%r/tau)*StressRatio_r + dot_gamma_tw = prm%gamma_char * dst%V_tw(:,me) * Ndot0*exp(-StressRatio_r) + ddot_gamma_dtau = (dot_gamma_tw*prm%r/tau)*StressRatio_r else where significantStress - dot_gamma_twin = 0.0_pReal + dot_gamma_tw = 0.0_pReal ddot_gamma_dtau = 0.0_pReal end where significantStress end associate - if(present(ddot_gamma_dtau_twin)) ddot_gamma_dtau_twin = ddot_gamma_dtau + if(present(ddot_gamma_dtau_tw)) ddot_gamma_dtau_tw = ddot_gamma_dtau end subroutine kinetics_twin @@ -1020,7 +1020,7 @@ end subroutine kinetics_twin ! have the optional arguments at the end. !-------------------------------------------------------------------------------------------------- pure subroutine kinetics_trans(Mp,T,dot_gamma_sl,ph,me,& - dot_gamma_tr,ddot_gamma_dtau_trans) + dot_gamma_tr,ddot_gamma_dtau_tr) real(pReal), dimension(3,3), intent(in) :: & Mp !< Mandel stress @@ -1035,7 +1035,7 @@ pure subroutine kinetics_trans(Mp,T,dot_gamma_sl,ph,me,& real(pReal), dimension(param(ph)%sum_N_tr), intent(out) :: & dot_gamma_tr real(pReal), dimension(param(ph)%sum_N_tr), optional, intent(out) :: & - ddot_gamma_dtau_trans + ddot_gamma_dtau_tr real, dimension(param(ph)%sum_N_tr) :: & tau, & @@ -1075,7 +1075,7 @@ pure subroutine kinetics_trans(Mp,T,dot_gamma_sl,ph,me,& end associate - if(present(ddot_gamma_dtau_trans)) ddot_gamma_dtau_trans = ddot_gamma_dtau + if(present(ddot_gamma_dtau_tr)) ddot_gamma_dtau_tr = ddot_gamma_dtau end subroutine kinetics_trans From d92393ab70f4c65ba85e98c1cca3fef7d76a5dc5 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 27 Feb 2021 10:11:43 +0100 Subject: [PATCH 16/48] avoid accessing uninitialized data --- src/phase_mechanical_plastic_dislotwin.f90 | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index ab58e0dd9..f479ba007 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -737,9 +737,7 @@ module subroutine dislotwin_dependentState(T,ph,me) real(pReal) :: & sumf_tw,Gamma,sumf_tr real(pReal), dimension(param(ph)%sum_N_sl) :: & - inv_lambda_sl_sl, & !< 1/mean free distance between 2 forest dislocations seen by a moving dislocation - inv_lambda_sl_tw, & !< 1/mean free distance between 2 twin stacks from different systems seen by a moving dislocation - inv_lambda_sl_tr !< 1/mean free distance between 2 martensite lamellar from different systems seen by a moving dislocation + inv_lambda_sl real(pReal), dimension(param(ph)%sum_N_tw) :: & inv_lambda_tw_tw, & !< 1/mean free distance between 2 twin stacks from different systems seen by a growing twin f_over_t_tw @@ -764,28 +762,17 @@ module subroutine dislotwin_dependentState(T,ph,me) f_over_t_tr = sumf_tr/prm%t_tr ! but this not ! ToDo ...Physically correct, but naming could be adjusted - inv_lambda_sl_sl = sqrt(matmul(prm%forestProjection, & - stt%rho_mob(:,me)+stt%rho_dip(:,me)))/prm%i_sl - + inv_lambda_sl = sqrt(matmul(prm%forestProjection,stt%rho_mob(:,me)+stt%rho_dip(:,me)))/prm%i_sl if (prm%sum_N_tw > 0 .and. prm%sum_N_sl > 0) & - inv_lambda_sl_tw = matmul(prm%h_sl_tw,f_over_t_tw)/(1.0_pReal-sumf_tw) + inv_lambda_sl = inv_lambda_sl + matmul(prm%h_sl_tw,f_over_t_tw)/(1.0_pReal-sumf_tw) + if (prm%sum_N_tr > 0 .and. prm%sum_N_sl > 0) & + inv_lambda_sl = inv_lambda_sl + matmul(prm%h_sl_tr,f_over_t_tr)/(1.0_pReal-sumf_tr) + dst%Lambda_sl(:,me) = prm%D / (1.0_pReal+prm%D*inv_lambda_sl) inv_lambda_tw_tw = matmul(prm%h_tw_tw,f_over_t_tw)/(1.0_pReal-sumf_tw) - - if (prm%sum_N_tr > 0 .and. prm%sum_N_sl > 0) & - inv_lambda_sl_tr = matmul(prm%h_sl_tr,f_over_t_tr)/(1.0_pReal-sumf_tr) + dst%Lambda_tw(:,me) = prm%i_tw*prm%D/(1.0_pReal+prm%D*inv_lambda_tw_tw) inv_lambda_tr_tr = matmul(prm%h_tr_tr,f_over_t_tr)/(1.0_pReal-sumf_tr) - - if ((prm%sum_N_tw > 0) .or. (prm%sum_N_tr > 0)) then ! ToDo: better logic needed here - dst%Lambda_sl(:,me) = prm%D & - / (1.0_pReal+prm%D*(inv_lambda_sl_sl + inv_lambda_sl_tw + inv_lambda_sl_tr)) - else - dst%Lambda_sl(:,me) = prm%D & - / (1.0_pReal+prm%D*inv_lambda_sl_sl) !!!!!! correct? - endif - - dst%Lambda_tw(:,me) = prm%i_tw*prm%D/(1.0_pReal+prm%D*inv_lambda_tw_tw) dst%Lambda_tr(:,me) = prm%i_tr*prm%D/(1.0_pReal+prm%D*inv_lambda_tr_tr) !* threshold stress for dislocation motion From ea763fd941e86e979fbc82aba1ce3b313d6d54f7 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Sat, 27 Feb 2021 11:15:01 -0500 Subject: [PATCH 17/48] generalized stereographic projection to cope with all three directions (x,y,Z) --- python/damask/util.py | 15 ++++++++++----- python/tests/test_util.py | 18 +++++++++--------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/python/damask/util.py b/python/damask/util.py index cda532bc0..6f148c418 100644 --- a/python/damask/util.py +++ b/python/damask/util.py @@ -193,7 +193,7 @@ def scale_to_coprime(v): return m -def project_stereographic(vector,normalize=False): +def project_stereographic(vector,normalize=False,direction='z'): """ Apply stereographic projection to vector. @@ -203,16 +203,21 @@ def project_stereographic(vector,normalize=False): Vector coordinates to be projected. normalize : bool Ensure unit length for vector. Defaults to False. + direction : str or int + Projection direction 'x'|0, 'y'|1, or 'z'|2. + Defaults to 'z'. Returns ------- - coordinates : numpy.ndarray of shape (...,2) + coordinates : numpy.ndarray of shape (...,3) Projected coordinates. """ - v_ = vector/np.linalg.norm(vector,axis=-1,keepdims=True) if normalize else vector - return np.block([v_[...,:2]/(1+np.abs(v_[...,2:3])), - np.zeros_like(v_[...,2:3])]) + shift = 2-('xyzXYZ'.index(direction)%3 if isinstance(direction,str) else int(direction)) + v_ = np.roll(vector/np.linalg.norm(vector,axis=-1,keepdims=True) if normalize else vector, + shift,axis=-1) + return np.roll(np.block([v_[...,:2]/(1+np.abs(v_[...,2:3])),np.zeros_like(v_[...,2:3])]), + -shift,axis=-1) def execution_stamp(class_name,function_name=None): diff --git a/python/tests/test_util.py b/python/tests/test_util.py index eb1084b09..3b0052070 100644 --- a/python/tests/test_util.py +++ b/python/tests/test_util.py @@ -49,17 +49,17 @@ class TestUtil: dist_sampled = np.histogram(centers[selected],bins)[0]/N_samples*np.sum(dist) assert np.sqrt(((dist - dist_sampled) ** 2).mean()) < .025 and selected.shape[0]==N_samples - @pytest.mark.parametrize('point,normalize,answer', + @pytest.mark.parametrize('point,normalize,direction,answer', [ - ([1,0,0],False,[1,0,0]), - ([1,0,0],True, [1,0,0]), - ([0,1,1],False,[0,0.5,0]), - ([0,1,1],True, [0,0.41421356,0]), - ([1,1,1],False,[0.5,0.5,0]), - ([1,1,1],True, [0.3660254, 0.3660254, 0]), + ([1,0,0],False,'z',[1,0,0]), + ([1,0,0],True, 'z',[1,0,0]), + ([0,1,1],False,'z',[0,0.5,0]), + ([0,1,1],True, 'y',[0,0,0.41421356]), + ([1,1,1],False,'x',[0,0.5,0.5]), + ([1,1,1],True, 'y',[0.3660254, 0,0.3660254]), ]) - def test_project_stereographic(self,point,normalize,answer): - assert np.allclose(util.project_stereographic(np.array(point),normalize=normalize),answer) + def test_project_stereographic(self,point,normalize,direction,answer): + assert np.allclose(util.project_stereographic(np.array(point),normalize=normalize,direction=direction),answer) @pytest.mark.parametrize('fro,to,mode,answer', [ From 175d724dedf9b05c176ee0c7d828fe825d163bd4 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Sat, 27 Feb 2021 18:32:53 -0500 Subject: [PATCH 18/48] added keepdims=False option to project_stereographic --- python/damask/util.py | 26 ++++++++++++++++++++------ python/tests/test_util.py | 19 ++++++++++--------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/python/damask/util.py b/python/damask/util.py index 6f148c418..951eb921e 100644 --- a/python/damask/util.py +++ b/python/damask/util.py @@ -193,7 +193,7 @@ def scale_to_coprime(v): return m -def project_stereographic(vector,normalize=False,direction='z'): +def project_stereographic(vector,direction='z',normalize=True,keepdims=False): """ Apply stereographic projection to vector. @@ -201,23 +201,37 @@ def project_stereographic(vector,normalize=False,direction='z'): ---------- vector : numpy.ndarray of shape (...,3) Vector coordinates to be projected. - normalize : bool - Ensure unit length for vector. Defaults to False. direction : str or int - Projection direction 'x'|0, 'y'|1, or 'z'|2. + Projection direction 'x' | 0, 'y' | 1, or 'z' | 2. Defaults to 'z'. + normalize : bool + Ensure unit length of input vector. Defaults to True. + keepdims : bool + Maintain three-dimensional output coordinates. + Default two-dimensional output uses right-handed frame spanned by + the next and next-next axis relative to the projection direction, + e.g. x-y when projecting along z and z-x when projecting along y. Returns ------- - coordinates : numpy.ndarray of shape (...,3) + coordinates : numpy.ndarray of shape (...,2 | 3) Projected coordinates. + Examples + -------- + >>> project_stereographic(np.ones(3)) + [0.3660254, 0.3660254] + >>> project_stereographic(np.ones(3),direction='x',normalize=False,keepdims=True) + [0, 0.5, 0.5] + >>> project_stereographic([0,1,1],direction='y',normalize=True,keepdims=False) + [0.41421356, 0] + """ shift = 2-('xyzXYZ'.index(direction)%3 if isinstance(direction,str) else int(direction)) v_ = np.roll(vector/np.linalg.norm(vector,axis=-1,keepdims=True) if normalize else vector, shift,axis=-1) return np.roll(np.block([v_[...,:2]/(1+np.abs(v_[...,2:3])),np.zeros_like(v_[...,2:3])]), - -shift,axis=-1) + -shift if keepdims else 0,axis=-1)[...,:3 if keepdims else 2] def execution_stamp(class_name,function_name=None): diff --git a/python/tests/test_util.py b/python/tests/test_util.py index 3b0052070..397926682 100644 --- a/python/tests/test_util.py +++ b/python/tests/test_util.py @@ -49,17 +49,18 @@ class TestUtil: dist_sampled = np.histogram(centers[selected],bins)[0]/N_samples*np.sum(dist) assert np.sqrt(((dist - dist_sampled) ** 2).mean()) < .025 and selected.shape[0]==N_samples - @pytest.mark.parametrize('point,normalize,direction,answer', + @pytest.mark.parametrize('point,direction,normalize,keepdims,answer', [ - ([1,0,0],False,'z',[1,0,0]), - ([1,0,0],True, 'z',[1,0,0]), - ([0,1,1],False,'z',[0,0.5,0]), - ([0,1,1],True, 'y',[0,0,0.41421356]), - ([1,1,1],False,'x',[0,0.5,0.5]), - ([1,1,1],True, 'y',[0.3660254, 0,0.3660254]), + ([1,0,0],'z',False,True, [1,0,0]), + ([1,0,0],'z',True, False,[1,0]), + ([0,1,1],'z',False,True, [0,0.5,0]), + ([0,1,1],'y',True, False,[0.41421356,0]), + ([1,1,0],'x',False,False,[0.5,0]), + ([1,1,1],'y',True, True, [0.3660254, 0,0.3660254]), ]) - def test_project_stereographic(self,point,normalize,direction,answer): - assert np.allclose(util.project_stereographic(np.array(point),normalize=normalize,direction=direction),answer) + def test_project_stereographic(self,point,direction,normalize,keepdims,answer): + assert np.allclose(util.project_stereographic(np.array(point),direction=direction, + normalize=normalize,keepdims=keepdims),answer) @pytest.mark.parametrize('fro,to,mode,answer', [ From c483dc609fdacebdba9cffdb3c74ee08f071f418 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 28 Feb 2021 10:08:16 +0100 Subject: [PATCH 19/48] common name --- src/homogenization.f90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 5078f0a09..52e90a857 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -520,14 +520,14 @@ function damage_nonlocal_getDiffusion(ce) damage_nonlocal_getDiffusion integer :: & ho, & - grain + co ho = material_homogenizationAt2(ce) damage_nonlocal_getDiffusion = 0.0_pReal - do grain = 1, homogenization_Nconstituents(ho) + do co = 1, homogenization_Nconstituents(ho) damage_nonlocal_getDiffusion = damage_nonlocal_getDiffusion + & - crystallite_push33ToRef(grain,ce,lattice_D(1:3,1:3,material_phaseAt2(grain,ce))) + crystallite_push33ToRef(co,ce,lattice_D(1:3,1:3,material_phaseAt2(co,ce))) enddo damage_nonlocal_getDiffusion = & From 464c62e7e707468e598bb47396b18965331bd7fc Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Sat, 27 Feb 2021 18:46:20 -0500 Subject: [PATCH 20/48] abandoned integer aliases for projection directions --- python/damask/util.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/damask/util.py b/python/damask/util.py index 951eb921e..61ec5e5cb 100644 --- a/python/damask/util.py +++ b/python/damask/util.py @@ -201,8 +201,8 @@ def project_stereographic(vector,direction='z',normalize=True,keepdims=False): ---------- vector : numpy.ndarray of shape (...,3) Vector coordinates to be projected. - direction : str or int - Projection direction 'x' | 0, 'y' | 1, or 'z' | 2. + direction : str + Projection direction 'x', 'y', or 'z'. Defaults to 'z'. normalize : bool Ensure unit length of input vector. Defaults to True. @@ -227,7 +227,7 @@ def project_stereographic(vector,direction='z',normalize=True,keepdims=False): [0.41421356, 0] """ - shift = 2-('xyzXYZ'.index(direction)%3 if isinstance(direction,str) else int(direction)) + shift = 'zyx'.index(direction) v_ = np.roll(vector/np.linalg.norm(vector,axis=-1,keepdims=True) if normalize else vector, shift,axis=-1) return np.roll(np.block([v_[...,:2]/(1+np.abs(v_[...,2:3])),np.zeros_like(v_[...,2:3])]), From dc50400863306069ddb86332160af315d5de5094 Mon Sep 17 00:00:00 2001 From: Test User Date: Sun, 28 Feb 2021 13:26:39 +0100 Subject: [PATCH 21/48] [skip ci] updated version information after successful test of v3.0.0-alpha2-548-gc483dc609 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a0cb6a522..83ef4eefa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-534-g1d6234181 +v3.0.0-alpha2-548-gc483dc609 From 1be6950c0b9d66e9f30b4e8ae4da786c772e5066 Mon Sep 17 00:00:00 2001 From: Test User Date: Sun, 28 Feb 2021 16:32:50 +0100 Subject: [PATCH 22/48] [skip ci] updated version information after successful test of v3.0.0-alpha2-553-g2691ef211 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 83ef4eefa..e41ad05a9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-548-gc483dc609 +v3.0.0-alpha2-553-g2691ef211 From 4dd99d4c39e3473e9f6146b0f4812ca14b4d0b0e Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 28 Feb 2021 19:13:20 +0100 Subject: [PATCH 23/48] solver is selected in load case, not numerics.yaml --- PRIVATE | 2 +- src/grid/DAMASK_grid.f90 | 34 +++++++++----------- src/grid/grid_mech_spectral_polarisation.f90 | 2 +- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/PRIVATE b/PRIVATE index 0289c1bbf..738526ac7 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 0289c1bbfec1a1aef77a8cbaeed134035549e738 +Subproject commit 738526ac7ae63678c885faba7621782499f2bce9 diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index d250e2f53..e0eaef892 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -78,8 +78,7 @@ program DAMASK_grid maxCutBack, & !< max number of cut backs stagItMax !< max number of field level staggered iterations character(len=pStringLen) :: & - incInfo, & - loadcase_string + incInfo type(tLoadCase), allocatable, dimension(:) :: loadCases !< array of all load cases type(tSolutionState), allocatable, dimension(:) :: solres @@ -98,10 +97,10 @@ program DAMASK_grid quit class (tNode), pointer :: & num_grid, & - debug_grid, & ! pointer to grid debug options config_load, & load_steps, & load_step, & + solver, & step_bc, & step_mech, & step_discretization, & @@ -117,12 +116,6 @@ program DAMASK_grid print*, 'Shanthraj et al., Handbook of Mechanics of Materials, 2019' print*, 'https://doi.org/10.1007/978-981-10-6855-3_80' -!-------------------------------------------------------------------------------------------------- -! initialize field solver information - nActiveFields = 1 - if (any(thermal_type == THERMAL_conduction_ID )) nActiveFields = nActiveFields + 1 - if (any(damage_type == DAMAGE_nonlocal_ID )) nActiveFields = nActiveFields + 1 - allocate(solres(nActiveFields)) !------------------------------------------------------------------------------------------------- ! reading field paramters from numerics file and do sanity checks @@ -132,20 +125,23 @@ program DAMASK_grid if (stagItMax < 0) call IO_error(301,ext_msg='maxStaggeredIter') if (maxCutBack < 0) call IO_error(301,ext_msg='maxCutBack') + + config_load => YAML_parse_file(trim(interface_loadFile)) + solver => config_load%get('solver') !-------------------------------------------------------------------------------------------------- ! assign mechanics solver depending on selected type - debug_grid => config_debug%get('grid',defaultVal=emptyList) - select case (trim(num_grid%get_asString('solver', defaultVal = 'Basic'))) - case ('Basic') + nActiveFields = 1 + select case (solver%get_asString('mechanical')) + case ('spectral_basic') mechanical_init => grid_mechanical_spectral_basic_init mechanical_forward => grid_mechanical_spectral_basic_forward mechanical_solution => grid_mechanical_spectral_basic_solution mechanical_updateCoords => grid_mechanical_spectral_basic_updateCoords mechanical_restartWrite => grid_mechanical_spectral_basic_restartWrite - case ('Polarisation') + case ('spectral_polarization') mechanical_init => grid_mechanical_spectral_polarisation_init mechanical_forward => grid_mechanical_spectral_polarisation_forward mechanical_solution => grid_mechanical_spectral_polarisation_solution @@ -160,14 +156,17 @@ program DAMASK_grid mechanical_restartWrite => grid_mechanical_FEM_restartWrite case default - call IO_error(error_ID = 891, ext_msg = trim(num_grid%get_asString('solver'))) + call IO_error(error_ID = 891, ext_msg = trim(solver%get_asString('mechanical'))) end select +!-------------------------------------------------------------------------------------------------- +! initialize field solver information + if (any(thermal_type == THERMAL_conduction_ID )) nActiveFields = nActiveFields + 1 + if (any(damage_type == DAMAGE_nonlocal_ID )) nActiveFields = nActiveFields + 1 + allocate(solres(nActiveFields)) !-------------------------------------------------------------------------------------------------- -! reading information from load case file and to sanity checks - config_load => YAML_parse_file(trim(interface_loadFile)) load_steps => config_load%get('loadstep') allocate(loadCases(load_steps%length)) ! array of load cases @@ -232,7 +231,6 @@ program DAMASK_grid merge(.true.,.false.,l > 1)) reportAndCheck: if (worldrank == 0) then - write (loadcase_string, '(i0)' ) l print'(/,a,i0)', ' load case: ', l print*, ' estimate_rate:', loadCases(l)%estimate_rate if (loadCases(l)%deformation%myType == 'L') then @@ -292,7 +290,7 @@ program DAMASK_grid if (loadCases(l)%f_restart < huge(0)) & print'(a,i0)', ' f_restart: ', loadCases(l)%f_restart - if (errorID > 0) call IO_error(error_ID = errorID, ext_msg = loadcase_string) ! exit with error message + if (errorID > 0) call IO_error(error_ID = errorID, el = l) endif reportAndCheck enddo diff --git a/src/grid/grid_mech_spectral_polarisation.f90 b/src/grid/grid_mech_spectral_polarisation.f90 index 8caf41b31..31f69b4c5 100644 --- a/src/grid/grid_mech_spectral_polarisation.f90 +++ b/src/grid/grid_mech_spectral_polarisation.f90 @@ -116,7 +116,7 @@ subroutine grid_mechanical_spectral_polarisation_init num_grid, & debug_grid - print'(/,a)', ' <<<+- grid_mechanical_spectral_polarisation init -+>>>'; flush(IO_STDOUT) + print'(/,a)', ' <<<+- grid_mechanical_spectral_polarization init -+>>>'; flush(IO_STDOUT) print*, 'Shanthraj et al., International Journal of Plasticity 66:31–45, 2015' print*, 'https://doi.org/10.1016/j.ijplas.2014.02.006' From b2fea6b149a74511c3c5018137abb2a96945cea7 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 28 Feb 2021 19:24:44 +0100 Subject: [PATCH 24/48] solver not specific to load case number --- src/grid/DAMASK_grid.f90 | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index e0eaef892..36ebf51a3 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -37,8 +37,9 @@ program DAMASK_grid f_out, & !< frequency of result writes f_restart !< frequency of restart writes logical :: estimate_rate !< follow trajectory of former loadcase - integer(kind(FIELD_UNDEFINED_ID)), allocatable :: ID(:) end type tLoadCase + + integer(kind(FIELD_UNDEFINED_ID)), allocatable :: ID(:) !-------------------------------------------------------------------------------------------------- ! variables related to information from load case and geom file @@ -165,6 +166,19 @@ program DAMASK_grid if (any(thermal_type == THERMAL_conduction_ID )) nActiveFields = nActiveFields + 1 if (any(damage_type == DAMAGE_nonlocal_ID )) nActiveFields = nActiveFields + 1 allocate(solres(nActiveFields)) + + allocate(ID(nActiveFields)) + field = 1 + ID(field) = FIELD_MECH_ID ! mechanical active by default + thermalActive: if (any(thermal_type == THERMAL_conduction_ID)) then + field = field + 1 + ID(field) = FIELD_THERMAL_ID + endif thermalActive + damageActive: if (any(damage_type == DAMAGE_nonlocal_ID)) then + field = field + 1 + ID(field) = FIELD_DAMAGE_ID + endif damageActive + !-------------------------------------------------------------------------------------------------- @@ -173,18 +187,6 @@ program DAMASK_grid do l = 1, load_steps%length - allocate(loadCases(l)%ID(nActiveFields)) - field = 1 - loadCases(l)%ID(field) = FIELD_MECH_ID ! mechanical active by default - thermalActive: if (any(thermal_type == THERMAL_conduction_ID)) then - field = field + 1 - loadCases(l)%ID(field) = FIELD_THERMAL_ID - endif thermalActive - damageActive: if (any(damage_type == DAMAGE_nonlocal_ID)) then - field = field + 1 - loadCases(l)%ID(field) = FIELD_DAMAGE_ID - endif damageActive - load_step => load_steps%get(l) step_bc => load_step%get('boundary_conditions') step_mech => step_bc%get('mechanical') @@ -299,7 +301,7 @@ program DAMASK_grid ! doing initialization depending on active solvers call spectral_Utilities_init do field = 1, nActiveFields - select case (loadCases(1)%ID(field)) + select case (ID(field)) case(FIELD_MECH_ID) call mechanical_init @@ -375,7 +377,7 @@ program DAMASK_grid !-------------------------------------------------------------------------------------------------- ! forward fields do field = 1, nActiveFields - select case(loadCases(l)%ID(field)) + select case(ID(field)) case(FIELD_MECH_ID) call mechanical_forward (& cutBack,guess,timeinc,timeIncOld,remainingLoadCaseTime, & @@ -395,7 +397,7 @@ program DAMASK_grid stagIterate = .true. do while (stagIterate) do field = 1, nActiveFields - select case(loadCases(l)%ID(field)) + select case(ID(field)) case(FIELD_MECH_ID) solres(field) = mechanical_solution(incInfo) case(FIELD_THERMAL_ID) From ef543a5b4970d7fd49b26a3bed72939bed393936 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 28 Feb 2021 20:06:31 +0100 Subject: [PATCH 25/48] thermal solver is defined in load case not in numerics.yaml --- src/CPFEM.f90 | 10 +++++----- src/grid/DAMASK_grid.f90 | 4 ++-- src/homogenization.f90 | 14 ++++++-------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/CPFEM.f90 b/src/CPFEM.f90 index f0e510433..01b4c034d 100644 --- a/src/CPFEM.f90 +++ b/src/CPFEM.f90 @@ -178,11 +178,11 @@ subroutine CPFEM_general(mode, ffn, ffn1, temperature_inp, dt, elFE, ip, cauchyS if (iand(mode, CPFEM_AGERESULTS) /= 0_pInt) call CPFEM_forward - chosenThermal1: select case (thermal_type(material_homogenizationAt(elCP))) - !case (THERMAL_conduction_ID) chosenThermal1 - ! temperature(material_homogenizationAt(elCP))%p(material_homogenizationMemberAt(ip,elCP)) = & - ! temperature_inp - end select chosenThermal1 + !chosenThermal1: select case (thermal_type(material_homogenizationAt(elCP))) + ! case (THERMAL_conduction_ID) chosenThermal1 + ! temperature(material_homogenizationAt(elCP))%p(material_homogenizationMemberAt(ip,elCP)) = & + ! temperature_inp + !end select chosenThermal1 homogenization_F0(1:3,1:3,ma) = ffn homogenization_F(1:3,1:3,ma) = ffn1 diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index 36ebf51a3..7155a5c80 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -163,14 +163,14 @@ program DAMASK_grid !-------------------------------------------------------------------------------------------------- ! initialize field solver information - if (any(thermal_type == THERMAL_conduction_ID )) nActiveFields = nActiveFields + 1 + if (solver%get_asString('thermal',defaultVal = 'n/a') == 'spectral') nActiveFields = nActiveFields + 1 if (any(damage_type == DAMAGE_nonlocal_ID )) nActiveFields = nActiveFields + 1 allocate(solres(nActiveFields)) allocate(ID(nActiveFields)) field = 1 ID(field) = FIELD_MECH_ID ! mechanical active by default - thermalActive: if (any(thermal_type == THERMAL_conduction_ID)) then + thermalActive: if (solver%get_asString('thermal',defaultVal = 'n/a') == 'spectral') then field = field + 1 ID(field) = FIELD_THERMAL_ID endif thermalActive diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 52e90a857..7c0c1531b 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -39,11 +39,11 @@ module homogenization real(pReal), dimension(:), allocatable, public, protected :: & thermal_initialT - integer(kind(THERMAL_isothermal_ID)), dimension(:), allocatable, public, protected :: & + integer(kind(THERMAL_isothermal_ID)), dimension(:), allocatable :: & thermal_type !< thermal transport model integer(kind(DAMAGE_none_ID)), dimension(:), allocatable, public, protected :: & damage_type !< nonlocal damage model - integer(kind(HOMOGENIZATION_undefined_ID)), dimension(:), allocatable, public, protected :: & + integer(kind(HOMOGENIZATION_undefined_ID)), dimension(:), allocatable :: & homogenization_type !< type of each homogenization type, private :: tNumerics_damage @@ -553,10 +553,10 @@ subroutine material_parseHomogenization material_homogenization => config_material%get('homogenization') - allocate(homogenization_type(size(material_name_homogenization)), source=HOMOGENIZATION_undefined_ID) - allocate(thermal_type(size(material_name_homogenization)), source=THERMAL_isothermal_ID) - allocate(damage_type (size(material_name_homogenization)), source=DAMAGE_none_ID) - allocate(thermal_initialT(size(material_name_homogenization)), source=300.0_pReal) + allocate(homogenization_type(size(material_name_homogenization)), source=HOMOGENIZATION_undefined_ID) + allocate(thermal_type(size(material_name_homogenization)), source=THERMAL_isothermal_ID) + allocate(damage_type (size(material_name_homogenization)), source=DAMAGE_none_ID) + allocate(thermal_initialT(size(material_name_homogenization)), source=300.0_pReal) do h=1, size(material_name_homogenization) homog => material_homogenization%get(h) @@ -578,8 +578,6 @@ subroutine material_parseHomogenization thermal_initialT(h) = homogThermal%get_asFloat('T_0',defaultVal=300.0_pReal) select case (homogThermal%get_asString('type')) - case('isothermal') - thermal_type(h) = THERMAL_isothermal_ID case('conduction') thermal_type(h) = THERMAL_conduction_ID case default From ae57ba9707c774ad133a22ef35ec702073dd4486 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 28 Feb 2021 20:10:12 +0100 Subject: [PATCH 26/48] got random errors 'O not found' might be related to use of pointers in openMP. Not nice, but openMP during initialization is not really required --- src/phase_mechanical.f90 | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90 index be14c57e6..c934fed72 100644 --- a/src/phase_mechanical.f90 +++ b/src/phase_mechanical.f90 @@ -279,7 +279,6 @@ module subroutine mechanical_init(materials,phases) endif - !$OMP PARALLEL DO PRIVATE(ph,me,material,constituents,constituent) do el = 1, size(material_phaseMemberAt,3); do ip = 1, size(material_phaseMemberAt,2) do co = 1, homogenization_Nconstituents(material_homogenizationAt(el)) material => materials%get(discretization_materialAt(el)) @@ -305,7 +304,6 @@ module subroutine mechanical_init(materials,phases) enddo enddo; enddo - !$OMP END PARALLEL DO ! initialize plasticity From 0cde43198f5fdc89bc817dc5243c8cd9d7da669b Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 28 Feb 2021 20:49:51 +0100 Subject: [PATCH 27/48] modernizing: - 'pass' for dummy thermal homogenization - setting temperature in load case --- PRIVATE | 2 +- src/grid/DAMASK_grid.f90 | 14 ++++++++++++-- src/grid/grid_thermal_spectral.f90 | 4 +++- src/homogenization.f90 | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/PRIVATE b/PRIVATE index 738526ac7..23ef2dcf3 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 738526ac7ae63678c885faba7621782499f2bce9 +Subproject commit 23ef2dcf34729c8b05caba62f648149ca37a68c9 diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index 7155a5c80..0461b43d9 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -54,6 +54,7 @@ program DAMASK_grid integer, parameter :: & subStepFactor = 2 !< for each substep, divide the last time increment by 2.0 real(pReal) :: & + T_0 = 273.0_pReal, & time = 0.0_pReal, & !< elapsed time time0 = 0.0_pReal, & !< begin of interval timeinc = 1.0_pReal, & !< current time interval @@ -102,6 +103,9 @@ program DAMASK_grid load_steps, & load_step, & solver, & + initial_conditions, & + ic_thermal, & + thermal, & step_bc, & step_mech, & step_discretization, & @@ -181,7 +185,6 @@ program DAMASK_grid !-------------------------------------------------------------------------------------------------- - load_steps => config_load%get('loadstep') allocate(loadCases(load_steps%length)) ! array of load cases @@ -306,7 +309,14 @@ program DAMASK_grid call mechanical_init case(FIELD_THERMAL_ID) - call grid_thermal_spectral_init + if (solver%contains('initial_conditions')) then + initial_conditions => solver%get('initial_conditions') + if (initial_conditions%contains('thermal')) then + thermal => solver%get('thermal') + T_0 = thermal%get_asFloat('thermal',defaultVal = T_0) + endif + endif + call grid_thermal_spectral_init(T_0) case(FIELD_DAMAGE_ID) call grid_damage_spectral_init diff --git a/src/grid/grid_thermal_spectral.f90 b/src/grid/grid_thermal_spectral.f90 index 6403ee955..40a84a02e 100644 --- a/src/grid/grid_thermal_spectral.f90 +++ b/src/grid/grid_thermal_spectral.f90 @@ -61,7 +61,9 @@ contains !> @brief allocates all neccessary fields and fills them with data ! ToDo: Restart not implemented !-------------------------------------------------------------------------------------------------- -subroutine grid_thermal_spectral_init +subroutine grid_thermal_spectral_init(T_0) + + real(pReal), intent(in) :: T_0 PetscInt, dimension(0:worldsize-1) :: localK integer :: i, j, k, ce diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 7c0c1531b..1572a0197 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -578,7 +578,7 @@ subroutine material_parseHomogenization thermal_initialT(h) = homogThermal%get_asFloat('T_0',defaultVal=300.0_pReal) select case (homogThermal%get_asString('type')) - case('conduction') + case('pass') thermal_type(h) = THERMAL_conduction_ID case default call IO_error(500,ext_msg=homogThermal%get_asString('type')) From 8af0c8dbc30aa067a94de19427b454cd9dba90b9 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 28 Feb 2021 21:51:07 +0100 Subject: [PATCH 28/48] using initial temperature from load case file --- PRIVATE | 2 +- src/grid/DAMASK_grid.f90 | 10 +++++----- src/grid/grid_thermal_spectral.f90 | 3 ++- src/homogenization.f90 | 6 ------ src/homogenization_thermal.f90 | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/PRIVATE b/PRIVATE index 23ef2dcf3..89eb15f1d 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 23ef2dcf34729c8b05caba62f648149ca37a68c9 +Subproject commit 89eb15f1d771279be8ff444202c32b6797e77bd7 diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index 0461b43d9..3930e0002 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -54,7 +54,7 @@ program DAMASK_grid integer, parameter :: & subStepFactor = 2 !< for each substep, divide the last time increment by 2.0 real(pReal) :: & - T_0 = 273.0_pReal, & + T_0 = 300.0_pReal, & time = 0.0_pReal, & !< elapsed time time0 = 0.0_pReal, & !< begin of interval timeinc = 1.0_pReal, & !< current time interval @@ -309,11 +309,11 @@ program DAMASK_grid call mechanical_init case(FIELD_THERMAL_ID) - if (solver%contains('initial_conditions')) then - initial_conditions => solver%get('initial_conditions') + if (config_load%contains('initial_conditions')) then + initial_conditions => config_load%get('initial_conditions') if (initial_conditions%contains('thermal')) then - thermal => solver%get('thermal') - T_0 = thermal%get_asFloat('thermal',defaultVal = T_0) + thermal => initial_conditions%get('thermal') + T_0 = thermal%get_asFloat('T',defaultVal = T_0) endif endif call grid_thermal_spectral_init(T_0) diff --git a/src/grid/grid_thermal_spectral.f90 b/src/grid/grid_thermal_spectral.f90 index 40a84a02e..5ac043a67 100644 --- a/src/grid/grid_thermal_spectral.f90 +++ b/src/grid/grid_thermal_spectral.f90 @@ -133,9 +133,10 @@ subroutine grid_thermal_spectral_init(T_0) ce = 0 do k = 1, grid3; do j = 1, grid(2); do i = 1,grid(1) ce = ce + 1 - T_current(i,j,k) = homogenization_thermal_T(ce) + T_current(i,j,k) = T_0 T_lastInc(i,j,k) = T_current(i,j,k) T_stagInc(i,j,k) = T_current(i,j,k) + call homogenization_thermal_setField(T_0,0.0_pReal,ce) enddo; enddo; enddo call DMDAVecGetArrayF90(thermal_grid,solution_vec,x_scal,ierr); CHKERRQ(ierr) !< get the data out of PETSc to work with x_scal(xstart:xend,ystart:yend,zstart:zend) = T_current diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 1572a0197..d5fdbd5cb 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -35,10 +35,6 @@ module homogenization homogState, & damageState_h - - real(pReal), dimension(:), allocatable, public, protected :: & - thermal_initialT - integer(kind(THERMAL_isothermal_ID)), dimension(:), allocatable :: & thermal_type !< thermal transport model integer(kind(DAMAGE_none_ID)), dimension(:), allocatable, public, protected :: & @@ -556,7 +552,6 @@ subroutine material_parseHomogenization allocate(homogenization_type(size(material_name_homogenization)), source=HOMOGENIZATION_undefined_ID) allocate(thermal_type(size(material_name_homogenization)), source=THERMAL_isothermal_ID) allocate(damage_type (size(material_name_homogenization)), source=DAMAGE_none_ID) - allocate(thermal_initialT(size(material_name_homogenization)), source=300.0_pReal) do h=1, size(material_name_homogenization) homog => material_homogenization%get(h) @@ -575,7 +570,6 @@ subroutine material_parseHomogenization if(homog%contains('thermal')) then homogThermal => homog%get('thermal') - thermal_initialT(h) = homogThermal%get_asFloat('T_0',defaultVal=300.0_pReal) select case (homogThermal%get_asString('type')) case('pass') diff --git a/src/homogenization_thermal.f90 b/src/homogenization_thermal.f90 index 928bd547b..efb6e7b58 100644 --- a/src/homogenization_thermal.f90 +++ b/src/homogenization_thermal.f90 @@ -44,7 +44,7 @@ module subroutine thermal_init() allocate(current(configHomogenizations%length)) do ho = 1, configHomogenizations%length - allocate(current(ho)%T(count(material_homogenizationAt2==ho)), source=thermal_initialT(ho)) + allocate(current(ho)%T(count(material_homogenizationAt2==ho)), source=300.0_pReal) allocate(current(ho)%dot_T(count(material_homogenizationAt2==ho)), source=0.0_pReal) configHomogenization => configHomogenizations%get(ho) associate(prm => param(ho)) From e7979c2223aeade8d92ab3fb7f2cd13768523fcf Mon Sep 17 00:00:00 2001 From: Test User Date: Sun, 28 Feb 2021 22:19:40 +0100 Subject: [PATCH 29/48] [skip ci] updated version information after successful test of v3.0.0-alpha2-572-g7b89cb41f --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e41ad05a9..4ebc52387 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-553-g2691ef211 +v3.0.0-alpha2-572-g7b89cb41f From 2f68c43755ca3af45dc01701789a732b868adcbd Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 1 Mar 2021 06:16:16 +0100 Subject: [PATCH 30/48] new style configuration for damage --- PRIVATE | 2 +- src/grid/DAMASK_grid.f90 | 4 ++-- src/homogenization.f90 | 6 ++---- src/material.f90 | 4 ++-- src/phase_mechanical_plastic_nonlocal.f90 | 15 ++++++--------- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/PRIVATE b/PRIVATE index 89eb15f1d..08e226ec7 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 89eb15f1d771279be8ff444202c32b6797e77bd7 +Subproject commit 08e226ec735589123dd67f3e0a5bc447c3dda812 diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index 3930e0002..fda9d7b9a 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -168,7 +168,7 @@ program DAMASK_grid !-------------------------------------------------------------------------------------------------- ! initialize field solver information if (solver%get_asString('thermal',defaultVal = 'n/a') == 'spectral') nActiveFields = nActiveFields + 1 - if (any(damage_type == DAMAGE_nonlocal_ID )) nActiveFields = nActiveFields + 1 + if (solver%get_asString('damage', defaultVal = 'n/a') == 'spectral') nActiveFields = nActiveFields + 1 allocate(solres(nActiveFields)) allocate(ID(nActiveFields)) @@ -178,7 +178,7 @@ program DAMASK_grid field = field + 1 ID(field) = FIELD_THERMAL_ID endif thermalActive - damageActive: if (any(damage_type == DAMAGE_nonlocal_ID)) then + damageActive: if (solver%get_asString('damage',defaultVal = 'n/a') == 'spectral') then field = field + 1 ID(field) = FIELD_DAMAGE_ID endif damageActive diff --git a/src/homogenization.f90 b/src/homogenization.f90 index d5fdbd5cb..4c7200eed 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -37,7 +37,7 @@ module homogenization integer(kind(THERMAL_isothermal_ID)), dimension(:), allocatable :: & thermal_type !< thermal transport model - integer(kind(DAMAGE_none_ID)), dimension(:), allocatable, public, protected :: & + integer(kind(DAMAGE_none_ID)), dimension(:), allocatable :: & damage_type !< nonlocal damage model integer(kind(HOMOGENIZATION_undefined_ID)), dimension(:), allocatable :: & homogenization_type !< type of each homogenization @@ -582,9 +582,7 @@ subroutine material_parseHomogenization if(homog%contains('damage')) then homogDamage => homog%get('damage') select case (homogDamage%get_asString('type')) - case('none') - damage_type(h) = DAMAGE_none_ID - case('nonlocal') + case('pass') damage_type(h) = DAMAGE_nonlocal_ID case default call IO_error(500,ext_msg=homogDamage%get_asString('type')) diff --git a/src/material.f90 b/src/material.f90 index c7d24b6f0..aecfaa1dd 100644 --- a/src/material.f90 +++ b/src/material.f90 @@ -17,7 +17,7 @@ module material private integer, dimension(:), allocatable, public, protected :: & - homogenization_Nconstituents !< number of grains in each homogenization + homogenization_Nconstituents !< number of grains in each homogenization character(len=:), public, protected, allocatable, dimension(:) :: & material_name_phase, & !< name of each phase @@ -30,7 +30,7 @@ module material material_homogenizationAt, & !< homogenization ID of each element material_homogenizationAt2, & !< per cell material_homogenizationMemberAt2 !< cell - integer, dimension(:,:), allocatable, public, protected :: & ! (ip,elem) + integer, dimension(:,:), allocatable :: & ! (ip,elem) material_homogenizationMemberAt !< position of the element within its homogenization instance integer, dimension(:,:), allocatable, public, protected :: & ! (constituent,elem) material_phaseAt, & !< phase ID of each element diff --git a/src/phase_mechanical_plastic_nonlocal.f90 b/src/phase_mechanical_plastic_nonlocal.f90 index 601618425..464e57339 100644 --- a/src/phase_mechanical_plastic_nonlocal.f90 +++ b/src/phase_mechanical_plastic_nonlocal.f90 @@ -1822,16 +1822,13 @@ subroutine storeGeometry(ph) integer, intent(in) :: ph integer :: ip, el, ce, co + real(pReal), dimension(:), allocatable :: V + - ce = 0 - do el = 1, size(material_homogenizationMemberAt,2) - do ip = 1, size(material_homogenizationMemberAt,1) - ce = ce + 1 - do co = 1, homogenization_maxNconstituents - if(material_phaseAt2(co,ce) == ph) then - geom(ph)%V_0(material_phaseMemberAt2(co,ce)) = IPvolume(ip,el) - endif - enddo + V = reshape(IPvolume,[product(shape(IPvolume))]) + do ce = 1, size(material_homogenizationMemberAt2,1) + do co = 1, homogenization_maxNconstituents + if(material_phaseAt2(co,ce) == ph) geom(ph)%V_0(material_phaseMemberAt2(co,ce)) = V(ce) enddo enddo From 25c556558065ac0d6508dcba52405afcceeecb70 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 1 Mar 2021 09:24:39 +0100 Subject: [PATCH 31/48] correct runtime test --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 08e226ec7..13dfa0ee9 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 08e226ec735589123dd67f3e0a5bc447c3dda812 +Subproject commit 13dfa0ee9d702782f0b7999f3f7fb2384f58d768 From 109ad378c204b83ecf00b43e9db89475f7511f76 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 2 Mar 2021 16:26:18 +0100 Subject: [PATCH 32/48] corrected help text of as_Rodrigues_vector --- python/damask/_rotation.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/python/damask/_rotation.py b/python/damask/_rotation.py index 86311546e..34a5f81b7 100644 --- a/python/damask/_rotation.py +++ b/python/damask/_rotation.py @@ -475,15 +475,17 @@ class Rotation: Parameters ---------- - vector : bool, optional - Return as actual Rodrigues-Frank vector, i.e. axis - and angle argument are not separated. + compact : bool, optional + Return as actual Rodrigues-Frank vector, + i.e. axis and angle argument are not separated. Returns ------- - rho : numpy.ndarray of shape (...,4) unless vector == True: - numpy.ndarray of shape (...,3) - Rodrigues-Frank vector: [n_1, n_2, n_3, tan(ω/2)], ǀnǀ = 1 and ω ∈ [0,π]. + rho : numpy.ndarray of shape (...,4) containing + [n_1, n_2, n_3, tan(ω/2)], ǀnǀ = 1 and ω ∈ [0,π] + unless compact == True: + numpy.ndarray of shape (...,3) containing + tan(ω/2) [n_1, n_2, n_3], ω ∈ [0,π]. """ ro = Rotation._qu2ro(self.quaternion) From 1861e9fe7f6cf91122dc2394364728ebc2ae6c13 Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 2 Mar 2021 19:23:33 +0100 Subject: [PATCH 33/48] [skip ci] updated version information after successful test of v3.0.0-alpha2-574-g109ad378c --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4ebc52387..542cffb8f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-572-g7b89cb41f +v3.0.0-alpha2-574-g109ad378c From 438167804c90dd4ba364d59b79c7e58bb3734511 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 4 Mar 2021 15:11:39 -0500 Subject: [PATCH 34/48] if( polishing --- src/YAML_types.f90 | 116 ++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/src/YAML_types.f90 b/src/YAML_types.f90 index b71261d9c..036d40755 100644 --- a/src/YAML_types.f90 +++ b/src/YAML_types.f90 @@ -72,7 +72,7 @@ module YAML_types getKey => tNode_getKey_byIndex procedure :: & contains => tNode_contains - + generic :: & get => tNode_get_byIndex, & tNode_get_byKey @@ -157,7 +157,7 @@ module YAML_types emptyDict type(tList), target, public :: & emptyList - + abstract interface recursive function asFormattedString(self,indent) @@ -179,7 +179,7 @@ module YAML_types public :: & YAML_types_init, & - output_asStrings, & !ToDo: Hack for GNU. Remove later + output_asStrings, & !ToDo: Hack for GNU. Remove later assignment(=) contains @@ -207,11 +207,11 @@ subroutine selfTest select type(s1) class is(tScalar) s1 = '1' - if(s1%asInt() /= 1) error stop 'tScalar_asInt' - if(dNeq(s1%asFloat(),1.0_pReal)) error stop 'tScalar_asFloat' + if (s1%asInt() /= 1) error stop 'tScalar_asInt' + if (dNeq(s1%asFloat(),1.0_pReal)) error stop 'tScalar_asFloat' s1 = 'true' - if(.not. s1%asBool()) error stop 'tScalar_asBool' - if(s1%asString() /= 'true') error stop 'tScalar_asString' + if (.not. s1%asBool()) error stop 'tScalar_asBool' + if (s1%asString() /= 'true') error stop 'tScalar_asString' end select block @@ -232,18 +232,18 @@ subroutine selfTest call l1%append(s1) call l1%append(s2) n => l1 - if(any(l1%asInts() /= [2,3])) error stop 'tList_asInts' - if(any(dNeq(l1%asFloats(),[2.0_pReal,3.0_pReal]))) error stop 'tList_asFloats' - if(n%get_asInt(1) /= 2) error stop 'byIndex_asInt' - if(dNeq(n%get_asFloat(2),3.0_pReal)) error stop 'byIndex_asFloat' + if (any(l1%asInts() /= [2,3])) error stop 'tList_asInts' + if (any(dNeq(l1%asFloats(),[2.0_pReal,3.0_pReal]))) error stop 'tList_asFloats' + if (n%get_asInt(1) /= 2) error stop 'byIndex_asInt' + if (dNeq(n%get_asFloat(2),3.0_pReal)) error stop 'byIndex_asFloat' endselect allocate(tList::l2) select type(l2) class is(tList) call l2%append(l1) - if(any(l2%get_asInts(1) /= [2,3])) error stop 'byIndex_asInts' - if(any(dNeq(l2%get_asFloats(1),[2.0_pReal,3.0_pReal]))) error stop 'byIndex_asFloats' + if (any(l2%get_asInts(1) /= [2,3])) error stop 'byIndex_asInts' + if (any(dNeq(l2%get_asFloats(1),[2.0_pReal,3.0_pReal]))) error stop 'byIndex_asFloats' n => l2 end select deallocate(n) @@ -265,10 +265,10 @@ subroutine selfTest call l1%append(s2) n => l1 - if(any(l1%asBools() .neqv. [.true., .false.])) error stop 'tList_asBools' - if(any(l1%asStrings() /= ['true ','False'])) error stop 'tList_asStrings' - if(n%get_asBool(2)) error stop 'byIndex_asBool' - if(n%get_asString(1) /= 'true') error stop 'byIndex_asString' + if (any(l1%asBools() .neqv. [.true., .false.])) error stop 'tList_asBools' + if (any(l1%asStrings() /= ['true ','False'])) error stop 'tList_asStrings' + if (n%get_asBool(2)) error stop 'byIndex_asBool' + if (n%get_asString(1) /= 'true') error stop 'byIndex_asString' end block end subroutine selfTest @@ -418,7 +418,7 @@ function tNode_get_byIndex(self,i) result(node) integer :: j self_ => self%asList() - if(i < 1 .or. i > self_%length) call IO_error(150,ext_msg='tNode_get_byIndex') + if (i < 1 .or. i > self_%length) call IO_error(150,ext_msg='tNode_get_byIndex') j = 1 item => self_%first @@ -599,7 +599,7 @@ function tNode_getKey_byIndex(self,i) result(key) dict => self%asDict() item => dict%first do j = 1, dict%length - if(j == i) then + if (j == i) then key = item%key exit else @@ -613,7 +613,7 @@ end function tNode_getKey_byIndex !------------------------------------------------------------------------------------------------- !> @brief Checks if a given key/item is present in the dict/list !------------------------------------------------------------------------------------------------- -function tNode_contains(self,k) result(exists) +function tNode_contains(self,k) result(exists) class(tNode), intent(in), target :: self character(len=*), intent(in) :: k @@ -624,18 +624,18 @@ function tNode_contains(self,k) result(exists) type(tDict), pointer :: dict exists = .false. - if(self%isDict()) then + if (self%isDict()) then dict => self%asDict() do j=1, dict%length - if(dict%getKey(j) == k) then + if (dict%getKey(j) == k) then exists = .true. return endif enddo - elseif(self%isList()) then + elseif (self%isList()) then list => self%asList() - do j =1, list%length - if(list%get_asString(j) == k) then + do j=1, list%length + if (list%get_asString(j) == k) then exists = .true. return endif @@ -663,8 +663,8 @@ function tNode_get_byKey(self,k,defaultVal) result(node) logical :: found found = present(defaultVal) - if(found) node => defaultVal - + if (found) node => defaultVal + self_ => self%asDict() j = 1 @@ -677,11 +677,11 @@ function tNode_get_byKey(self,k,defaultVal) result(node) item => item%next j = j + 1 enddo - + if (.not. found) then call IO_error(143,ext_msg=k) else - if(associated(item)) node => item%node + if (associated(item)) node => item%node endif end function tNode_get_byKey @@ -700,11 +700,11 @@ function tNode_get_byKey_asFloat(self,k,defaultVal) result(nodeAsFloat) class(tNode), pointer :: node type(tScalar), pointer :: scalar - if(self%contains(k)) then + if (self%contains(k)) then node => self%get(k) scalar => node%asScalar() nodeAsFloat = scalar%asFloat() - elseif(present(defaultVal)) then + elseif (present(defaultVal)) then nodeAsFloat = defaultVal else call IO_error(143,ext_msg=k) @@ -726,11 +726,11 @@ function tNode_get_byKey_asInt(self,k,defaultVal) result(nodeAsInt) class(tNode), pointer :: node type(tScalar), pointer :: scalar - if(self%contains(k)) then + if (self%contains(k)) then node => self%get(k) scalar => node%asScalar() nodeAsInt = scalar%asInt() - elseif(present(defaultVal)) then + elseif (present(defaultVal)) then nodeAsInt = defaultVal else call IO_error(143,ext_msg=k) @@ -752,11 +752,11 @@ function tNode_get_byKey_asBool(self,k,defaultVal) result(nodeAsBool) class(tNode), pointer :: node type(tScalar), pointer :: scalar - if(self%contains(k)) then + if (self%contains(k)) then node => self%get(k) scalar => node%asScalar() nodeAsBool = scalar%asBool() - elseif(present(defaultVal)) then + elseif (present(defaultVal)) then nodeAsBool = defaultVal else call IO_error(143,ext_msg=k) @@ -778,11 +778,11 @@ function tNode_get_byKey_asString(self,k,defaultVal) result(nodeAsString) class(tNode), pointer :: node type(tScalar), pointer :: scalar - if(self%contains(k)) then + if (self%contains(k)) then node => self%get(k) scalar => node%asScalar() nodeAsString = scalar%asString() - elseif(present(defaultVal)) then + elseif (present(defaultVal)) then nodeAsString = defaultVal else call IO_error(143,ext_msg=k) @@ -806,18 +806,18 @@ function tNode_get_byKey_asFloats(self,k,defaultVal,requiredSize) result(nodeAsF class(tNode), pointer :: node type(tList), pointer :: list - if(self%contains(k)) then + if (self%contains(k)) then node => self%get(k) list => node%asList() nodeAsFloats = list%asFloats() - elseif(present(defaultVal)) then + elseif (present(defaultVal)) then nodeAsFloats = defaultVal else call IO_error(143,ext_msg=k) endif - if(present(requiredSize)) then - if(requiredSize /= size(nodeAsFloats)) call IO_error(146,ext_msg=k) + if (present(requiredSize)) then + if (requiredSize /= size(nodeAsFloats)) call IO_error(146,ext_msg=k) endif end function tNode_get_byKey_asFloats @@ -837,18 +837,18 @@ function tNode_get_byKey_asInts(self,k,defaultVal,requiredSize) result(nodeAsInt class(tNode), pointer :: node type(tList), pointer :: list - if(self%contains(k)) then + if (self%contains(k)) then node => self%get(k) list => node%asList() nodeAsInts = list%asInts() - elseif(present(defaultVal)) then + elseif (present(defaultVal)) then nodeAsInts = defaultVal else call IO_error(143,ext_msg=k) endif - if(present(requiredSize)) then - if(requiredSize /= size(nodeAsInts)) call IO_error(146,ext_msg=k) + if (present(requiredSize)) then + if (requiredSize /= size(nodeAsInts)) call IO_error(146,ext_msg=k) endif end function tNode_get_byKey_asInts @@ -867,11 +867,11 @@ function tNode_get_byKey_asBools(self,k,defaultVal) result(nodeAsBools) class(tNode), pointer :: node type(tList), pointer :: list - if(self%contains(k)) then + if (self%contains(k)) then node => self%get(k) list => node%asList() nodeAsBools = list%asBools() - elseif(present(defaultVal)) then + elseif (present(defaultVal)) then nodeAsBools = defaultVal else call IO_error(143,ext_msg=k) @@ -893,11 +893,11 @@ function tNode_get_byKey_asStrings(self,k,defaultVal) result(nodeAsStrings) class(tNode), pointer :: node type(tList), pointer :: list - if(self%contains(k)) then + if (self%contains(k)) then node => self%get(k) list => node%asList() nodeAsStrings = list%asStrings() - elseif(present(defaultVal)) then + elseif (present(defaultVal)) then nodeAsStrings = defaultVal else call IO_error(143,ext_msg=k) @@ -925,7 +925,7 @@ function output_asStrings(self) result(output) !ToDo: SR: Rem end function output_asStrings - + !-------------------------------------------------------------------------------------------------- !> @brief Returns the index of a key in a dictionary @@ -944,7 +944,7 @@ function tNode_get_byKey_asIndex(self,key) result(keyIndex) item => dict%first keyIndex = -1 do i = 1, dict%length - if(key == item%key) then + if (key == item%key) then keyIndex = i exit else @@ -952,9 +952,9 @@ function tNode_get_byKey_asIndex(self,key) result(keyIndex) endif enddo - if(keyIndex == -1) call IO_error(140,ext_msg=key) + if (keyIndex == -1) call IO_error(140,ext_msg=key) + - end function tNode_get_byKey_asIndex @@ -985,7 +985,7 @@ recursive function tList_asFormattedString(self,indent) result(str) integer :: i, indent_ str = '' - if(present(indent)) then + if (present(indent)) then indent_ = indent else indent_ = 0 @@ -993,7 +993,7 @@ recursive function tList_asFormattedString(self,indent) result(str) item => self%first do i = 1, self%length - if(i /= 1) str = str//repeat(' ',indent_) + if (i /= 1) str = str//repeat(' ',indent_) str = str//'- '//item%node%asFormattedString(indent_+2) item => item%next end do @@ -1014,7 +1014,7 @@ recursive function tDict_asFormattedString(self,indent) result(str) integer :: i, indent_ str = '' - if(present(indent)) then + if (present(indent)) then indent_ = indent else indent_ = 0 @@ -1022,7 +1022,7 @@ recursive function tDict_asFormattedString(self,indent) result(str) item => self%first do i = 1, self%length - if(i /= 1) str = str//repeat(' ',indent_) + if (i /= 1) str = str//repeat(' ',indent_) select type(node_1 =>item%node) class is(tScalar) str = str//trim(item%key)//': '//item%node%asFormattedString(indent_+len_trim(item%key)+2) @@ -1270,7 +1270,7 @@ recursive subroutine tItem_finalize(self) type(tItem),intent(inout) :: self deallocate(self%node) - if(associated(self%next)) deallocate(self%next) + if (associated(self%next)) deallocate(self%next) end subroutine tItem_finalize From e4271537c5640f4ddb1645c6d2a2f20ede059337 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 4 Mar 2021 15:14:16 -0500 Subject: [PATCH 35/48] syntax polishing; use of YAML defaults to avoid if%contains --- src/grid/DAMASK_grid.f90 | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index fda9d7b9a..0aa462e7e 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -38,7 +38,7 @@ program DAMASK_grid f_restart !< frequency of restart writes logical :: estimate_rate !< follow trajectory of former loadcase end type tLoadCase - + integer(kind(FIELD_UNDEFINED_ID)), allocatable :: ID(:) !-------------------------------------------------------------------------------------------------- @@ -116,7 +116,7 @@ program DAMASK_grid ! init DAMASK (all modules) call CPFEM_initAll - print'(/,a)', ' <<<+- DAMASK_spectral init -+>>>'; flush(IO_STDOUT) + print'(/,a)', ' <<<+- DAMASK_grid init -+>>>'; flush(IO_STDOUT) print*, 'Shanthraj et al., Handbook of Mechanics of Materials, 2019' print*, 'https://doi.org/10.1007/978-981-10-6855-3_80' @@ -130,7 +130,7 @@ program DAMASK_grid if (stagItMax < 0) call IO_error(301,ext_msg='maxStaggeredIter') if (maxCutBack < 0) call IO_error(301,ext_msg='maxCutBack') - + config_load => YAML_parse_file(trim(interface_loadFile)) solver => config_load%get('solver') @@ -169,9 +169,10 @@ program DAMASK_grid ! initialize field solver information if (solver%get_asString('thermal',defaultVal = 'n/a') == 'spectral') nActiveFields = nActiveFields + 1 if (solver%get_asString('damage', defaultVal = 'n/a') == 'spectral') nActiveFields = nActiveFields + 1 + allocate(solres(nActiveFields)) - - allocate(ID(nActiveFields)) + allocate( ID(nActiveFields)) + field = 1 ID(field) = FIELD_MECH_ID ! mechanical active by default thermalActive: if (solver%get_asString('thermal',defaultVal = 'n/a') == 'spectral') then @@ -224,16 +225,15 @@ program DAMASK_grid if (.not. allocated(loadCases(l)%deformation%myType)) call IO_error(error_ID=837,ext_msg = 'L/dot_F/F missing') step_discretization => load_step%get('discretization') - if(.not. step_discretization%contains('t')) call IO_error(error_ID=837,ext_msg = 't missing') - if(.not. step_discretization%contains('N')) call IO_error(error_ID=837,ext_msg = 'N missing') + if (.not. step_discretization%contains('t')) call IO_error(error_ID=837,ext_msg = 't missing') + if (.not. step_discretization%contains('N')) call IO_error(error_ID=837,ext_msg = 'N missing') loadCases(l)%t = step_discretization%get_asFloat('t') loadCases(l)%N = step_discretization%get_asInt ('N') loadCases(l)%r = step_discretization%get_asFloat('r', defaultVal= 1.0_pReal) loadCases(l)%f_restart = load_step%get_asInt('f_restart', defaultVal=huge(0)) loadCases(l)%f_out = load_step%get_asInt('f_out', defaultVal=1) - loadCases(l)%estimate_rate = (load_step%get_asBool('estimate_rate',defaultVal=.true.) .and. & - merge(.true.,.false.,l > 1)) + loadCases(l)%estimate_rate = (load_step%get_asBool('estimate_rate',defaultVal=.true.) .and. l>1) reportAndCheck: if (worldrank == 0) then print'(/,a,i0)', ' load case: ', l @@ -289,11 +289,11 @@ program DAMASK_grid else print'(a,f0.3)', ' r: ', loadCases(l)%r endif - print'(a,f0.3)', ' t: ', loadCases(l)%t - print'(a,i0)', ' N: ', loadCases(l)%N - print'(a,i0)', ' f_out: ', loadCases(l)%f_out + print'(a,f0.3)', ' t: ', loadCases(l)%t + print'(a,i0)', ' N: ', loadCases(l)%N + print'(a,i0)', ' f_out: ', loadCases(l)%f_out if (loadCases(l)%f_restart < huge(0)) & - print'(a,i0)', ' f_restart: ', loadCases(l)%f_restart + print'(a,i0)', ' f_restart: ', loadCases(l)%f_restart if (errorID > 0) call IO_error(error_ID = errorID, el = l) @@ -309,14 +309,9 @@ program DAMASK_grid call mechanical_init case(FIELD_THERMAL_ID) - if (config_load%contains('initial_conditions')) then - initial_conditions => config_load%get('initial_conditions') - if (initial_conditions%contains('thermal')) then - thermal => initial_conditions%get('thermal') - T_0 = thermal%get_asFloat('T',defaultVal = T_0) - endif - endif - call grid_thermal_spectral_init(T_0) + initial_conditions => config_load%get('initial_conditions',defaultVal=emptyDict) + thermal => initial_conditions%get('thermal',defaultVal=emptyDict) + call grid_thermal_spectral_init(thermal%get_asFloat('T',defaultVal = T_0)) case(FIELD_DAMAGE_ID) call grid_damage_spectral_init From e1f0d2e0a3a99ad4488cee5a673ef3d13d5017b8 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 4 Mar 2021 15:15:40 -0500 Subject: [PATCH 36/48] polishing of indentation and whitespaces; thermal_homogenize only once after all constituents --- src/homogenization.f90 | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 4c7200eed..90654ee99 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -91,7 +91,7 @@ module homogenization real(pReal), intent(in), dimension(3,3) :: & subF integer, intent(in) :: & - ce + ce end subroutine mechanical_partition module subroutine thermal_partition(ce) @@ -129,10 +129,8 @@ module homogenization module function thermal_conduction_getConductivity(ce) result(K) - integer, intent(in) :: ce real(pReal), dimension(3,3) :: K - end function thermal_conduction_getConductivity module function thermal_conduction_getSpecificHeat(ce) result(c_P) @@ -167,13 +165,12 @@ module homogenization real(pReal), intent(out) :: Tdot end subroutine thermal_conduction_getSource - module function damage_nonlocal_getMobility(ce) result(M) - integer, intent(in) :: ce - real(pReal) :: M + module function damage_nonlocal_getMobility(ce) result(M) + integer, intent(in) :: ce + real(pReal) :: M end function damage_nonlocal_getMobility module subroutine damage_nonlocal_getSourceAndItsTangent(phiDot, dPhiDot_dPhi, phi, ce) - integer, intent(in) :: ce real(pReal), intent(in) :: & phi @@ -181,21 +178,17 @@ module homogenization phiDot, dPhiDot_dPhi end subroutine damage_nonlocal_getSourceAndItsTangent - module subroutine damage_nonlocal_putNonLocalDamage(phi,ce) - integer, intent(in) :: ce real(pReal), intent(in) :: & phi - end subroutine damage_nonlocal_putNonLocalDamage module subroutine damage_nonlocal_results(ho,group) - integer, intent(in) :: ho character(len=*), intent(in) :: group - end subroutine damage_nonlocal_results + end interface public :: & @@ -238,21 +231,18 @@ subroutine homogenization_init() allocate(homogState (size(material_name_homogenization))) allocate(damageState_h (size(material_name_homogenization))) - call material_parseHomogenization - + call material_parseHomogenization() num_homog => config_numerics%get('homogenization',defaultVal=emptyDict) num_homogGeneric => num_homog%get('generic',defaultVal=emptyDict) - num%nMPstate = num_homogGeneric%get_asInt ('nMPstate', defaultVal=10) - if (num%nMPstate < 1) call IO_error(301,ext_msg='nMPstate') - + num%nMPstate = num_homogGeneric%get_asInt('nMPstate',defaultVal=10) + if (num%nMPstate < 1) call IO_error(301,ext_msg='nMPstate') call mechanical_init(num_homog) call thermal_init() call damage_init() - - call damage_nonlocal_init + call damage_nonlocal_init() end subroutine homogenization_init @@ -322,7 +312,7 @@ subroutine materialpoint_stressAndItsTangent(dt,FEsolving_execIP,FEsolving_execE enddo !$OMP END DO - if (.not. terminallyIll ) then + if (.not. terminallyIll) then !$OMP DO PRIVATE(ho,ph,ce) do el = FEsolving_execElem(1),FEsolving_execElem(2) if (terminallyIll) continue @@ -336,9 +326,9 @@ subroutine materialpoint_stressAndItsTangent(dt,FEsolving_execIP,FEsolving_execE if (.not. terminallyIll) & ! so first signals terminally ill... print*, ' Integration point ', ip,' at element ', el, ' terminally ill' terminallyIll = .true. ! ...and kills all others - endif - call thermal_homogenize(ip,el) + endif enddo + call thermal_homogenize(ip,el) enddo enddo !$OMP END DO @@ -567,10 +557,8 @@ subroutine material_parseHomogenization call IO_error(500,ext_msg=homogMech%get_asString('type')) end select - - if(homog%contains('thermal')) then + if (homog%contains('thermal')) then homogThermal => homog%get('thermal') - select case (homogThermal%get_asString('type')) case('pass') thermal_type(h) = THERMAL_conduction_ID @@ -579,7 +567,7 @@ subroutine material_parseHomogenization end select endif - if(homog%contains('damage')) then + if (homog%contains('damage')) then homogDamage => homog%get('damage') select case (homogDamage%get_asString('type')) case('pass') @@ -590,7 +578,6 @@ subroutine material_parseHomogenization endif enddo - end subroutine material_parseHomogenization From a7e2ed40dd183444e7500a6899ddde33ee188d98 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 4 Mar 2021 15:16:36 -0500 Subject: [PATCH 37/48] rename Nconstituents --> Nmembers --- src/phase_damage.f90 | 10 ++-- src/phase_damage_anisobrittle.f90 | 6 +- src/phase_damage_anisoductile.f90 | 6 +- src/phase_damage_isobrittle.f90 | 6 +- src/phase_damage_isoductile.f90 | 6 +- src/phase_mechanical.f90 | 38 ++++++------- ...phase_mechanical_plastic_dislotungsten.f90 | 14 ++--- src/phase_mechanical_plastic_dislotwin.f90 | 30 +++++----- src/phase_mechanical_plastic_isotropic.f90 | 6 +- ...phase_mechanical_plastic_kinehardening.f90 | 8 +-- src/phase_mechanical_plastic_nonlocal.f90 | 54 +++++++++--------- ...phase_mechanical_plastic_phenopowerlaw.f90 | 10 ++-- src/phase_thermal.f90 | 56 ++++++++----------- src/phase_thermal_dissipation.f90 | 6 +- src/phase_thermal_externalheat.f90 | 6 +- 15 files changed, 127 insertions(+), 135 deletions(-) diff --git a/src/phase_damage.f90 b/src/phase_damage.f90 index c6fd7bfab..6ad25f1e9 100644 --- a/src/phase_damage.f90 +++ b/src/phase_damage.f90 @@ -133,7 +133,7 @@ module subroutine damage_init integer :: & ph, & !< counter in phase loop - Nconstituents + Nmembers class(tNode), pointer :: & phases, & phase, & @@ -151,10 +151,10 @@ module subroutine damage_init do ph = 1,phases%length - Nconstituents = count(material_phaseAt2 == ph) + Nmembers = count(material_phaseAt2 == ph) - allocate(current(ph)%phi(Nconstituents),source=1.0_pReal) - allocate(current(ph)%d_phi_d_dot_phi(Nconstituents),source=0.0_pReal) + allocate(current(ph)%phi(Nmembers),source=1.0_pReal) + allocate(current(ph)%d_phi_d_dot_phi(Nmembers),source=0.0_pReal) phase => phases%get(ph) sources => phase%get('damage',defaultVal=emptyList) @@ -199,7 +199,7 @@ module subroutine phase_damage_getRateAndItsTangents(phiDot, dPhiDot_dPhi, phi, phiDot = 0.0_pReal dPhiDot_dPhi = 0.0_pReal - do co = 1, homogenization_Nconstituents(material_homogenizationAt2(ce)) + do co = 1, homogenization_Nmembers(material_homogenizationAt2(ce)) ph = material_phaseAt2(co,ce) me = material_phasememberAt2(co,ce) diff --git a/src/phase_damage_anisobrittle.f90 b/src/phase_damage_anisobrittle.f90 index fd82b74c4..096da6fb8 100644 --- a/src/phase_damage_anisobrittle.f90 +++ b/src/phase_damage_anisobrittle.f90 @@ -40,7 +40,7 @@ module function anisobrittle_init() result(mySources) phase, & sources, & src - integer :: Nconstituents,p + integer :: Nmembers,p integer, dimension(:), allocatable :: N_cl character(len=pStringLen) :: extmsg = '' @@ -92,8 +92,8 @@ module function anisobrittle_init() result(mySources) if (any(prm%g_crit < 0.0_pReal)) extmsg = trim(extmsg)//' g_crit' if (any(prm%s_crit < 0.0_pReal)) extmsg = trim(extmsg)//' s_crit' - Nconstituents = count(material_phaseAt==p) * discretization_nIPs - call phase_allocateState(damageState(p),Nconstituents,1,1,0) + Nmembers = count(material_phaseAt==p) * discretization_nIPs + call phase_allocateState(damageState(p),Nmembers,1,1,0) damageState(p)%atol = src%get_asFloat('anisobrittle_atol',defaultVal=1.0e-3_pReal) if(any(damageState(p)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' anisobrittle_atol' diff --git a/src/phase_damage_anisoductile.f90 b/src/phase_damage_anisoductile.f90 index f50c05f07..a687df594 100644 --- a/src/phase_damage_anisoductile.f90 +++ b/src/phase_damage_anisoductile.f90 @@ -35,7 +35,7 @@ module function anisoductile_init() result(mySources) pl, & sources, & src - integer :: Ninstances,Nconstituents,p + integer :: Ninstances,Nmembers,p integer, dimension(:), allocatable :: N_sl character(len=pStringLen) :: extmsg = '' @@ -78,8 +78,8 @@ module function anisoductile_init() result(mySources) if (prm%q <= 0.0_pReal) extmsg = trim(extmsg)//' q' if (any(prm%gamma_crit < 0.0_pReal)) extmsg = trim(extmsg)//' gamma_crit' - Nconstituents=count(material_phaseAt2==p) - call phase_allocateState(damageState(p),Nconstituents,1,1,0) + Nmembers=count(material_phaseAt2==p) + call phase_allocateState(damageState(p),Nmembers,1,1,0) damageState(p)%atol = src%get_asFloat('anisoDuctile_atol',defaultVal=1.0e-3_pReal) if(any(damageState(p)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' anisoductile_atol' diff --git a/src/phase_damage_isobrittle.f90 b/src/phase_damage_isobrittle.f90 index 1cc0d7900..0cf85897a 100644 --- a/src/phase_damage_isobrittle.f90 +++ b/src/phase_damage_isobrittle.f90 @@ -31,7 +31,7 @@ module function isobrittle_init() result(mySources) phase, & sources, & src - integer :: Nconstituents,p + integer :: Nmembers,p character(len=pStringLen) :: extmsg = '' @@ -64,8 +64,8 @@ module function isobrittle_init() result(mySources) ! sanity checks if (prm%W_crit <= 0.0_pReal) extmsg = trim(extmsg)//' W_crit' - Nconstituents = count(material_phaseAt2==p) - call phase_allocateState(damageState(p),Nconstituents,1,1,1) + Nmembers = count(material_phaseAt2==p) + call phase_allocateState(damageState(p),Nmembers,1,1,1) damageState(p)%atol = src%get_asFloat('isoBrittle_atol',defaultVal=1.0e-3_pReal) if(any(damageState(p)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' isobrittle_atol' diff --git a/src/phase_damage_isoductile.f90 b/src/phase_damage_isoductile.f90 index 247cd715a..9d00bb1a7 100644 --- a/src/phase_damage_isoductile.f90 +++ b/src/phase_damage_isoductile.f90 @@ -33,7 +33,7 @@ module function isoductile_init() result(mySources) phase, & sources, & src - integer :: Ninstances,Nconstituents,p + integer :: Ninstances,Nmembers,p character(len=pStringLen) :: extmsg = '' @@ -68,8 +68,8 @@ module function isoductile_init() result(mySources) if (prm%q <= 0.0_pReal) extmsg = trim(extmsg)//' q' if (prm%gamma_crit <= 0.0_pReal) extmsg = trim(extmsg)//' gamma_crit' - Nconstituents=count(material_phaseAt2==p) - call phase_allocateState(damageState(p),Nconstituents,1,1,0) + Nmembers=count(material_phaseAt2==p) + call phase_allocateState(damageState(p),Nmembers,1,1,0) damageState(p)%atol = src%get_asFloat('isoDuctile_atol',defaultVal=1.0e-3_pReal) if(any(damageState(p)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' isoductile_atol' diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90 index c934fed72..d065fc74a 100644 --- a/src/phase_mechanical.f90 +++ b/src/phase_mechanical.f90 @@ -191,7 +191,7 @@ module subroutine mechanical_init(materials,phases) ph, & me, & stiffDegradationCtr, & - Nconstituents + Nmembers class(tNode), pointer :: & num_crystallite, & material, & @@ -229,22 +229,22 @@ module subroutine mechanical_init(materials,phases) allocate(material_orientation0(homogenization_maxNconstituents,phases%length,maxVal(material_phaseMemberAt))) do ph = 1, phases%length - Nconstituents = count(material_phaseAt == ph) * discretization_nIPs + Nmembers = count(material_phaseAt == ph) * discretization_nIPs - allocate(phase_mechanical_Fi(ph)%data(3,3,Nconstituents)) - allocate(phase_mechanical_Fe(ph)%data(3,3,Nconstituents)) - allocate(phase_mechanical_Fi0(ph)%data(3,3,Nconstituents)) - allocate(phase_mechanical_Fp(ph)%data(3,3,Nconstituents)) - allocate(phase_mechanical_Fp0(ph)%data(3,3,Nconstituents)) - allocate(phase_mechanical_Li(ph)%data(3,3,Nconstituents)) - allocate(phase_mechanical_Li0(ph)%data(3,3,Nconstituents)) - allocate(phase_mechanical_Lp0(ph)%data(3,3,Nconstituents)) - allocate(phase_mechanical_Lp(ph)%data(3,3,Nconstituents)) - allocate(phase_mechanical_S(ph)%data(3,3,Nconstituents),source=0.0_pReal) - allocate(phase_mechanical_P(ph)%data(3,3,Nconstituents),source=0.0_pReal) - allocate(phase_mechanical_S0(ph)%data(3,3,Nconstituents),source=0.0_pReal) - allocate(phase_mechanical_F(ph)%data(3,3,Nconstituents)) - allocate(phase_mechanical_F0(ph)%data(3,3,Nconstituents)) + allocate(phase_mechanical_Fi(ph)%data(3,3,Nmembers)) + allocate(phase_mechanical_Fe(ph)%data(3,3,Nmembers)) + allocate(phase_mechanical_Fi0(ph)%data(3,3,Nmembers)) + allocate(phase_mechanical_Fp(ph)%data(3,3,Nmembers)) + allocate(phase_mechanical_Fp0(ph)%data(3,3,Nmembers)) + allocate(phase_mechanical_Li(ph)%data(3,3,Nmembers)) + allocate(phase_mechanical_Li0(ph)%data(3,3,Nmembers)) + allocate(phase_mechanical_Lp0(ph)%data(3,3,Nmembers)) + allocate(phase_mechanical_Lp(ph)%data(3,3,Nmembers)) + allocate(phase_mechanical_S(ph)%data(3,3,Nmembers),source=0.0_pReal) + allocate(phase_mechanical_P(ph)%data(3,3,Nmembers),source=0.0_pReal) + allocate(phase_mechanical_S0(ph)%data(3,3,Nmembers),source=0.0_pReal) + allocate(phase_mechanical_F(ph)%data(3,3,Nmembers)) + allocate(phase_mechanical_F0(ph)%data(3,3,Nmembers)) phase => phases%get(ph) mech => phase%get('mechanics') @@ -278,9 +278,9 @@ module subroutine mechanical_init(materials,phases) enddo endif - + do el = 1, size(material_phaseMemberAt,3); do ip = 1, size(material_phaseMemberAt,2) - do co = 1, homogenization_Nconstituents(material_homogenizationAt(el)) + do co = 1, homogenization_Nmembers(material_homogenizationAt(el)) material => materials%get(discretization_materialAt(el)) constituents => material%get('constituents') constituent => constituents%get(co) @@ -1238,7 +1238,7 @@ module subroutine mechanical_restore(ce,includeL) co, ph, me - do co = 1,homogenization_Nconstituents(material_homogenizationAt2(ce)) + do co = 1,homogenization_Nmembers(material_homogenizationAt2(ce)) ph = material_phaseAt2(co,ce) me = material_phaseMemberAt2(co,ce) if (includeL) then diff --git a/src/phase_mechanical_plastic_dislotungsten.f90 b/src/phase_mechanical_plastic_dislotungsten.f90 index 9c8baf0a5..1fda51a58 100644 --- a/src/phase_mechanical_plastic_dislotungsten.f90 +++ b/src/phase_mechanical_plastic_dislotungsten.f90 @@ -79,7 +79,7 @@ module function plastic_dislotungsten_init() result(myPlasticity) logical, dimension(:), allocatable :: myPlasticity integer :: & ph, i, & - Nconstituents, & + Nmembers, & sizeState, sizeDotState, & startIndex, endIndex integer, dimension(:), allocatable :: & @@ -220,18 +220,18 @@ module function plastic_dislotungsten_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt2 == ph) + Nmembers = count(material_phaseAt2 == ph) sizeDotState = size(['rho_mob ','rho_dip ','gamma_sl']) * prm%sum_N_sl sizeState = sizeDotState - call phase_allocateState(plasticState(ph),Nconstituents,sizeState,sizeDotState,0) + call phase_allocateState(plasticState(ph),Nmembers,sizeState,sizeDotState,0) !-------------------------------------------------------------------------------------------------- ! state aliases and initialization startIndex = 1 endIndex = prm%sum_N_sl stt%rho_mob => plasticState(ph)%state(startIndex:endIndex,:) - stt%rho_mob = spread(rho_mob_0,2,Nconstituents) + stt%rho_mob = spread(rho_mob_0,2,Nmembers) dot%rho_mob => plasticState(ph)%dotState(startIndex:endIndex,:) plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_rho',defaultVal=1.0_pReal) if (any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' atol_rho' @@ -239,7 +239,7 @@ module function plastic_dislotungsten_init() result(myPlasticity) startIndex = endIndex + 1 endIndex = endIndex + prm%sum_N_sl stt%rho_dip => plasticState(ph)%state(startIndex:endIndex,:) - stt%rho_dip = spread(rho_dip_0,2,Nconstituents) + stt%rho_dip = spread(rho_dip_0,2,Nmembers) dot%rho_dip => plasticState(ph)%dotState(startIndex:endIndex,:) plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_rho',defaultVal=1.0_pReal) @@ -251,8 +251,8 @@ module function plastic_dislotungsten_init() result(myPlasticity) ! global alias plasticState(ph)%slipRate => plasticState(ph)%dotState(startIndex:endIndex,:) - allocate(dst%Lambda_sl(prm%sum_N_sl,Nconstituents), source=0.0_pReal) - allocate(dst%threshold_stress(prm%sum_N_sl,Nconstituents), source=0.0_pReal) + allocate(dst%Lambda_sl(prm%sum_N_sl,Nmembers), source=0.0_pReal) + allocate(dst%threshold_stress(prm%sum_N_sl,Nmembers), source=0.0_pReal) plasticState(ph)%state0 = plasticState(ph)%state ! ToDo: this could be done centrally diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index f479ba007..5500ae731 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -127,7 +127,7 @@ module function plastic_dislotwin_init() result(myPlasticity) logical, dimension(:), allocatable :: myPlasticity integer :: & ph, i, & - Nconstituents, & + Nmembers, & sizeState, sizeDotState, & startIndex, endIndex integer, dimension(:), allocatable :: & @@ -406,21 +406,21 @@ module function plastic_dislotwin_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt2 == ph) + Nmembers = count(material_phaseAt2 == ph) 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 sizeState = sizeDotState - call phase_allocateState(plasticState(ph),Nconstituents,sizeState,sizeDotState,0) + call phase_allocateState(plasticState(ph),Nmembers,sizeState,sizeDotState,0) !-------------------------------------------------------------------------------------------------- ! locally defined state aliases and initialization of state0 and atol startIndex = 1 endIndex = prm%sum_N_sl stt%rho_mob=>plasticState(ph)%state(startIndex:endIndex,:) - stt%rho_mob= spread(rho_mob_0,2,Nconstituents) + stt%rho_mob= spread(rho_mob_0,2,Nmembers) dot%rho_mob=>plasticState(ph)%dotState(startIndex:endIndex,:) plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_rho',defaultVal=1.0_pReal) if (any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' atol_rho' @@ -428,7 +428,7 @@ module function plastic_dislotwin_init() result(myPlasticity) startIndex = endIndex + 1 endIndex = endIndex + prm%sum_N_sl stt%rho_dip=>plasticState(ph)%state(startIndex:endIndex,:) - stt%rho_dip= spread(rho_dip_0,2,Nconstituents) + stt%rho_dip= spread(rho_dip_0,2,Nmembers) dot%rho_dip=>plasticState(ph)%dotState(startIndex:endIndex,:) plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_rho',defaultVal=1.0_pReal) @@ -454,18 +454,18 @@ module function plastic_dislotwin_init() result(myPlasticity) plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_f_tr',defaultVal=1.0e-6_pReal) if (any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' atol_f_tr' - allocate(dst%Lambda_sl (prm%sum_N_sl,Nconstituents),source=0.0_pReal) - allocate(dst%tau_pass (prm%sum_N_sl,Nconstituents),source=0.0_pReal) + allocate(dst%Lambda_sl (prm%sum_N_sl,Nmembers),source=0.0_pReal) + allocate(dst%tau_pass (prm%sum_N_sl,Nmembers),source=0.0_pReal) - allocate(dst%Lambda_tw (prm%sum_N_tw,Nconstituents),source=0.0_pReal) - allocate(dst%tau_hat_tw (prm%sum_N_tw,Nconstituents),source=0.0_pReal) - allocate(dst%tau_r_tw (prm%sum_N_tw,Nconstituents),source=0.0_pReal) - allocate(dst%V_tw (prm%sum_N_tw,Nconstituents),source=0.0_pReal) + allocate(dst%Lambda_tw (prm%sum_N_tw,Nmembers),source=0.0_pReal) + allocate(dst%tau_hat_tw (prm%sum_N_tw,Nmembers),source=0.0_pReal) + allocate(dst%tau_r_tw (prm%sum_N_tw,Nmembers),source=0.0_pReal) + allocate(dst%V_tw (prm%sum_N_tw,Nmembers),source=0.0_pReal) - allocate(dst%Lambda_tr (prm%sum_N_tr,Nconstituents),source=0.0_pReal) - allocate(dst%tau_hat_tr (prm%sum_N_tr,Nconstituents),source=0.0_pReal) - allocate(dst%tau_r_tr (prm%sum_N_tr,Nconstituents),source=0.0_pReal) - allocate(dst%V_tr (prm%sum_N_tr,Nconstituents),source=0.0_pReal) + allocate(dst%Lambda_tr (prm%sum_N_tr,Nmembers),source=0.0_pReal) + allocate(dst%tau_hat_tr (prm%sum_N_tr,Nmembers),source=0.0_pReal) + allocate(dst%tau_r_tr (prm%sum_N_tr,Nmembers),source=0.0_pReal) + allocate(dst%V_tr (prm%sum_N_tr,Nmembers),source=0.0_pReal) plasticState(ph)%state0 = plasticState(ph)%state ! ToDo: this could be done centrally diff --git a/src/phase_mechanical_plastic_isotropic.f90 b/src/phase_mechanical_plastic_isotropic.f90 index 245f4293a..d02436fba 100644 --- a/src/phase_mechanical_plastic_isotropic.f90 +++ b/src/phase_mechanical_plastic_isotropic.f90 @@ -52,7 +52,7 @@ module function plastic_isotropic_init() result(myPlasticity) logical, dimension(:), allocatable :: myPlasticity integer :: & ph, & - Nconstituents, & + Nmembers, & sizeState, sizeDotState real(pReal) :: & xi_0 !< initial critical stress @@ -119,11 +119,11 @@ module function plastic_isotropic_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt2 == ph) + Nmembers = count(material_phaseAt2 == ph) sizeDotState = size(['xi ','gamma']) sizeState = sizeDotState - call phase_allocateState(plasticState(ph),Nconstituents,sizeState,sizeDotState,0) + call phase_allocateState(plasticState(ph),Nmembers,sizeState,sizeDotState,0) !-------------------------------------------------------------------------------------------------- ! state aliases and initialization diff --git a/src/phase_mechanical_plastic_kinehardening.f90 b/src/phase_mechanical_plastic_kinehardening.f90 index 8acf42710..75e8d9e59 100644 --- a/src/phase_mechanical_plastic_kinehardening.f90 +++ b/src/phase_mechanical_plastic_kinehardening.f90 @@ -62,7 +62,7 @@ module function plastic_kinehardening_init() result(myPlasticity) logical, dimension(:), allocatable :: myPlasticity integer :: & ph, o, & - Nconstituents, & + Nmembers, & sizeState, sizeDeltaState, sizeDotState, & startIndex, endIndex integer, dimension(:), allocatable :: & @@ -165,19 +165,19 @@ module function plastic_kinehardening_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt2 == ph) + Nmembers = count(material_phaseAt2 == ph) sizeDotState = size(['crss ','crss_back', 'accshear ']) * prm%sum_N_sl !ToDo: adjust names like in material.yaml sizeDeltaState = size(['sense ', 'chi0 ', 'gamma0' ]) * prm%sum_N_sl !ToDo: adjust names like in material.yaml sizeState = sizeDotState + sizeDeltaState - call phase_allocateState(plasticState(ph),Nconstituents,sizeState,sizeDotState,sizeDeltaState) + call phase_allocateState(plasticState(ph),Nmembers,sizeState,sizeDotState,sizeDeltaState) !-------------------------------------------------------------------------------------------------- ! state aliases and initialization startIndex = 1 endIndex = prm%sum_N_sl stt%crss => plasticState(ph)%state (startIndex:endIndex,:) - stt%crss = spread(xi_0, 2, Nconstituents) + stt%crss = spread(xi_0, 2, Nmembers) dot%crss => plasticState(ph)%dotState(startIndex:endIndex,:) plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_xi',defaultVal=1.0_pReal) if(any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' atol_xi' diff --git a/src/phase_mechanical_plastic_nonlocal.f90 b/src/phase_mechanical_plastic_nonlocal.f90 index 464e57339..d0007075b 100644 --- a/src/phase_mechanical_plastic_nonlocal.f90 +++ b/src/phase_mechanical_plastic_nonlocal.f90 @@ -177,7 +177,7 @@ module function plastic_nonlocal_init() result(myPlasticity) integer :: & Ninstances, & ph, & - Nconstituents, & + Nmembers, & sizeState, sizeDotState, sizeDependentState, sizeDeltaState, & s1, s2, & s, t, l @@ -398,7 +398,7 @@ module function plastic_nonlocal_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt2 == ph) + Nmembers = count(material_phaseAt2 == ph) sizeDotState = size([ 'rhoSglEdgePosMobile ','rhoSglEdgeNegMobile ', & 'rhoSglScrewPosMobile ','rhoSglScrewNegMobile ', & 'rhoSglEdgePosImmobile ','rhoSglEdgeNegImmobile ', & @@ -412,9 +412,9 @@ module function plastic_nonlocal_init() result(myPlasticity) 'maxDipoleHeightEdge ','maxDipoleHeightScrew' ]) * prm%sum_N_sl !< other dependent state variables that are not updated by microstructure sizeDeltaState = sizeDotState - call phase_allocateState(plasticState(ph),Nconstituents,sizeState,sizeDotState,sizeDeltaState) + call phase_allocateState(plasticState(ph),Nmembers,sizeState,sizeDotState,sizeDeltaState) - allocate(geom(ph)%V_0(Nconstituents)) + allocate(geom(ph)%V_0(Nmembers)) call storeGeometry(ph) plasticState(ph)%nonlocal = pl%get_asBool('nonlocal') @@ -486,26 +486,26 @@ module function plastic_nonlocal_init() result(myPlasticity) dot%rho_dip_scr => plasticState(ph)%dotState (9*prm%sum_N_sl+1:10*prm%sum_N_sl,:) del%rho_dip_scr => plasticState(ph)%deltaState (9*prm%sum_N_sl+1:10*prm%sum_N_sl,:) - stt%gamma => plasticState(ph)%state (10*prm%sum_N_sl + 1:11*prm%sum_N_sl,1:Nconstituents) - dot%gamma => plasticState(ph)%dotState (10*prm%sum_N_sl + 1:11*prm%sum_N_sl,1:Nconstituents) - del%gamma => plasticState(ph)%deltaState (10*prm%sum_N_sl + 1:11*prm%sum_N_sl,1:Nconstituents) + stt%gamma => plasticState(ph)%state (10*prm%sum_N_sl + 1:11*prm%sum_N_sl,1:Nmembers) + dot%gamma => plasticState(ph)%dotState (10*prm%sum_N_sl + 1:11*prm%sum_N_sl,1:Nmembers) + del%gamma => plasticState(ph)%deltaState (10*prm%sum_N_sl + 1:11*prm%sum_N_sl,1:Nmembers) plasticState(ph)%atol(10*prm%sum_N_sl+1:11*prm%sum_N_sl ) = pl%get_asFloat('atol_gamma', defaultVal = 1.0e-2_pReal) if(any(plasticState(ph)%atol(10*prm%sum_N_sl+1:11*prm%sum_N_sl) < 0.0_pReal)) & extmsg = trim(extmsg)//' atol_gamma' - plasticState(ph)%slipRate => plasticState(ph)%dotState (10*prm%sum_N_sl + 1:11*prm%sum_N_sl,1:Nconstituents) + plasticState(ph)%slipRate => plasticState(ph)%dotState (10*prm%sum_N_sl + 1:11*prm%sum_N_sl,1:Nmembers) - stt%rho_forest => plasticState(ph)%state (11*prm%sum_N_sl + 1:12*prm%sum_N_sl,1:Nconstituents) - stt%v => plasticState(ph)%state (12*prm%sum_N_sl + 1:16*prm%sum_N_sl,1:Nconstituents) - stt%v_edg_pos => plasticState(ph)%state (12*prm%sum_N_sl + 1:13*prm%sum_N_sl,1:Nconstituents) - stt%v_edg_neg => plasticState(ph)%state (13*prm%sum_N_sl + 1:14*prm%sum_N_sl,1:Nconstituents) - stt%v_scr_pos => plasticState(ph)%state (14*prm%sum_N_sl + 1:15*prm%sum_N_sl,1:Nconstituents) - stt%v_scr_neg => plasticState(ph)%state (15*prm%sum_N_sl + 1:16*prm%sum_N_sl,1:Nconstituents) + stt%rho_forest => plasticState(ph)%state (11*prm%sum_N_sl + 1:12*prm%sum_N_sl,1:Nmembers) + stt%v => plasticState(ph)%state (12*prm%sum_N_sl + 1:16*prm%sum_N_sl,1:Nmembers) + stt%v_edg_pos => plasticState(ph)%state (12*prm%sum_N_sl + 1:13*prm%sum_N_sl,1:Nmembers) + stt%v_edg_neg => plasticState(ph)%state (13*prm%sum_N_sl + 1:14*prm%sum_N_sl,1:Nmembers) + stt%v_scr_pos => plasticState(ph)%state (14*prm%sum_N_sl + 1:15*prm%sum_N_sl,1:Nmembers) + stt%v_scr_neg => plasticState(ph)%state (15*prm%sum_N_sl + 1:16*prm%sum_N_sl,1:Nmembers) - allocate(dst%tau_pass(prm%sum_N_sl,Nconstituents),source=0.0_pReal) - allocate(dst%tau_back(prm%sum_N_sl,Nconstituents),source=0.0_pReal) + allocate(dst%tau_pass(prm%sum_N_sl,Nmembers),source=0.0_pReal) + allocate(dst%tau_back(prm%sum_N_sl,Nmembers),source=0.0_pReal) end associate - if (Nconstituents > 0) call stateInit(ini,ph,Nconstituents) + if (Nmembers > 0) call stateInit(ini,ph,Nmembers) plasticState(ph)%state0 = plasticState(ph)%state !-------------------------------------------------------------------------------------------------- @@ -527,7 +527,7 @@ module function plastic_nonlocal_init() result(myPlasticity) if(.not. myPlasticity(ph)) cycle phase => phases%get(ph) - Nconstituents = count(material_phaseAt2 == ph) + Nmembers = count(material_phaseAt2 == ph) l = 0 do t = 1,4 do s = 1,param(ph)%sum_N_sl @@ -1406,7 +1406,7 @@ module subroutine plastic_nonlocal_updateCompatibility(orientation,ph,i,e) me, & neighbor_e, & ! element index of my neighbor neighbor_i, & ! integration point index of my neighbor - neighbor_me, & + neighbor_me, & neighbor_phase, & ns, & ! number of active slip systems s1, & ! slip system index (me) @@ -1579,13 +1579,13 @@ end subroutine plastic_nonlocal_results !-------------------------------------------------------------------------------------------------- !> @brief populates the initial dislocation density !-------------------------------------------------------------------------------------------------- -subroutine stateInit(ini,phase,Nconstituents) +subroutine stateInit(ini,phase,Nmembers) type(tInitialParameters) :: & ini integer,intent(in) :: & phase, & - Nconstituents + Nmembers integer :: & i, & e, & @@ -1602,7 +1602,7 @@ subroutine stateInit(ini,phase,Nconstituents) totalVolume, & densityBinning, & minimumIpVolume - real(pReal), dimension(Nconstituents) :: & + real(pReal), dimension(Nmembers) :: & volume @@ -1622,13 +1622,13 @@ subroutine stateInit(ini,phase,Nconstituents) meanDensity = 0.0_pReal do while(meanDensity < ini%random_rho_u) call random_number(rnd) - phasemember = nint(rnd(1)*real(Nconstituents,pReal) + 0.5_pReal) + phasemember = nint(rnd(1)*real(Nmembers,pReal) + 0.5_pReal) s = nint(rnd(2)*real(sum(ini%N_sl),pReal)*4.0_pReal + 0.5_pReal) meanDensity = meanDensity + densityBinning * volume(phasemember) / totalVolume stt%rhoSglMobile(s,phasemember) = densityBinning enddo else ! homogeneous distribution with noise - do e = 1, Nconstituents + do e = 1, Nmembers do f = 1,size(ini%N_sl,1) from = 1 + sum(ini%N_sl(1:f-1)) upto = sum(ini%N_sl(1:f)) @@ -1809,7 +1809,7 @@ pure function getRho0(ph,me) getRho0(:,mob) = max(getRho0(:,mob),0.0_pReal) getRho0(:,dip) = max(getRho0(:,dip),0.0_pReal) - where(abs(getRho0) < max(prm%rho_min/geom(ph)%V_0(me)**(2.0_pReal/3.0_pReal),prm%rho_significant)) & + where (abs(getRho0) < max(prm%rho_min/geom(ph)%V_0(me)**(2.0_pReal/3.0_pReal),prm%rho_significant)) & getRho0 = 0.0_pReal end associate @@ -1823,12 +1823,12 @@ subroutine storeGeometry(ph) integer :: ip, el, ce, co real(pReal), dimension(:), allocatable :: V - + V = reshape(IPvolume,[product(shape(IPvolume))]) do ce = 1, size(material_homogenizationMemberAt2,1) do co = 1, homogenization_maxNconstituents - if(material_phaseAt2(co,ce) == ph) geom(ph)%V_0(material_phaseMemberAt2(co,ce)) = V(ce) + if (material_phaseAt2(co,ce) == ph) geom(ph)%V_0(material_phaseMemberAt2(co,ce)) = V(ce) enddo enddo diff --git a/src/phase_mechanical_plastic_phenopowerlaw.f90 b/src/phase_mechanical_plastic_phenopowerlaw.f90 index d769431b4..ae5926c0f 100644 --- a/src/phase_mechanical_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanical_plastic_phenopowerlaw.f90 @@ -71,7 +71,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) logical, dimension(:), allocatable :: myPlasticity integer :: & ph, i, & - Nconstituents, & + Nmembers, & sizeState, sizeDotState, & startIndex, endIndex integer, dimension(:), allocatable :: & @@ -223,20 +223,20 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! allocate state arrays - Nconstituents = count(material_phaseAt2 == ph) + Nmembers = count(material_phaseAt2 == ph) sizeDotState = size(['xi_sl ','gamma_sl']) * prm%sum_N_sl & + size(['xi_tw ','gamma_tw']) * prm%sum_N_tw sizeState = sizeDotState - call phase_allocateState(plasticState(ph),Nconstituents,sizeState,sizeDotState,0) + call phase_allocateState(plasticState(ph),Nmembers,sizeState,sizeDotState,0) !-------------------------------------------------------------------------------------------------- ! state aliases and initialization startIndex = 1 endIndex = prm%sum_N_sl stt%xi_slip => plasticState(ph)%state (startIndex:endIndex,:) - stt%xi_slip = spread(xi_0_sl, 2, Nconstituents) + stt%xi_slip = spread(xi_0_sl, 2, Nmembers) dot%xi_slip => plasticState(ph)%dotState(startIndex:endIndex,:) plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_xi',defaultVal=1.0_pReal) if(any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' atol_xi' @@ -244,7 +244,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) startIndex = endIndex + 1 endIndex = endIndex + prm%sum_N_tw stt%xi_twin => plasticState(ph)%state (startIndex:endIndex,:) - stt%xi_twin = spread(xi_0_tw, 2, Nconstituents) + stt%xi_twin = spread(xi_0_tw, 2, Nmembers) dot%xi_twin => plasticState(ph)%dotState(startIndex:endIndex,:) plasticState(ph)%atol(startIndex:endIndex) = pl%get_asFloat('atol_xi',defaultVal=1.0_pReal) if(any(plasticState(ph)%atol(startIndex:endIndex) < 0.0_pReal)) extmsg = trim(extmsg)//' atol_xi' diff --git a/src/phase_thermal.f90 b/src/phase_thermal.f90 index 012554aef..21ec93c9c 100644 --- a/src/phase_thermal.f90 +++ b/src/phase_thermal.f90 @@ -15,13 +15,13 @@ submodule(phase) thermal THERMAL_EXTERNALHEAT_ID end enum - type :: tDataContainer + type :: tDataContainer ! ?? not very telling name. Better: "fieldQuantities" ?? real(pReal), dimension(:), allocatable :: T, dot_T end type tDataContainer integer(kind(THERMAL_UNDEFINED_ID)), dimension(:,:), allocatable :: & thermal_source - type(tDataContainer), dimension(:), allocatable :: current + type(tDataContainer), dimension(:), allocatable :: current ! ?? not very telling name. Better: "field" ?? integer :: thermal_source_maxSizeDotState @@ -78,41 +78,36 @@ module subroutine thermal_init(phases) integer :: & ph, so, & - Nconstituents + Nmembers print'(/,a)', ' <<<+- phase:thermal init -+>>>' allocate(current(phases%length)) - allocate(thermalState (phases%length)) + allocate(thermalState(phases%length)) allocate(thermal_Nsources(phases%length),source = 0) do ph = 1, phases%length - - Nconstituents = count(material_phaseAt2 == ph) - - allocate(current(ph)%T(Nconstituents),source=300.0_pReal) - allocate(current(ph)%dot_T(Nconstituents),source=0.0_pReal) + Nmembers = count(material_phaseAt2 == ph) + allocate(current(ph)%T(Nmembers),source=300.0_pReal) + allocate(current(ph)%dot_T(Nmembers),source=0.0_pReal) phase => phases%get(ph) - if(phase%contains('thermal')) then - thermal => phase%get('thermal') - sources => thermal%get('source',defaultVal=emptyList) - - thermal_Nsources(ph) = sources%length - endif + thermal => phase%get('thermal',defaultVal=emptyDict) + sources => thermal%get('source',defaultVal=emptyList) + thermal_Nsources(ph) = sources%length allocate(thermalstate(ph)%p(thermal_Nsources(ph))) enddo allocate(thermal_source(maxval(thermal_Nsources),phases%length), source = THERMAL_UNDEFINED_ID) - if(maxval(thermal_Nsources) /= 0) then + if (maxval(thermal_Nsources) /= 0) then where(dissipation_init (maxval(thermal_Nsources))) thermal_source = THERMAL_DISSIPATION_ID where(externalheat_init(maxval(thermal_Nsources))) thermal_source = THERMAL_EXTERNALHEAT_ID endif thermal_source_maxSizeDotState = 0 - PhaseLoop2:do ph = 1,phases%length + do ph = 1,phases%length do so = 1,thermal_Nsources(ph) thermalState(ph)%p(so)%state = thermalState(ph)%p(so)%state0 @@ -120,7 +115,7 @@ module subroutine thermal_init(phases) thermal_source_maxSizeDotState = max(thermal_source_maxSizeDotState, & maxval(thermalState(ph)%p%sizeDotState)) - enddo PhaseLoop2 + enddo end subroutine thermal_init @@ -145,18 +140,17 @@ module subroutine phase_thermal_getRate(TDot, ph,me) do so = 1, thermal_Nsources(ph) select case(thermal_source(so,ph)) case (THERMAL_DISSIPATION_ID) - call dissipation_getRate(my_Tdot, ph,me) + call dissipation_getRate(my_Tdot, ph,me) case (THERMAL_EXTERNALHEAT_ID) - call externalheat_getRate(my_Tdot, ph,me) + call externalheat_getRate(my_Tdot, ph,me) case default - my_Tdot = 0.0_pReal + my_Tdot = 0.0_pReal end select Tdot = Tdot + my_Tdot enddo - end subroutine phase_thermal_getRate @@ -185,7 +179,7 @@ function phase_thermal_collectDotState(ph,me) result(broken) end function phase_thermal_collectDotState -module function thermal_stress(Delta_t,ph,me) result(converged_) +module function thermal_stress(Delta_t,ph,me) result(converged_) ! ?? why is this called "stress" when it seems closer to "updateState" ?? real(pReal), intent(in) :: Delta_t integer, intent(in) :: ph, me @@ -212,7 +206,7 @@ function integrateThermalState(Delta_t, ph,me) result(broken) sizeDotState broken = phase_thermal_collectDotState(ph,me) - if(broken) return + if (broken) return do so = 1, thermal_Nsources(ph) sizeDotState = thermalState(ph)%p(so)%sizeDotState @@ -301,14 +295,12 @@ function thermal_active(source_label,src_length) result(active_source) allocate(active_source(src_length,phases%length), source = .false. ) do p = 1, phases%length phase => phases%get(p) - if (phase%contains('thermal')) then - thermal => phase%get('thermal',defaultVal=emptyList) - sources => thermal%get('source',defaultVal=emptyList) - do s = 1, sources%length - src => sources%get(s) - if(src%get_asString('type') == source_label) active_source(s,p) = .true. - enddo - endif + thermal => phase%get('thermal',defaultVal=emptyDict) + sources => thermal%get('source',defaultVal=emptyList) + do s = 1, sources%length + src => sources%get(s) + active_source(s,p) = src%get_asString('type') == source_label + enddo enddo diff --git a/src/phase_thermal_dissipation.f90 b/src/phase_thermal_dissipation.f90 index 9c75763dc..d3e7094a1 100644 --- a/src/phase_thermal_dissipation.f90 +++ b/src/phase_thermal_dissipation.f90 @@ -31,7 +31,7 @@ module function dissipation_init(source_length) result(mySources) phase, & sources, thermal, & src - integer :: so,Nconstituents,ph + integer :: so,Nmembers,ph mySources = thermal_active('dissipation',source_length) @@ -54,8 +54,8 @@ module function dissipation_init(source_length) result(mySources) src => sources%get(so) prm%kappa = src%get_asFloat('kappa') - Nconstituents = count(material_phaseAt2 == ph) - call phase_allocateState(thermalState(ph)%p(so),Nconstituents,0,0,0) + Nmembers = count(material_phaseAt2 == ph) + call phase_allocateState(thermalState(ph)%p(so),Nmembers,0,0,0) end associate endif diff --git a/src/phase_thermal_externalheat.f90 b/src/phase_thermal_externalheat.f90 index c7f894215..257b4e282 100644 --- a/src/phase_thermal_externalheat.f90 +++ b/src/phase_thermal_externalheat.f90 @@ -38,7 +38,7 @@ module function externalheat_init(source_length) result(mySources) phase, & sources, thermal, & src - integer :: so,Nconstituents,ph + integer :: so,Nmembers,ph mySources = thermal_active('externalheat',source_length) @@ -67,8 +67,8 @@ module function externalheat_init(source_length) result(mySources) prm%f_T = src%get_asFloats('f_T',requiredSize = size(prm%t_n)) - Nconstituents = count(material_phaseAt2 == ph) - call phase_allocateState(thermalState(ph)%p(so),Nconstituents,1,1,0) + Nmembers = count(material_phaseAt2 == ph) + call phase_allocateState(thermalState(ph)%p(so),Nmembers,1,1,0) end associate endif enddo From 5cd68dbddb85191664e3aa78a7b9472ce42bdcb6 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 4 Mar 2021 15:35:17 -0500 Subject: [PATCH 38/48] fixed stray homogenization_Nmembers --> _Nconstituents --- src/phase_damage.f90 | 2 +- src/phase_mechanical.f90 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/phase_damage.f90 b/src/phase_damage.f90 index 6ad25f1e9..c85075288 100644 --- a/src/phase_damage.f90 +++ b/src/phase_damage.f90 @@ -199,7 +199,7 @@ module subroutine phase_damage_getRateAndItsTangents(phiDot, dPhiDot_dPhi, phi, phiDot = 0.0_pReal dPhiDot_dPhi = 0.0_pReal - do co = 1, homogenization_Nmembers(material_homogenizationAt2(ce)) + do co = 1, homogenization_Nconstituents(material_homogenizationAt2(ce)) ph = material_phaseAt2(co,ce) me = material_phasememberAt2(co,ce) diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90 index d065fc74a..e642b22ef 100644 --- a/src/phase_mechanical.f90 +++ b/src/phase_mechanical.f90 @@ -280,7 +280,7 @@ module subroutine mechanical_init(materials,phases) do el = 1, size(material_phaseMemberAt,3); do ip = 1, size(material_phaseMemberAt,2) - do co = 1, homogenization_Nmembers(material_homogenizationAt(el)) + do co = 1, homogenization_Nconstituents(material_homogenizationAt(el)) material => materials%get(discretization_materialAt(el)) constituents => material%get('constituents') constituent => constituents%get(co) @@ -1238,7 +1238,7 @@ module subroutine mechanical_restore(ce,includeL) co, ph, me - do co = 1,homogenization_Nmembers(material_homogenizationAt2(ce)) + do co = 1,homogenization_Nconstituents(material_homogenizationAt2(ce)) ph = material_phaseAt2(co,ce) me = material_phaseMemberAt2(co,ce) if (includeL) then From 94b10b0621d71b66f7547d54f33dfb390d58fe2b Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 5 Mar 2021 03:12:08 +0100 Subject: [PATCH 39/48] [skip ci] updated version information after successful test of v3.0.0-alpha2-591-g9f1d53d8b --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 542cffb8f..55e524c1a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-574-g109ad378c +v3.0.0-alpha2-591-g9f1d53d8b From 1b4901b60df42327674cc264cf26d0dc79d65e17 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Sun, 7 Mar 2021 23:37:30 +0000 Subject: [PATCH 40/48] Phase name consistent with file name. --- examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml b/examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml index 7931ec267..39d565585 100644 --- a/examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml +++ b/examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml @@ -1,6 +1,6 @@ # M. Levy, Handbook of Elastic Properties of Solids, Liquids, and Gases (2001) # C. Zambaldi, "Orientation informed nanoindentation of a-titanium: Indentation pileup in hexagonal metals deforming by prismatic slip", J. Mater. Res., Vol. 27, No. 1, Jan 14, 2012 -Ti-alpha: +cpTi: lattice: hP c/a: 1.587 mechanics: From 0f7ec7c06e3f07723d274db0875001d317d0fc46 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 8 Mar 2021 03:20:48 +0100 Subject: [PATCH 41/48] [skip ci] updated version information after successful test of v3.0.0-alpha2-593-g1b4901b60 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 55e524c1a..67cadbda6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-591-g9f1d53d8b +v3.0.0-alpha2-593-g1b4901b60 From 7cbc69a4ca51a1ce159a3ee1c1a8f74a234c727e Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Mon, 8 Mar 2021 11:02:27 -0500 Subject: [PATCH 42/48] added "Returns" to help --- python/damask/_table.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/python/damask/_table.py b/python/damask/_table.py index 68d6f94bf..5203b0b61 100644 --- a/python/damask/_table.py +++ b/python/damask/_table.py @@ -189,6 +189,11 @@ class Table: label : str Column label. + Returns + ------- + data : numpy.ndarray + Array of column data. + """ if re.match(r'[0-9]*?_',label): idx,key = label.split('_',1) @@ -212,6 +217,11 @@ class Table: info : str, optional Human-readable information about the new data. + Returns + ------- + table : Table + Updated table. + """ dup = self.copy() dup._add_comment(label,data.shape[1:],info) @@ -238,6 +248,11 @@ class Table: info : str, optional Human-readable information about the modified data. + Returns + ------- + table : Table + Updated table. + """ dup = self.copy() dup._add_comment(label,data.shape[1:],info) @@ -261,6 +276,11 @@ class Table: label : str Column label. + Returns + ------- + table : Table + Updated table. + """ dup = self.copy() dup.data.drop(columns=label,inplace=True) @@ -279,6 +299,11 @@ class Table: label_new : str or iterable of str New column label(s). + Returns + ------- + table : Table + Updated table. + """ dup = self.copy() columns = dict(zip([old] if isinstance(old,str) else old, @@ -300,6 +325,11 @@ class Table: ascending : bool or list, optional Set sort order. + Returns + ------- + table : Table + Updated table. + """ dup = self.copy() dup._label_discrete() @@ -320,6 +350,11 @@ class Table: other : Table Table to append. + Returns + ------- + table : Table + Concatenated table. + """ if self.shapes != other.shapes or not self.data.columns.equals(other.data.columns): raise KeyError('Labels or shapes or order do not match') @@ -340,6 +375,10 @@ class Table: other : Table Table to join. + Returns + ------- + table : Table + Joined table. """ if set(self.shapes) & set(other.shapes) or self.data.shape[0] != other.data.shape[0]: raise KeyError('Dublicated keys or row count mismatch') From 4208c4e713234424cc47bc9163c6e155f4da55de Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Mon, 8 Mar 2021 11:03:18 -0500 Subject: [PATCH 43/48] adapted to Table.add being out-of-place --- python/damask/_result.py | 4 ++-- python/damask/_table.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/python/damask/_result.py b/python/damask/_result.py index 50e2aa720..56924c533 100644 --- a/python/damask/_result.py +++ b/python/damask/_result.py @@ -391,12 +391,12 @@ class Result: path = (os.path.join(*([prop,name]+([cat] if cat else [])+([item] if item else []))) if split else path)+tag if split: try: - tbl[inc].add(path,data) + tbl[inc] = tbl[inc].add(path,data) except KeyError: tbl[inc] = Table(data.reshape(self.N_materialpoints,-1),{path:data.shape[1:]}) else: try: - tbl.add(path,data) + tbl = tbl.add(path,data) except AttributeError: tbl = Table(data.reshape(self.N_materialpoints,-1),{path:data.shape[1:]}) diff --git a/python/damask/_table.py b/python/damask/_table.py index 5203b0b61..ee64ba017 100644 --- a/python/damask/_table.py +++ b/python/damask/_table.py @@ -379,6 +379,7 @@ class Table: ------- table : Table Joined table. + """ if set(self.shapes) & set(other.shapes) or self.data.shape[0] != other.data.shape[0]: raise KeyError('Dublicated keys or row count mismatch') From 97dbf7c5b0e404e1a23cdc13b45faaa30587ef47 Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 9 Mar 2021 00:50:01 +0100 Subject: [PATCH 44/48] [skip ci] updated version information after successful test of v3.0.0-alpha2-597-g6b6f66a5b --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 67cadbda6..98ffcb459 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-593-g1b4901b60 +v3.0.0-alpha2-597-g6b6f66a5b From a26e586b144d8029bc7f19917a30fc817ef79d6c Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 9 Mar 2021 19:15:15 +0000 Subject: [PATCH 45/48] More general 'delete' (accepts iterables) and backports of '|' and '|=' for union/add. '|=' would work for python 3.9 without extra code, but '|' unfortunately casts 'damask.Config' (subclass of 'dict') to a 'dict'. --- python/damask/_config.py | 61 ++++++++++++++++++++++--------------- python/tests/test_Config.py | 11 ++++++- 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/python/damask/_config.py b/python/damask/_config.py index edf3a5676..85f0c208c 100644 --- a/python/damask/_config.py +++ b/python/damask/_config.py @@ -1,5 +1,6 @@ import copy from io import StringIO +from collections.abc import Iterable import abc import numpy as np @@ -44,6 +45,42 @@ class Config(dict): copy = __copy__ + def __or__(self,other): + """ + Update configuration with contents of other. + + Parameters + ---------- + other : damask.Config or dict + Key-value pairs that update self. + + """ + duplicate = self.copy() + duplicate.update(other) + return duplicate + + + def __ior__(self,other): + """Update configuration with contents of other.""" + return self.__or__(other) + + + def delete(self,keys): + """ + Remove configuration keys. + + Parameters + ---------- + keys : iterable or scalar + Label of the key(s) to remove. + + """ + duplicate = self.copy() + for k in keys if isinstance(keys, Iterable) and not isinstance(keys, str) else [keys]: + del duplicate[k] + return duplicate + + @classmethod def load(cls,fname): """ @@ -99,30 +136,6 @@ class Config(dict): fhandle.write(yaml.dump(self,Dumper=NiceDumper,**kwargs)) - def add(self,d): - """ - Add dictionary. - - d : dict - Dictionary to append. - """ - duplicate = self.copy() - duplicate.update(d) - return duplicate - - - def delete(self,key): - """ - Delete item. - - key : str or scalar - Label of the key to remove. - """ - duplicate = self.copy() - del duplicate[key] - return duplicate - - @property @abc.abstractmethod def is_complete(self): diff --git a/python/tests/test_Config.py b/python/tests/test_Config.py index 0319fb6de..9324c28c5 100644 --- a/python/tests/test_Config.py +++ b/python/tests/test_Config.py @@ -23,8 +23,17 @@ class TestConfig: assert Config.load(f) == config def test_add_remove(self): + dummy = {'hello':'world','foo':'bar'} config = Config() - assert config.add({'hello':'world'}).delete('hello') == config + config |= dummy + assert config == Config() | dummy + config = config.delete(dummy) + assert config == Config() + assert (config | dummy ).delete( 'hello' ) == config | {'foo':'bar'} + assert (config | dummy ).delete([ 'hello', 'foo' ]) == config + assert (config | Config(dummy)).delete({ 'hello':1,'foo':2 }) == config + assert (config | Config(dummy)).delete(Config({'hello':1 })) == config | {'foo':'bar'} + def test_repr(self,tmp_path): config = Config() From 569e1c2067e2382f30617f8b3c21b875d6e203c1 Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 9 Mar 2021 23:18:27 +0100 Subject: [PATCH 46/48] [skip ci] updated version information after successful test of v3.0.0-alpha2-600-g1aaa658e3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 98ffcb459..5b2965883 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-597-g6b6f66a5b +v3.0.0-alpha2-600-g1aaa658e3 From e2d4ab427ec7319eaeceb9cba6c7e3fb4dcf842a Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 9 Mar 2021 22:02:49 -0500 Subject: [PATCH 47/48] explicit path joining with "/" in _result; updated cpTi CRSS --- examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml | 7 ++++--- python/damask/_result.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml b/examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml index 39d565585..aa5262454 100644 --- a/examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml +++ b/examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml @@ -1,5 +1,6 @@ # M. Levy, Handbook of Elastic Properties of Solids, Liquids, and Gases (2001) # C. Zambaldi, "Orientation informed nanoindentation of a-titanium: Indentation pileup in hexagonal metals deforming by prismatic slip", J. Mater. Res., Vol. 27, No. 1, Jan 14, 2012 +# Better use values from L. Wang, Z. Zheng, H. Phukan, P. Kenesei, J.-S. Park, J. Lind, R.M. Suter, T.R. Bieler, Direct measurement of critical resolved shear stress of prismatic and basal slip in polycrystalline Ti using high energy X-ray diffraction microscopy, Acta Mater 2017 cpTi: lattice: hP c/a: 1.587 @@ -7,7 +8,7 @@ cpTi: output: [F, P, F_e, F_p, L_p, O] elasticity: {C_11: 160.0e9, C_12: 90.0e9, C_13: 66.0e9, C_33: 181.7e9, C_44: 46.5e9, type: hooke} plasticity: - N_sl: [3, 3, 0, 0, 12] + N_sl: [3, 3, 0, 6, 12] a_sl: 2.0 dot_gamma_0_sl: 0.001 h_0_sl_sl: 200e6 @@ -15,5 +16,5 @@ cpTi: n_sl: 20 output: [gamma_sl] type: phenopowerlaw - xi_0_sl: [349e6, 150e6, 0, 0, 1107e6] - xi_inf_sl: [568e6, 1502e6, 0, 0, 3420e6] + xi_0_sl: [0.15e9, 0.09e9, 0, 0.20e9, 0.25e9] + xi_inf_sl: [0.24e9, 0.5e9, 0, 0.6e9, 0.8e9] diff --git a/python/damask/_result.py b/python/damask/_result.py index 56924c533..4ecd0ba51 100644 --- a/python/damask/_result.py +++ b/python/damask/_result.py @@ -371,7 +371,7 @@ class Result: with h5py.File(self.fname,'r') as f: for dataset in sets: for group in self.groups_with_datasets(dataset): - path = os.path.join(group,dataset) + path = '/'.join([group,dataset]) inc,prop,name,cat,item = (path.split('/') + ['']*5)[:5] key = '/'.join([prop,name+tag]) if key not in inGeom: @@ -388,7 +388,7 @@ class Result: np.nan, dtype=np.dtype(f[path])) data[inGeom[key]] = (f[path] if len(shape)>1 else np.expand_dims(f[path],1))[inData[key]] - path = (os.path.join(*([prop,name]+([cat] if cat else [])+([item] if item else []))) if split else path)+tag + path = ('/'.join([prop,name]+([cat] if cat else [])+([item] if item else [])) if split else path)+tag if split: try: tbl[inc] = tbl[inc].add(path,data) From 8daa8a965c774ef44b5865c1f030dc594974df12 Mon Sep 17 00:00:00 2001 From: Test User Date: Wed, 10 Mar 2021 05:37:26 +0100 Subject: [PATCH 48/48] [skip ci] updated version information after successful test of v3.0.0-alpha2-602-ge2d4ab427 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5b2965883..bbcfb4711 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-600-g1aaa658e3 +v3.0.0-alpha2-602-ge2d4ab427