aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschnetter <>2003-03-28 09:11:00 +0000
committerschnetter <>2003-03-28 09:11:00 +0000
commitd945a4ca407aa56d773bf1e41a2011e86e1e6538 (patch)
treeca95ba71d3ccbc77bee8c9165af3f687e99822a0
parent2abd0b266819e4b67d1759b8ecd2335cb1a9b2fa (diff)
Remove #warning statements that are not understood by the SGI
Remove #warning statements that are not understood by the SGI compiler. What was I thinking? darcs-hash:20030328091154-07bb3-dc9908d5049478c1e85f72a4bb4a1703fdf83fb1.gz
-rw-r--r--Carpet/CarpetLib/src/dh.cc9
-rw-r--r--Carpet/CarpetLib/src/ggf.cc4
-rw-r--r--CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par4
3 files changed, 7 insertions, 10 deletions
diff --git a/Carpet/CarpetLib/src/dh.cc b/Carpet/CarpetLib/src/dh.cc
index 081d988c9..958dbdf95 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.28 2003/03/26 17:34:43 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.29 2003/03/28 10:11:54 schnetter Exp $
#include <assert.h>
@@ -76,7 +76,7 @@ void dh<D>::recompose () {
if (h.outer_boundaries[rl][c][d][0]) ldist[d] = 0;
if (h.outer_boundaries[rl][c][d][1]) udist[d] = 0;
}
-#warning "This can happen on multiple processors"
+ // TODO: This can happen on multiple processors
assert (! intr.empty());
boxes[rl][c][ml].exterior = intr.expand(ldist, udist);
@@ -176,7 +176,7 @@ void dh<D>::recompose () {
} // for c
} // for rl
-#warning "TODO: prefer boxes from the same processor"
+ // TODO: prefer boxes from the same processor
for (int rl=0; rl<h.reflevels(); ++rl) {
for (int c=0; c<h.components(rl); ++c) {
for (int ml=0; ml<h.mglevels(rl,c); ++ml) {
@@ -272,9 +272,6 @@ void dh<D>::recompose () {
}
}
recvs.normalize();
- // This is just an assumption: the restriction should
- // always be a single (convex) bbox.
- assert (recvs.setsize() <= 1);
for (typename ibset::const_iterator si = recvs.begin();
si != recvs.end(); ++si) {
const ibbox & recv = *si;
diff --git a/Carpet/CarpetLib/src/ggf.cc b/Carpet/CarpetLib/src/ggf.cc
index 2d21c7c73..7ab793e0f 100644
--- a/Carpet/CarpetLib/src/ggf.cc
+++ b/Carpet/CarpetLib/src/ggf.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/ggf.cc,v 1.22 2003/03/26 17:34:43 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/ggf.cc,v 1.23 2003/03/28 10:11:54 schnetter Exp $
#include <assert.h>
#include <stdlib.h>
@@ -83,7 +83,7 @@ void ggf<D>::recompose () {
(d.boxes[rl][c][ml].exterior, h.proc(rl,c));
// Initialise from coarser level, if possible
-#warning "TODO: init only un-copied regions"
+ // TODO: init only un-copied regions
if (rl>0) {
const CCTK_REAL time = t.time(tl,rl,ml);
ref_prolongate (tl,rl,c,ml,time);
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par
index 4e81b11c2..c3a069839 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par
@@ -7,9 +7,9 @@
# @enddesc
# @@*/
#
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par,v 1.5 2002/10/24 21:11:27 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par,v 1.6 2003/03/28 10:11:54 schnetter Exp $
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77"
Cactus::cctk_itlast = 60