ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflict

Browse Source
This commit is contained in:
Dhairya Vyas
2025-01-09 19:08:19 -06:00
parent d68287a9c7
commit 5bb1fe42dd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/GRANULAR/gran_sub_mod_rolling.cpp
View File

@ -77,10 +77,11 @@ void GranSubModRollingSDS::calculate_forces()
Frcrit = mu * gm->normal_model->get_fncrit();
hist_temp[0] = gm->history[rhist0];
hist_temp[1] = gm->history[rhist1];
hist_temp[2] = gm->history[rhist2];
if (gm->history_update) {
hist_temp[0] = gm->history[rhist0];
hist_temp[1] = gm->history[rhist1];
hist_temp[2] = gm->history[rhist2];
rolldotn = dot3(hist_temp, gm->nxuse);
frameupdate = (fabs(rolldotn) * k) > (EPSILON * Frcrit);