From 70ea1dd3525e1decbb1430b65267a2d71a2abffa Mon Sep 17 00:00:00 2001
From: jtclemm <jtclemm@sandia.gov>
Date: Tue, 23 Jan 2024 14:58:31 -0700
Subject: [PATCH] Refreshing no shift flag for solid particles

---
 src/RHEO/fix_rheo.cpp         | 6 ++++++
 src/RHEO/fix_rheo_thermal.cpp | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/RHEO/fix_rheo.cpp b/src/RHEO/fix_rheo.cpp
index beba940174..3a999e12dd 100644
--- a/src/RHEO/fix_rheo.cpp
+++ b/src/RHEO/fix_rheo.cpp
@@ -422,6 +422,12 @@ void FixRHEO::pre_force(int /*vflag*/)
     if (mask[i] & groupbit)
       status[i] &= OPTIONSMASK;
 
+  // Reinstate temporary options
+  for (int i = 0; i < nall; i++)
+    if (mask[i] & groupbit)
+      if (status[i] & STATUS_SOLID)
+        status[i] |= STATUS_NO_SHIFT;
+
   // Calculate surfaces, update status
   if (surface_flag) {
     compute_surface->compute_peratom();
diff --git a/src/RHEO/fix_rheo_thermal.cpp b/src/RHEO/fix_rheo_thermal.cpp
index 7b61b9821e..635cf78c85 100644
--- a/src/RHEO/fix_rheo_thermal.cpp
+++ b/src/RHEO/fix_rheo_thermal.cpp
@@ -374,7 +374,6 @@ void FixRHEOThermal::post_integrate()
         }
       }
     }
-
   }
 
   int n_melt_all, n_freeze_all;
@@ -558,7 +557,7 @@ void FixRHEOThermal::create_bonds()
 
     for (jj = 0; jj < jnum; jj++) {
       j = jlist[jj];
-      j &= SPECIALMASK;
+      j &= NEIGHMASK;
 
       if (!(status[j] & STATUS_SOLID)) continue;
       if (!(status[i] & STATUS_FREEZING) && !(status[j] & STATUS_FREEZING)) continue;