From 7a99eee603df1194809db30f916d3eeb730c39ee Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 4 Apr 2013 12:12:39 -0400 Subject: 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. --- Carpet/Requirements/src/Requirements.hh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Carpet/Requirements/src/Requirements.hh') 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 const& groups, int reflevel, int timelevel); + void Sync(cFunctionData const* function_data, + vector const& groups, + int iteration, int reflevel, int timelevel); // Restrict - void Restrict(vector const& groups, CCTK_INT cctk_iteration, int reflevel); + void Restrict(vector const& groups, int iteration, int reflevel); } // namespace Requirements -- cgit v1.2.3