diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2009-09-03 16:19:15 -0500 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 16:42:31 +0000 |
| commit | 11c4d98017cbb86d08e15fd1b549180184b58a26 (patch) | |
| tree | 2546a154c6f7bc0bec87de7316125ae7d1453569 /Carpet/Carpet/src/CallFunction.cc | |
| parent | f520477b1c14e02f1495cfa8d3e09f4e21ab34d0 (diff) | |
Import Carpet
Ignore-this: 309b4dd613f4af2b84aa5d6743fdb6b3
Diffstat (limited to 'Carpet/Carpet/src/CallFunction.cc')
| -rw-r--r-- | Carpet/Carpet/src/CallFunction.cc | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/Carpet/Carpet/src/CallFunction.cc b/Carpet/Carpet/src/CallFunction.cc index 696b5ce49..054ea6808 100644 --- a/Carpet/Carpet/src/CallFunction.cc +++ b/Carpet/Carpet/src/CallFunction.cc @@ -8,8 +8,8 @@ #include <gh.hh> -#include "carpet.hh" -#include "Timers.hh" +#include <carpet.hh> +#include <Timers.hh> @@ -76,13 +76,13 @@ namespace Carpet { BEGIN_META_MODE(cctkGH) { BEGIN_MGLEVEL_LOOP(cctkGH) { BEGIN_REFLEVEL_LOOP(cctkGH) { - BEGIN_MAP_LOOP(cctkGH, CCTK_GF) { + BEGIN_LOCAL_MAP_LOOP(cctkGH, CCTK_GF) { BEGIN_LOCAL_COMPONENT_LOOP(cctkGH, CCTK_GF) { CallScheduledFunction ("Meta time local mode", function, attribute, data, user_timer); } END_LOCAL_COMPONENT_LOOP; - } END_MAP_LOOP; + } END_LOCAL_MAP_LOOP; sync_timer.start(); SyncGroupsInScheduleBlock (attribute, cctkGH) ; sync_timer.stop(); @@ -159,13 +159,13 @@ namespace Carpet { if (attribute->loop_local) { BEGIN_GLOBAL_MODE(cctkGH) { BEGIN_REFLEVEL_LOOP(cctkGH) { - BEGIN_MAP_LOOP(cctkGH, CCTK_GF) { + BEGIN_LOCAL_MAP_LOOP(cctkGH, CCTK_GF) { BEGIN_LOCAL_COMPONENT_LOOP(cctkGH, CCTK_GF) { CallScheduledFunction ("Global time local mode", function, attribute, data, user_timer); } END_LOCAL_COMPONENT_LOOP; - } END_MAP_LOOP; + } END_LOCAL_MAP_LOOP; sync_timer.start(); SyncGroupsInScheduleBlock (attribute, cctkGH) ; sync_timer.stop(); @@ -213,13 +213,13 @@ namespace Carpet { // Level operation: call once per refinement level if (attribute->loop_local) { - BEGIN_MAP_LOOP(cctkGH, CCTK_GF) { + BEGIN_LOCAL_MAP_LOOP(cctkGH, CCTK_GF) { BEGIN_LOCAL_COMPONENT_LOOP(cctkGH, CCTK_GF) { CallScheduledFunction ("Level time local mode", function, attribute, data, user_timer); } END_LOCAL_COMPONENT_LOOP; - } END_MAP_LOOP; + } END_LOCAL_MAP_LOOP; } else if (attribute->loop_singlemap) { BEGIN_MAP_LOOP(cctkGH, CCTK_GF) { CallScheduledFunction @@ -239,13 +239,13 @@ namespace Carpet { // Single map operation: call once per refinement level and map if (attribute->loop_local) { - BEGIN_MAP_LOOP(cctkGH, CCTK_GF) { + BEGIN_LOCAL_MAP_LOOP(cctkGH, CCTK_GF) { BEGIN_LOCAL_COMPONENT_LOOP(cctkGH, CCTK_GF) { CallScheduledFunction ("Singlemap time local mode", function, attribute, data, user_timer); } END_LOCAL_COMPONENT_LOOP; - } END_MAP_LOOP; + } END_LOCAL_MAP_LOOP; } else { BEGIN_MAP_LOOP(cctkGH, CCTK_GF) { CallScheduledFunction @@ -260,13 +260,13 @@ namespace Carpet { } else { // Local operation: call once per component - BEGIN_MAP_LOOP(cctkGH, CCTK_GF) { + BEGIN_LOCAL_MAP_LOOP(cctkGH, CCTK_GF) { BEGIN_LOCAL_COMPONENT_LOOP(cctkGH, CCTK_GF) { CallScheduledFunction ("Local mode", function, attribute, data, user_timer); } END_LOCAL_COMPONENT_LOOP; - } END_MAP_LOOP; + } END_LOCAL_MAP_LOOP; sync_timer.start(); SyncGroupsInScheduleBlock (attribute, cctkGH) ; sync_timer.stop(); @@ -274,6 +274,7 @@ namespace Carpet { } if (schedule_barriers) { +#if 0 static unsigned int magic = 0xe8932329UL; // a random starting value unsigned int recv = magic; Checkpoint ("About to Bcast %u", magic); @@ -287,6 +288,9 @@ namespace Carpet { Checkpoint ("About to Barrier"); MPI_Barrier (dist::comm()); Checkpoint ("Finished Barrier"); +#endif + static int id = 513400912; // arbitrary starting value + CCTK_NamedBarrier (NULL, id++); } total_timer.stop(); |