aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Reisswig <reisswig@tapir.caltech.edu>2010-09-09 12:24:16 -0700
committerBarry Wardell <barry.wardell@gmail.com>2011-12-14 18:25:19 +0000
commit79dada933702bb122e25edef4bd281ba997d77ed (patch)
tree0cde6ba2808dc9cc3e734ba1d602920432dfd58e
parent2abc7ebb35006501498d5b0c8a72df11f4acab82 (diff)
Removed explicit include paths to Nirvana include files and made it
work with ExternalLibraries/Nirvana.
-rw-r--r--Carpet/CarpetIONirvana/configuration.ccl2
-rw-r--r--Carpet/CarpetIONirvana/src/CarpetIONirvana.hh8
2 files changed, 5 insertions, 5 deletions
diff --git a/Carpet/CarpetIONirvana/configuration.ccl b/Carpet/CarpetIONirvana/configuration.ccl
index ef2b9dc15..6b41cf9d7 100644
--- a/Carpet/CarpetIONirvana/configuration.ccl
+++ b/Carpet/CarpetIONirvana/configuration.ccl
@@ -1,5 +1,5 @@
# Configuration definitions for thorn CarpetIONirvana
-REQUIRES Carpet CarpetLib IOUtil #Nirvana
+REQUIRES Carpet CarpetLib IOUtil HDF5 Nirvana
REQUIRES THORNS: Carpet CarpetLib IOUtil
diff --git a/Carpet/CarpetIONirvana/src/CarpetIONirvana.hh b/Carpet/CarpetIONirvana/src/CarpetIONirvana.hh
index eb026c68b..399b37e38 100644
--- a/Carpet/CarpetIONirvana/src/CarpetIONirvana.hh
+++ b/Carpet/CarpetIONirvana/src/CarpetIONirvana.hh
@@ -1,8 +1,8 @@
-#ifndef CARPETIOHDF5_HH
-#define CARPETIOHDF5_HH
+#ifndef CARPETIONIRVANA_HH
+#define CARPETIONIRVANA_HH
-#include "/home/reisswig/SVN/Nirvana/CarpetN5.hh"
-#include "/home/reisswig/SVN/Nirvana/metadata.hh"
+#include "CarpetN5.hh"
+#include "metadata.hh"
#include <vector>