diff --git a/PRIVATE b/PRIVATE index 5cbefac45..ffb01b351 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 5cbefac455e9df5f9c65dd8090eaa441ae5e6196 +Subproject commit ffb01b351ab907b61885560f452f7f0970a1a744 diff --git a/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.config b/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.config index b2199da85..3a91035ea 100644 --- a/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.config +++ b/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.config @@ -18,4 +18,3 @@ n 20 h0 75e6 tausat 63e6 a 2.25 -atol_resistance 1 diff --git a/examples/ConfigFiles/Phase_Isotropic_FreeSurface.config b/examples/ConfigFiles/Phase_Isotropic_FreeSurface.config index ee009da3a..9a01c5a35 100644 --- a/examples/ConfigFiles/Phase_Isotropic_FreeSurface.config +++ b/examples/ConfigFiles/Phase_Isotropic_FreeSurface.config @@ -22,4 +22,3 @@ h0 1e6 n 5 m 3 a 2 -atol_resistance 1 diff --git a/examples/ConfigFiles/Phase_Nonlocal_Aluminum.config b/examples/ConfigFiles/Phase_Nonlocal_Aluminum.config index fd18aa719..2af3a2b8b 100644 --- a/examples/ConfigFiles/Phase_Nonlocal_Aluminum.config +++ b/examples/ConfigFiles/Phase_Nonlocal_Aluminum.config @@ -66,6 +66,4 @@ cutoffRadius 1e-3 # cutoff radius for dislocation CFLfactor 2.0 # safety factor for CFL flux check (numerical parameter) significantRho 1e6 # minimum dislocation density considered relevant in m/m**3 #significantN 0.1 # minimum dislocation number per ip considered relevant -aTol_density 1e4 # absolute tolerance for dislocation density in m/m**3 -aTol_shear 1e-20 # absolute tolerance for plasgtic shear randomMultiplication 0 # switch for probabilistic extension of multiplication rate diff --git a/examples/ConfigFiles/Phase_Nonlocal_Nickel.config b/examples/ConfigFiles/Phase_Nonlocal_Nickel.config index 3cba4d975..d57af1462 100644 --- a/examples/ConfigFiles/Phase_Nonlocal_Nickel.config +++ b/examples/ConfigFiles/Phase_Nonlocal_Nickel.config @@ -27,7 +27,7 @@ Nslip 12 # number of slip systems per family c11 246.5e9 c12 147.3e9 c44 124.7e9 -burgers 2.48e-10 0 0 0 # Burgers vector in m +burgers 2.48e-10 # Burgers vector in m rhoSglEdgePos0 6e10 # Initial positive edge single dislocation density in m/m**3 rhoSglEdgeNeg0 6e10 # Initial negative edge single dislocation density in m/m**3 rhoSglScrewPos0 6e10 # Initial positive screw single dislocation density in m/m**3 @@ -56,7 +56,7 @@ attackFrequency 50e9 # attack frequency in Hz surfaceTransmissivity 1.0 # transmissivity of free surfaces for dislocation flux grainBoundaryTransmissivity 0.0 aTol_rho 1e100 # absolute tolerance for dislocation density in m/m**3 -aTol_shear 1e10 # absolute tolerance for dislocation density in m/m**3 +aTol_gamma 1e10 # absolute tolerance for dislocation density in m/m**3 significantRho 1e8 # dislocation density considered relevant in m/m**3 significantN 1 shortRangeStressCorrection 0 diff --git a/examples/FEM/polyXtal/material.config b/examples/FEM/polyXtal/material.config index 71e5350dc..c2d1f4ad7 100644 --- a/examples/FEM/polyXtal/material.config +++ b/examples/FEM/polyXtal/material.config @@ -14,7 +14,6 @@ plasticity phenopowerlaw lattice_structure fcc Nslip 12 # per family -Ntwin 0 # per family c11 106.75e9 c12 60.41e9 @@ -25,22 +24,8 @@ n_slip 20 tau0_slip 31e6 # per family tausat_slip 63e6 # per family a_slip 2.25 -gdot0_twin 0.001 -n_twin 20 -tau0_twin 31e6 # per family -s_pr 0 # push-up factor for slip saturation due to twinning -twin_b 0 -twin_c 0 -twin_d 0 -twin_e 0 h0_slipslip 75e6 -h0_twinslip 0 -h0_twintwin 0 interaction_slipslip 1 1 1.4 1.4 1.4 1.4 -interaction_sliptwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twinslip 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twintwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -atol_resistance 1 (output) f (output) p diff --git a/examples/SpectralMethod/Polycrystal/material.config b/examples/SpectralMethod/Polycrystal/material.config index 44e8b8c1d..8fad0f1df 100644 --- a/examples/SpectralMethod/Polycrystal/material.config +++ b/examples/SpectralMethod/Polycrystal/material.config @@ -13,15 +13,6 @@ elasticity hooke plasticity phenopowerlaw (output) resistance_slip -(output) shearrate_slip -(output) resolvedstress_slip -(output) accumulatedshear_slip -(output) resistance_twin -(output) shearrate_twin -(output) resolvedstress_twin -(output) accumulatedshear_twin - -# only for HDF5 out (output) orientation # quaternion (output) F # deformation gradient tensor (output) Fe # elastic deformation gradient tensor @@ -32,7 +23,6 @@ plasticity phenopowerlaw lattice_structure fcc Nslip 12 # per family -Ntwin 0 # per family c11 106.75e9 c12 60.41e9 @@ -45,7 +35,6 @@ tausat_slip 63e6 # per family a_slip 2.25 h0_slipslip 75e6 interaction_slipslip 1 1 1.4 1.4 1.4 1.4 -atol_resistance 1 #-------------------#