aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetIOScalar
diff options
context:
space:
mode:
authorswhite <schnetter@cct.lsu.edu>2004-12-01 16:18:00 +0000
committerswhite <schnetter@cct.lsu.edu>2004-12-01 16:18:00 +0000
commitde4a5ff0c34e64ac7064293cfffc285d16b91902 (patch)
treefdb7298f5edac7382e9dde078b5d6056ffb9f078 /Carpet/CarpetIOScalar
parent3ffb7d3808147aaa9e57cf9575312efaefe51a47 (diff)
typecase_INCLUDE_HEADER_IN
Made all Carpet thorns to include the "typecase" file from the Carpet thorn using the "include header: .. in .." mechanism, getting rid of explicit file paths. darcs-hash:20041201161810-32473-75f4594a4d9c19a11dbe9d07741678a84bd6f694.gz
Diffstat (limited to 'Carpet/CarpetIOScalar')
-rw-r--r--Carpet/CarpetIOScalar/interface.ccl1
-rw-r--r--Carpet/CarpetIOScalar/src/ioscalar.cc4
2 files changed, 3 insertions, 2 deletions
diff --git a/Carpet/CarpetIOScalar/interface.ccl b/Carpet/CarpetIOScalar/interface.ccl
index 2b516f167..6d052b579 100644
--- a/Carpet/CarpetIOScalar/interface.ccl
+++ b/Carpet/CarpetIOScalar/interface.ccl
@@ -7,6 +7,7 @@ CCTK_INT last_output_iteration TYPE=scalar
CCTK_REAL last_output_time TYPE=scalar
CCTK_INT this_iteration TYPE=scalar
+USES INCLUDE HEADER: carpet_typecase.hh
# function to check whether existing output files should be truncated or not
CCTK_INT FUNCTION IO_TruncateOutputFiles \
diff --git a/Carpet/CarpetIOScalar/src/ioscalar.cc b/Carpet/CarpetIOScalar/src/ioscalar.cc
index f16bcd996..8d8738f4d 100644
--- a/Carpet/CarpetIOScalar/src/ioscalar.cc
+++ b/Carpet/CarpetIOScalar/src/ioscalar.cc
@@ -278,7 +278,7 @@ namespace CarpetIOScalar {
union {
#define TYPECASE(N,T) T var_##T;
-#include "Carpet/Carpet/src/typecase"
+#include "carpet_typecase.hh"
#undef TYPECASE
} result;
@@ -295,7 +295,7 @@ namespace CarpetIOScalar {
case N: \
file << result.var_##T; \
break;
-#include "Carpet/Carpet/src/typecase"
+#include "carpet_typecase.hh"
#undef TYPECASE
default:
UnsupportedVarType (n);