Requirements: Modify iteration arguments in Requirements.hh

Use int instead of CCTK_INT; all other arguments are also int.
Change argument order in Sync; move iteration next to reflevel.
Add iteration argument to BeforeRoutine; AfterRoutine also takes it.
Change name from cctk_iteration to iteration; no other variables have a cctk_ prefix.

Update callers in Carpet.

1 files changed, 6 insertions, 6 deletions

diff --git a/Carpet/Requirements/src/Requirements.hh b/Carpet/Requirements/src/Requirements.hh
index a82093ce1..8c682f6dd 100644
--- a/Carpet/Requirements/src/Requirements.hh
+++ b/Carpet/Requirements/src/Requirements.hh
@@ -42,20 +42,20 @@ namespace Requirements {
   // TODO: Either combine these "before" and "after" routines, or
   // split the other routines as well
   void BeforeRoutine(cFunctionData const* function_data,
-                     int reflevel, int map,
+                     int iteration, int reflevel, int map,
                      int timelevel, int timelevel_offset);
   // After calling a routine: update according to writes clauses
   void AfterRoutine(cFunctionData const* function_data,
-                    CCTK_INT cctk_iteration,
-                    int reflevel, int map,
+                    int iteration, int reflevel, int map,
                     int timelevel, int timelevel_offset);
   // Synchronise and prolongate
   // TODO: This does not handle variables that are not prolongated
   // TODO: This does not handle buffer zones
-  void Sync(cFunctionData const* function_data, CCTK_INT cctk_iteration,
-            vector<int> const& groups, int reflevel, int timelevel);
+  void Sync(cFunctionData const* function_data,
+            vector<int> const& groups,
+            int iteration, int reflevel, int timelevel);
   // Restrict
-  void Restrict(vector<int> const& groups, CCTK_INT cctk_iteration, int reflevel);
+  void Restrict(vector<int> const& groups, int iteration, int reflevel);
   
 } // namespace Requirements