aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetInterp2
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2012-01-02 17:10:03 -0500
committerBarry Wardell <barry.wardell@gmail.com>2012-09-11 18:15:41 +0100
commit3f05288dd3cc8bbf1189c565029fabe3f656d9bd (patch)
treedcde3053f30687bb5167e25e38f7b51db6840395 /Carpet/CarpetInterp2
parent0606b6aa33ac7a9021968ec771b402a125d12f11 (diff)
CarpetInterp2: Don't define dim, use Carpet's dim instead
Diffstat (limited to 'Carpet/CarpetInterp2')
-rw-r--r--Carpet/CarpetInterp2/src/fasterp.hh6
1 files changed, 5 insertions, 1 deletions
diff --git a/Carpet/CarpetInterp2/src/fasterp.hh b/Carpet/CarpetInterp2/src/fasterp.hh
index 5dc9cf2c1..f02a93c02 100644
--- a/Carpet/CarpetInterp2/src/fasterp.hh
+++ b/Carpet/CarpetInterp2/src/fasterp.hh
@@ -13,6 +13,8 @@
#include <typeprops.hh>
#include <vect.hh>
+#include <carpet.hh>
+
// Define this at all times, because otherwise out-of-bounds
@@ -24,10 +26,11 @@
namespace CarpetInterp2 {
using namespace std;
+ using namespace Carpet;
- int const dim = 3;
+ // int const dim = 3;
// Each interpolation point descriptor requires
// (dim * (max_order+1) + 1)
@@ -115,6 +118,7 @@ namespace CarpetInterp2 {
// A global location, given by its global coordinates
struct fasterp_glocs_t {
+ // TODO: use vector<rvect> instead
vector<CCTK_REAL> coords[dim];
fasterp_glocs_t (size_t const n)
{