Revert part of "Requirements: Beautify code"

This reverts part of commit 40f113decf0d0de18aeabb8cce90bdc835f56fdd
which looks like it was committed accidentally and causes tests to
fail.

2 files changed, 4 insertions, 7 deletions

diff --git a/Carpet/Carpet/src/Restrict.cc b/Carpet/Carpet/src/Restrict.cc
index f07715a86..10d537671 100644
--- a/Carpet/Carpet/src/Restrict.cc
+++ b/Carpet/Carpet/src/Restrict.cc
@@ -41,17 +41,14 @@ namespace Carpet {
       return;
     }
 
-    // remove all groups that are non-GFs, empty, or have no storage assigned
+    // remove all groups with are non-GFs, empty, or have no storage assigned
     vector<int> groups;
     groups.reserve (CCTK_NumGroups());
 
     for (int group = 0; group < CCTK_NumGroups(); ++group) {
-      operator_type const op = groupdata.AT(group).transport_operator;
-      bool const do_restrict = op != op_none and op != op_sync;
-      if (do_restrict
+      if (CCTK_GroupTypeI(group) == CCTK_GF
           and CCTK_NumVarsInGroupI(group) > 0
-          and CCTK_QueryGroupStorageI(cctkGH, group))
-      {
+          and CCTK_QueryGroupStorageI(cctkGH, group)) {
         groups.push_back (group);
       }
     }
diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc
index 138e0f63a..23fda6d94 100644
--- a/Carpet/Carpet/src/SetupGH.cc
+++ b/Carpet/Carpet/src/SetupGH.cc
@@ -2273,7 +2273,7 @@ namespace Carpet {
     
     if (gdata.grouptype != CCTK_GF) {
       // Ignore everything but true grid functions
-      return op_sync;           // was: op_copy -- why?
+      return op_copy;
     }
     
     bool const can_transfer = can_transfer_variable_type (cctkGH, group, gdata);