aboutsummaryrefslogtreecommitdiff
path: root/Carpet
diff options
context:
space:
mode:
authorschnetter <>2002-03-06 16:47:00 +0000
committerschnetter <>2002-03-06 16:47:00 +0000
commit018574eb13db6cc7af12688ef70dffb3d83397b8 (patch)
tree935be2cffd1a8412dc4ca58f0ed07f3fec0d0af3 /Carpet
parent7e128eda1286b9c9a621c4187eaa23e448e9658f (diff)
Updated parameter files to new conventions.
Updated parameter files to new conventions. Removed "static" boundary conditions; these depend on private changes not available in Cactus. darcs-hash:20020306164757-07bb3-531f54e20a2bb93536b467dffbb459f6b14777f1.gz
Diffstat (limited to 'Carpet')
-rw-r--r--Carpet/Carpet/options/carpet-lilypond-gcc35
-rw-r--r--Carpet/CarpetRegrid/src/regrid.cc4
2 files changed, 5 insertions, 4 deletions
diff --git a/Carpet/Carpet/options/carpet-lilypond-gcc3 b/Carpet/Carpet/options/carpet-lilypond-gcc3
index 87b2dfa8f..d620e30bd 100644
--- a/Carpet/Carpet/options/carpet-lilypond-gcc3
+++ b/Carpet/Carpet/options/carpet-lilypond-gcc3
@@ -1,7 +1,6 @@
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/Attic/carpet-lilypond-gcc3,v 1.3 2002/01/01 16:48:28 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/Attic/carpet-lilypond-gcc3,v 1.4 2002/03/06 17:47:57 schnetter Exp $
-#CPP = /home/eschnett/gcc/bin/cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL
-CPP = cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL
+CPP = /home/eschnett/gcc/bin/cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL
CC = /home/eschnett/gcc/bin/gcc
CXX = /home/eschnett/gcc/bin/g++
F77 = /home/eschnett/gcc/bin/g77
diff --git a/Carpet/CarpetRegrid/src/regrid.cc b/Carpet/CarpetRegrid/src/regrid.cc
index a8417a1f3..1b0b95d87 100644
--- a/Carpet/CarpetRegrid/src/regrid.cc
+++ b/Carpet/CarpetRegrid/src/regrid.cc
@@ -19,7 +19,7 @@
#include "carpet.hh"
#include "regrid.hh"
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.7 2002/01/14 14:59:27 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.8 2002/03/06 17:47:58 schnetter Exp $";
@@ -489,6 +489,8 @@ namespace CarpetRegrid {
assert (! region.empty());
// Count grid points that need to be refined
+ // (this doesn't work yet on multiple processors)
+ assert (CCTK_nProcs(cctkGH)==1);
int cnt = 0;
for (bbox<int,dim>::iterator it=region.begin(); it!=region.end(); ++it) {
if (error[*it] > maxerror) ++cnt;