From 5bb1fe42ddbd94d1acfa248aa28122245072f8d8 Mon Sep 17 00:00:00 2001 From: Dhairya Vyas Date: Thu, 9 Jan 2025 19:08:19 -0600 Subject: [PATCH] resolved conflict --- src/GRANULAR/gran_sub_mod_rolling.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/GRANULAR/gran_sub_mod_rolling.cpp b/src/GRANULAR/gran_sub_mod_rolling.cpp index 674716f7df..33b01bb359 100644 --- a/src/GRANULAR/gran_sub_mod_rolling.cpp +++ b/src/GRANULAR/gran_sub_mod_rolling.cpp @@ -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);