diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-02-13 18:33:30 -0600 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 16:45:26 +0000 |
| commit | 3b52b3721d634461b2d3840db16735b78a4a8cad (patch) | |
| tree | bf192abc623573e7124f3810a7336d1f85fe3c54 /Carpet/CarpetInterp | |
| parent | 23a591ba88475bf0842257215f04c9f76a1c3fc4 (diff) | |
Combine CarpetLib's INSTANTIATE and Carpet's TYPECASE mechanism into a
single mechanism provided by CarpetLib.
Use this mechanism everywhere.
Diffstat (limited to 'Carpet/CarpetInterp')
| -rw-r--r-- | Carpet/CarpetInterp/interface.ccl | 2 | ||||
| -rw-r--r-- | Carpet/CarpetInterp/src/interp.cc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Carpet/CarpetInterp/interface.ccl b/Carpet/CarpetInterp/interface.ccl index 506f0a1db..85d5f38b0 100644 --- a/Carpet/CarpetInterp/interface.ccl +++ b/Carpet/CarpetInterp/interface.ccl @@ -9,6 +9,8 @@ uses include header: defs.hh uses include header: dist.hh uses include header: ggf.hh uses include header: timestat.hh +uses include header: typecase.hh +uses include header: typeprops.hh uses include header: vect.hh uses include header: carpet.hh diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc index d6e791261..936b7d5d6 100644 --- a/Carpet/CarpetInterp/src/interp.cc +++ b/Carpet/CarpetInterp/src/interp.cc @@ -21,6 +21,7 @@ #include "dist.hh" #include "ggf.hh" #include "timestat.hh" +#include "typeprops.hh" #include "vect.hh" #include "carpet.hh" @@ -701,10 +702,10 @@ namespace CarpetInterp { vector<char> tmp (N_interp_points * N_output_arrays * vtypesize); MPI_Datatype datatype; - switch (vtype) { + switch (specific_cactus_type(vtype)) { #define TYPECASE(N,T) \ case N: { T dummy; datatype = dist::mpi_datatype(dummy); break; } -#include "carpet_typecase.hh" +#include "typecase.hh" #undef TYPECASE default: { CCTK_WARN (0, "invalid datatype"); abort(); } } |