From 3b52b3721d634461b2d3840db16735b78a4a8cad Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sat, 13 Feb 2010 18:33:30 -0600 Subject: Combine CarpetLib's INSTANTIATE and Carpet's TYPECASE mechanism into a single mechanism provided by CarpetLib. Use this mechanism everywhere. --- Carpet/CarpetIOScalar/interface.ccl | 3 ++- Carpet/CarpetIOScalar/src/ioscalar.cc | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'Carpet/CarpetIOScalar') diff --git a/Carpet/CarpetIOScalar/interface.ccl b/Carpet/CarpetIOScalar/interface.ccl index 1febe145c..8fe7a4359 100644 --- a/Carpet/CarpetIOScalar/interface.ccl +++ b/Carpet/CarpetIOScalar/interface.ccl @@ -7,7 +7,8 @@ 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 # function to check whether existing output files should be truncated or not diff --git a/Carpet/CarpetIOScalar/src/ioscalar.cc b/Carpet/CarpetIOScalar/src/ioscalar.cc index 02f975d6a..382330d60 100644 --- a/Carpet/CarpetIOScalar/src/ioscalar.cc +++ b/Carpet/CarpetIOScalar/src/ioscalar.cc @@ -21,6 +21,8 @@ #include "carpet.hh" #include "CarpetTimers.hh" +#include "typeprops.hh" + // That's a hack @@ -397,7 +399,7 @@ namespace CarpetIOScalar { union { #define TYPECASE(N,T) T var_##T; -#include "carpet_typecase.hh" +#include "typecase.hh" #undef TYPECASE } result; @@ -422,12 +424,12 @@ namespace CarpetIOScalar { if (CCTK_MyProc(cctkGH)==0) { file << " "; - switch (vartype) { + switch (specific_cactus_type(vartype)) { #define TYPECASE(N,T) \ case N: \ file << result.var_##T; \ break; -#include "carpet_typecase.hh" +#include "typecase.hh" #undef TYPECASE default: UnsupportedVarType (n); -- cgit v1.2.3