diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2013-04-04 12:12:39 -0400 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2013-04-04 12:12:39 -0400 |
| commit | 7a99eee603df1194809db30f916d3eeb730c39ee (patch) | |
| tree | 7f7ae896423fca3613562debe422051ed57f4853 /Carpet/Carpet | |
| parent | 4f356038627da039d88820cfa145356ba6880faa (diff) | |
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.
Diffstat (limited to 'Carpet/Carpet')
| -rw-r--r-- | Carpet/Carpet/src/CallFunction.cc | 6 | ||||
| -rw-r--r-- | Carpet/Carpet/src/Comm.cc | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Carpet/Carpet/src/CallFunction.cc b/Carpet/Carpet/src/CallFunction.cc index 7813e5309..5b209270b 100644 --- a/Carpet/Carpet/src/CallFunction.cc +++ b/Carpet/Carpet/src/CallFunction.cc @@ -361,7 +361,8 @@ namespace Carpet { user_timer.start(); #ifdef REQUIREMENTS_HH Requirements::BeforeRoutine - (attribute, reflevel, map, timelevel, timelevel_offset); + (attribute, + cctkGH->cctk_iteration, reflevel, map, timelevel, timelevel_offset); #endif timer.start(); if (CCTK_IsFunctionAliased("Accelerator_PreCallFunction")) { @@ -381,7 +382,8 @@ namespace Carpet { timer.stop(); #ifdef REQUIREMENTS_HH Requirements::AfterRoutine - (attribute, cctkGH->cctk_iteration, reflevel, map, timelevel, timelevel_offset); + (attribute, + cctkGH->cctk_iteration, reflevel, map, timelevel, timelevel_offset); #endif user_timer.stop(); diff --git a/Carpet/Carpet/src/Comm.cc b/Carpet/Carpet/src/Comm.cc index fe9a2875a..026b7a350 100644 --- a/Carpet/Carpet/src/Comm.cc +++ b/Carpet/Carpet/src/Comm.cc @@ -137,7 +137,8 @@ namespace Carpet { if (goodgroups.size() > 0) { #ifdef REQUIREMENTS_HH - Requirements::Sync(function_data, cctkGH->cctk_iteration, goodgroups, reflevel, timelevel); + Requirements::Sync(function_data, goodgroups, + cctkGH->cctk_iteration, reflevel, timelevel); #endif // prolongate boundaries |