From 9c7714e40fa3c15499e25ee217f79cabff64e4a9 Mon Sep 17 00:00:00 2001 From: William Zunker Date: Tue, 14 Jan 2025 10:52:12 -0500 Subject: [PATCH] Simplified deltamax definition --- src/GRANULAR/gran_sub_mod_normal.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GRANULAR/gran_sub_mod_normal.cpp b/src/GRANULAR/gran_sub_mod_normal.cpp index 457162c871..11a084512e 100644 --- a/src/GRANULAR/gran_sub_mod_normal.cpp +++ b/src/GRANULAR/gran_sub_mod_normal.cpp @@ -548,14 +548,14 @@ double GranSubModNormalMDR::calculate_forces() // Rigid flat placement scheme double *deltamax_offset = & history[DELTA_MAX]; - double deltamax = *deltamax_offset; double *deltap_offset0 = & history[DELTAP_0]; double *deltap_offset1 = & history[DELTAP_1]; double deltap0 = *deltap_offset0; double deltap1 = *deltap_offset1; - if (gm->delta >= *deltamax_offset) *deltamax_offset = gm->delta; - if (update) deltamax = *deltamax_offset; + if (update && gm->delta >= *deltamax_offset) *deltamax_offset = gm->delta; + double deltamax = *deltamax_offset; + for (int contactSide = 0; contactSide < 2; contactSide++) {