diff options
Diffstat (limited to 'Carpet/CarpetIOBasic')
| -rw-r--r-- | Carpet/CarpetIOBasic/interface.ccl | 3 | ||||
| -rw-r--r-- | Carpet/CarpetIOBasic/src/iobasic.cc | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Carpet/CarpetIOBasic/interface.ccl b/Carpet/CarpetIOBasic/interface.ccl index d55a84b38..8e1c7a72e 100644 --- a/Carpet/CarpetIOBasic/interface.ccl +++ b/Carpet/CarpetIOBasic/interface.ccl @@ -9,5 +9,6 @@ CCTK_REAL last_output_time TYPE=scalar CCTK_INT this_iteration TYPE=scalar USES INCLUDE HEADER: carpet.hh -USES INCLUDE HEADER: carpet_typecase.hh +USES INCLUDE HEADER: typecase.hh +USES INCLUDE HEADER: typeprops.hh USES INCLUDE HEADER: CarpetTimers.hh diff --git a/Carpet/CarpetIOBasic/src/iobasic.cc b/Carpet/CarpetIOBasic/src/iobasic.cc index 154793c66..8dd73614d 100644 --- a/Carpet/CarpetIOBasic/src/iobasic.cc +++ b/Carpet/CarpetIOBasic/src/iobasic.cc @@ -23,6 +23,8 @@ #include "carpet.hh" #include "CarpetTimers.hh" +#include "typeprops.hh" + using namespace CarpetLib; @@ -409,7 +411,7 @@ namespace CarpetIOBasic { void const * const vardataptr = CCTK_VarDataPtrI (cctkGH, 0, n); assert (vardataptr); - switch (vartype) { + switch (specific_cactus_type(vartype)) { #define TYPECASE(N,T) \ case N: \ { \ @@ -424,7 +426,7 @@ namespace CarpetIOBasic { cout << val; \ } \ break; -#include "carpet_typecase.hh" +#include "typecase.hh" #undef TYPECASE default: UnsupportedVarType (n); @@ -444,7 +446,7 @@ namespace CarpetIOBasic { union { #define TYPECASE(N,T) T var_##T; -#include "carpet_typecase.hh" +#include "typecase.hh" #undef TYPECASE } result; @@ -456,7 +458,7 @@ namespace CarpetIOBasic { cout << " " << setw(width); - switch (vartype) { + switch (specific_cactus_type(vartype)) { #define TYPECASE(N,T) \ case N: \ { \ @@ -471,7 +473,7 @@ namespace CarpetIOBasic { cout << val; \ } \ break; -#include "carpet_typecase.hh" +#include "typecase.hh" #undef TYPECASE default: UnsupportedVarType (n); |