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/CarpetReduce | |
| 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/CarpetReduce')
| -rw-r--r-- | Carpet/CarpetReduce/interface.ccl | 3 | ||||
| -rw-r--r-- | Carpet/CarpetReduce/src/reduce.cc | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/Carpet/CarpetReduce/interface.ccl b/Carpet/CarpetReduce/interface.ccl index 467607cb5..98d9c3d86 100644 --- a/Carpet/CarpetReduce/interface.ccl +++ b/Carpet/CarpetReduce/interface.ccl @@ -8,7 +8,8 @@ uses include header: vect.hh uses include header: carpet.hh -uses include header: carpet_typecase.hh +uses include header: typecase.hh +uses include header: typeprops.hh uses include header: loopcontrol.h diff --git a/Carpet/CarpetReduce/src/reduce.cc b/Carpet/CarpetReduce/src/reduce.cc index b72c089f9..cebda71db 100644 --- a/Carpet/CarpetReduce/src/reduce.cc +++ b/Carpet/CarpetReduce/src/reduce.cc @@ -687,7 +687,7 @@ namespace CarpetReduce { for (int n=0; n<num_outvals; ++n) { - switch (outtype) { + switch (specific_cactus_type(outtype)) { #define INITIALISE(OP,S) \ case do_##OP: { \ typedef typeconv<S>::goodtype T; \ @@ -715,7 +715,7 @@ namespace CarpetReduce { } \ break; \ } -#include "carpet_typecase.hh" +#include "typecase.hh" #undef TYPECASE #undef INITIALISE default: @@ -757,7 +757,7 @@ namespace CarpetReduce { for (int m=0; m<num_inarrays; ++m) { for (int n=0; n<lsize; ++n) { - switch (outtype) { + switch (specific_cactus_type(outtype)) { #define COPY(S) \ { \ typedef typeconv<S>::goodtype T; \ @@ -769,7 +769,7 @@ namespace CarpetReduce { COPY(T); \ break; \ } -#include "carpet_typecase.hh" +#include "typecase.hh" #undef TYPECASE #undef COPY default: @@ -831,7 +831,7 @@ namespace CarpetReduce { myinarrays.at(tl) = inarrays.at(tl)[n]; } - switch (outtype) { + switch (specific_cactus_type(outtype)) { #define REDUCE(OP,S) \ case do_##OP: { \ typedef typeconv<S>::goodtype T; \ @@ -862,7 +862,7 @@ namespace CarpetReduce { } \ break; \ } -#include "carpet_typecase.hh" +#include "typecase.hh" #undef TYPECASE #undef REDUCE default: @@ -942,7 +942,7 @@ namespace CarpetReduce { for (int n=0; n<num_outvals; ++n) { - switch (outtype) { + switch (specific_cactus_type(outtype)) { #define FINALISE(OP,S) \ case do_##OP: { \ typedef typeconv<S>::goodtype T; \ @@ -970,7 +970,7 @@ namespace CarpetReduce { } \ break; \ } -#include "carpet_typecase.hh" +#include "typecase.hh" #undef TYPECASE #undef FINALISE default: |