diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2011-05-08 21:32:24 -0400 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 18:26:17 +0000 |
| commit | c72038c206479a0c004fde747500d41811d7d40a (patch) | |
| tree | c3293141dbc02dd95bb9f8a9fec25e256bf4ade8 | |
| parent | 80b6b0aade632755ae0b0a8435b48ac0852a2c62 (diff) | |
CarpetLib: Do not instantiate CCTK_INT prolongation operators
| -rw-r--r-- | Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc | 1 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc | 2 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_cc_rf2.cc | 1 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_o5_monotone_rf2.cc | 2 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_rf2.cc | 3 |
5 files changed, 3 insertions, 6 deletions
diff --git a/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc b/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc index 8682eb1a0..ca667fc6c 100644 --- a/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc +++ b/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc @@ -279,7 +279,6 @@ namespace CarpetLib { ibbox3 const & restrict regbbox); #define CARPET_NO_COMPLEX #include "typecase.hh" -#undef CARPET_NO_COMPLEX #undef TYPECASE diff --git a/Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc index cec6be4a2..b32d24969 100644 --- a/Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc +++ b/Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc @@ -228,8 +228,8 @@ namespace CarpetLib { #define CARPET_NO_COMPLEX +#define CARPET_NO_INT #include "typecase.hh" -#undef CARPET_NO_COMPLEX #undef TYPECASE } // namespace coeffs_3d_cc_rf2_eno diff --git a/Carpet/CarpetLib/src/prolongate_3d_cc_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_cc_rf2.cc index b16f68e62..c24704298 100644 --- a/Carpet/CarpetLib/src/prolongate_3d_cc_rf2.cc +++ b/Carpet/CarpetLib/src/prolongate_3d_cc_rf2.cc @@ -178,7 +178,6 @@ namespace CarpetLib { #define CARPET_NO_COMPLEX #include "typecase.hh" -#undef CARPET_NO_COMPLEX #undef TYPECASE } // namespace coeffs_3d_cc_rf2 diff --git a/Carpet/CarpetLib/src/prolongate_3d_o5_monotone_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_o5_monotone_rf2.cc index b6c9b8d90..8a3515e70 100644 --- a/Carpet/CarpetLib/src/prolongate_3d_o5_monotone_rf2.cc +++ b/Carpet/CarpetLib/src/prolongate_3d_o5_monotone_rf2.cc @@ -831,8 +831,8 @@ namespace CarpetLib { ibbox3 const & restrict dstbbox, \ ibbox3 const & restrict regbbox); #define CARPET_NO_COMPLEX +#define CARPET_NO_INT #include "typecase.hh" -#undef CARPET_NO_COMPLEX #undef TYPECASE template <> diff --git a/Carpet/CarpetLib/src/prolongate_3d_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_rf2.cc index fb85a9503..3f92b46e7 100644 --- a/Carpet/CarpetLib/src/prolongate_3d_rf2.cc +++ b/Carpet/CarpetLib/src/prolongate_3d_rf2.cc @@ -172,7 +172,6 @@ namespace CarpetLib { #define CARPET_NO_COMPLEX #include "typecase.hh" -#undef CARPET_NO_COMPLEX #undef TYPECASE @@ -190,8 +189,8 @@ namespace CarpetLib { coeffs1d<RT,9>::test(); \ coeffs1d<RT,11>::test(); #define CARPET_NO_COMPLEX +#define CARPET_NO_INT #include "typecase.hh" -#undef CARPET_NO_COMPLEX #undef TYPECASE } |