aboutsummaryrefslogtreecommitdiff
path: root/Carpet/Carpet
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2012-10-22 18:15:40 -0400
committerErik Schnetter <schnetter@gmail.com>2012-10-22 18:15:40 -0400
commit21272f1bfc64124794e1e02853fb8cca0a473b11 (patch)
treee97e6e5509e3c3dbdfed5f398b7c933b89cef741 /Carpet/Carpet
parent5453a4f9e40a7d9b30bd4b750807fb4605271af7 (diff)
Carpet: Correct #ifdefs in CarpetSimpleMPIDatatypeLength
Diffstat (limited to 'Carpet/Carpet')
-rw-r--r--Carpet/Carpet/src/helpers.cc14
1 files changed, 3 insertions, 11 deletions
diff --git a/Carpet/Carpet/src/helpers.cc b/Carpet/Carpet/src/helpers.cc
index 52e943d0e..3b5ebb292 100644
--- a/Carpet/Carpet/src/helpers.cc
+++ b/Carpet/Carpet/src/helpers.cc
@@ -379,23 +379,15 @@ namespace Carpet {
int CarpetSimpleMPIDatatypeLength (const int vartype)
{
switch (vartype) {
-#ifdef CARPET_COMPLEX
case CCTK_VARIABLE_COMPLEX:
-#endif
-#ifdef CARPET_COMPLEX8
-# ifdef HAVE_CCTK_COMPLEX8
+#ifdef HAVE_CCTK_COMPLEX8
case CCTK_VARIABLE_COMPLEX8:
-# endif
#endif
-#ifdef CARPET_COMPLEX16
-# ifdef HAVE_CCTK_COMPLEX16
+#ifdef HAVE_CCTK_COMPLEX16
case CCTK_VARIABLE_COMPLEX16:
-# endif
#endif
-#ifdef CARPET_COMPLEX32
-# ifdef HAVE_CCTK_COMPLEX32
+#ifdef HAVE_CCTK_COMPLEX32
case CCTK_VARIABLE_COMPLEX32:
-# endif
#endif
return 2;
default: