Merge branch release-5-1

[alexxy/gromacs.git] / src / gromacs / mdlib / stat.cpp

diff --git a/src/gromacs/mdlib/stat.cpp b/src/gromacs/mdlib/stat.cpp
index b4ce57091ca6d2f5b8681a12cf9da7de44c50164..7c6de83ec44ef1f4b8290d8e7a9c4f8ea2eee051 100644 (file)
--- a/src/gromacs/mdlib/stat.cpp
+++ b/src/gromacs/mdlib/stat.cpp
@@ -150,7 +150,7 @@ void global_stat(gmx_global_stat_t gs,
     t_bin     *rb;
     int       *itc0, *itc1;
     int        ie    = 0, ifv = 0, isv = 0, irmsd = 0, imu = 0;
-    int        idedl = 0, idvdll = 0, idvdlnl = 0, iepl = 0, icm = 0, imass = 0, ica = 0, inb = 0;
+    int        idedl = 0, idedlo = 0, idvdll = 0, idvdlnl = 0, iepl = 0, icm = 0, imass = 0, ica = 0, inb = 0;
     int        isig  = -1;
     int        icj   = -1, ici = -1, icx = -1;
     int        inn[egNR];
@@ -217,6 +217,10 @@ void global_stat(gmx_global_stat_t gs,
             /* these probably need to be put into one of these categories */
             where();
             idedl = add_binr(rb, 1, &(ekind->dekindl));
+            if (bSumEkinhOld)
+            {
+                idedlo = add_binr(rb, 1, &(ekind->dekindl_old));
+            }
             where();
             ica   = add_binr(rb, 1, &(ekind->cosacc.mvcos));
             where();
@@ -329,6 +333,10 @@ void global_stat(gmx_global_stat_t gs,
                 }
             }
             extract_binr(rb, idedl, 1, &(ekind->dekindl));
+            if (bSumEkinhOld)
+            {
+                extract_binr(rb, idedlo, 1, &(ekind->dekindl_old));
+            }
             extract_binr(rb, ica, 1, &(ekind->cosacc.mvcos));
             where();
         }