aboutsummaryrefslogtreecommitdiff
path: root/Carpet
diff options
context:
space:
mode:
authorschnetter <>2003-07-14 13:41:00 +0000
committerschnetter <>2003-07-14 13:41:00 +0000
commitb7f1c8bf37644802bc4ed9fa7ae146addf5839be (patch)
treecb7b26f41c2f69eb7c43ef345e4e3464dfd1f3a4 /Carpet
parentc974dad7f4fb853e82e62fddea12c23839ddf630 (diff)
Declare some more routines as taking a const cGH *, to match the
Declare some more routines as taking a const cGH *, to match the recent changes in the flesh. darcs-hash:20030714134134-07bb3-6c0078627d40a9d05320632feba2277afdd33bdf.gz
Diffstat (limited to 'Carpet')
-rw-r--r--Carpet/Carpet/src/carpet.hh12
-rw-r--r--Carpet/Carpet/src/carpet_public.hh12
-rw-r--r--Carpet/CarpetLib/src/dh.cc4
3 files changed, 15 insertions, 13 deletions
diff --git a/Carpet/Carpet/src/carpet.hh b/Carpet/Carpet/src/carpet.hh
index 1110dc608..650dbe492 100644
--- a/Carpet/Carpet/src/carpet.hh
+++ b/Carpet/Carpet/src/carpet.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet.hh,v 1.23 2003/06/18 18:28:07 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet.hh,v 1.24 2003/07/14 15:41:34 schnetter Exp $
#ifndef CARPET_HH
#define CARPET_HH
@@ -31,12 +31,12 @@ namespace Carpet {
int mintl (checktimes where, int num_tl);
int maxtl (checktimes where, int num_tl);
- void Poison (cGH* cgh, checktimes where);
- void PoisonGroup (cGH* cgh, int group, checktimes where);
- void PoisonCheck (cGH* cgh, checktimes where);
+ void Poison (const cGH* cgh, checktimes where);
+ void PoisonGroup (const cGH* cgh, int group, checktimes where);
+ void PoisonCheck (const cGH* cgh, checktimes where);
- void CalculateChecksums (cGH* cgh, checktimes where);
- void CheckChecksums (cGH* cgh, checktimes where);
+ void CalculateChecksums (const cGH* cgh, checktimes where);
+ void CheckChecksums (const cGH* cgh, checktimes where);
// Debugging output
void Waypoint (const char* fmt, ...);
diff --git a/Carpet/Carpet/src/carpet_public.hh b/Carpet/Carpet/src/carpet_public.hh
index b4eba6764..0cee399c4 100644
--- a/Carpet/Carpet/src/carpet_public.hh
+++ b/Carpet/Carpet/src/carpet_public.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.31 2003/06/20 11:58:32 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.32 2003/07/14 15:41:34 schnetter Exp $
// It is assumed that the number of components of all arrays is equal
// to the number of components of the grid functions, and that their
@@ -117,11 +117,11 @@ namespace Carpet {
int Shutdown (tFleshConfig* config);
int CallFunction (void* function, cFunctionData* attribute, void* data);
- int SyncGroup (cGH* cgh, const char* groupname);
- int EnableGroupStorage (cGH* cgh, const char* groupname);
- int DisableGroupStorage (cGH* cgh, const char* groupname);
- int EnableGroupComm (cGH* cgh, const char* groupname);
- int DisableGroupComm (cGH* cgh, const char* groupname);
+ int SyncGroup (const cGH* cgh, const char* groupname);
+ int EnableGroupStorage (const cGH* cgh, const char* groupname);
+ int DisableGroupStorage (const cGH* cgh, const char* groupname);
+ int EnableGroupComm (const cGH* cgh, const char* groupname);
+ int DisableGroupComm (const cGH* cgh, const char* groupname);
int Barrier (const cGH* cgh);
int Exit (cGH* cgh, int retval);
int Abort (cGH* cgh, int retval);
diff --git a/Carpet/CarpetLib/src/dh.cc b/Carpet/CarpetLib/src/dh.cc
index 4cbee384b..c9c15e1da 100644
--- a/Carpet/CarpetLib/src/dh.cc
+++ b/Carpet/CarpetLib/src/dh.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.35 2003/05/23 23:52:31 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.36 2003/07/14 15:41:34 schnetter Exp $
#include <assert.h>
@@ -411,7 +411,9 @@ void dh<D>::recompose (const int initialise_upto) {
// Assert that all boundaries are synced or received
{
const ibset& sync_not = boxes[rl][c][ml].sync_not;
+#if 0
const ibset& recv_not = boxes[rl][c][ml].recv_not;
+#endif
// Check that no boundaries are left over
if (rl==0) assert (sync_not.empty());