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

7 files changed, 11 insertions, 10 deletions

diff --git a/Carpet/Carpet/interface.ccl b/Carpet/Carpet/interface.ccl
index 587809ab7..842a20366 100644
--- a/Carpet/Carpet/interface.ccl
+++ b/Carpet/Carpet/interface.ccl
@@ -22,7 +22,7 @@ uses include header: th.hh
 
 uses include header: operators.hh
 
-
+INCLUDE HEADER: typecase in carpet_typecase.hh
 
 # Provide the function to en-/disable prolongation
 CCTK_INT FUNCTION EnableProlongating(CCTK_INT IN flag)
diff --git a/Carpet/CarpetIOASCII/interface.ccl b/Carpet/CarpetIOASCII/interface.ccl
index 6a8d20b63..7d2be2738 100644
--- a/Carpet/CarpetIOASCII/interface.ccl
+++ b/Carpet/CarpetIOASCII/interface.ccl
@@ -15,7 +15,7 @@ uses include header: gdata.hh
 uses include header: gf.hh
 uses include header: ggf.hh
 
-
+uses include header: carpet_typecase.hh
 
 CCTK_INT last_output_iteration[4] TYPE=scalar
 CCTK_REAL last_output_time[4] TYPE=scalar
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index 31f44784a..c32d8b2e2 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -1070,7 +1070,7 @@ namespace CarpetIOASCII {
 	    case N:					\
 	      os << (*(const data<T,D>*)gfdata)[index];	\
 	      break;
-#include "Carpet/Carpet/src/typecase"
+#include "carpet_typecase.hh"
 #undef TYPECASE
 	    default:
 	      UnsupportedVarType(vi);
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);
diff --git a/Carpet/CarpetReduce/interface.ccl b/Carpet/CarpetReduce/interface.ccl
index 375fd3558..02262b288 100644
--- a/Carpet/CarpetReduce/interface.ccl
+++ b/Carpet/CarpetReduce/interface.ccl
@@ -8,7 +8,7 @@ uses include header: vect.hh
 
 uses include header: carpet.hh
 
-
+uses include header: carpet_typecase.hh
 
 CCTK_INT FUNCTION \
     SymmetryTableHandleForGrid (CCTK_POINTER_TO_CONST IN cctkGH)
diff --git a/Carpet/CarpetReduce/src/reduce.cc b/Carpet/CarpetReduce/src/reduce.cc
index 8bd4b12c0..adea92d03 100644
--- a/Carpet/CarpetReduce/src/reduce.cc
+++ b/Carpet/CarpetReduce/src/reduce.cc
@@ -512,7 +512,7 @@ namespace CarpetReduce {
 	}					\
 	break;					\
       }
-#include "Carpet/Carpet/src/typecase"
+#include "carpet_typecase.hh"
 #undef TYPECASE
 #undef INITIALISE
       default:
@@ -566,7 +566,7 @@ namespace CarpetReduce {
           COPY(T);                              \
           break;                                \
         }
-#include "Carpet/Carpet/src/typecase"
+#include "carpet_typecase.hh"
 #undef TYPECASE
 #undef COPY
         default:
@@ -658,7 +658,7 @@ namespace CarpetReduce {
 	}					\
 	break;					\
       }
-#include "Carpet/Carpet/src/typecase"
+#include "carpet_typecase.hh"
 #undef TYPECASE
 #undef REDUCE
       default:
@@ -751,7 +751,7 @@ namespace CarpetReduce {
 	  }					\
 	  break;				\
 	}
-#include "Carpet/Carpet/src/typecase"
+#include "carpet_typecase.hh"
 #undef TYPECASE
 #undef FINALISE
 	default: