jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'patch-4' of https://github.com/abbatux/lammps into collected-small-changes

This commit is contained in:
Axel Kohlmeyer 2018-02-13 09:51:02 +01:00
parent 378c5071bf 16d6dfcab6
commit fcf552ffe1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/USER-SMD/pair_smd_tlsph.cpp
View File

@ -775,9 +775,9 @@ void PairTlsph::AssembleStress() {
// compute a characteristic time over which to average the plastic strain
double tav = 1000 * radius[i] / (Lookup[SIGNAL_VELOCITY][itype]);
eff_plastic_strain_rate[i] -= eff_plastic_strain_rate[i] / tav;
eff_plastic_strain_rate[i] += (plastic_strain_increment / dt) / tav;
eff_plastic_strain_rate[i] = MAX(0.0, eff_plastic_strain_rate[i]);
eff_plastic_strain_rate[i] -= eff_plastic_strain_rate[i] * dt / tav;
eff_plastic_strain_rate[i] += plastic_strain_increment / tav;
eff_plastic_strain_rate[i] = MAX(0.0, eff_plastic_strain_rate[i]);
/*
* assemble total stress from pressure and deviatoric stress