Fixing various errors, reorganizing status variable

2023-05-12 23:33:02 -06:00
parent 35418afd6b
commit dfc47a5501
16 changed files with 113 additions and 120 deletions
--- a/src/RHEO/compute_rheo_surface.cpp
+++ b/src/RHEO/compute_rheo_surface.cpp
@ -183,7 +183,7 @@ void ComputeRHEOSurface::compute_peratom()
    jlist = firstneigh[i];
    jnum = numneigh[i];
    itype = type[i];
-    fluidi = status[i] & STATUS_FLUID;
+    fluidi = !(status[i] & PHASECHECK);

    for (jj = 0; jj < jnum; jj++) {
      j = jlist[jj];
@ -196,7 +196,7 @@ void ComputeRHEOSurface::compute_peratom()
      rsq = lensq3(dx);
      if (rsq < cutsq) {
        jtype = type[j];
-        fluidj = status[j] & STATUS_FLUID;
+        fluidj = !(status[j] & PHASECHECK);

        rhoi = rho[i];
        rhoj = rho[j];