From e4ec6f983904e0652cb9c36d18419eb9c917a0d2 Mon Sep 17 00:00:00 2001 From: schnetter <> Date: Tue, 7 Jan 2003 21:17:00 +0000 Subject: typecase, instantiate: Added CCTK_INT1 where missing. typecase, instantiate: Added CCTK_INT1 where missing. SetupGH.cc: Protected CCTK_VARIABLE_* with appropriate #ifdefs. darcs-hash:20030107211732-07bb3-e6c9ad34472bcb58987543563e49dec85ba52115.gz --- Carpet/Carpet/src/SetupGH.cc | 22 +++++++++++++++++++++- Carpet/Carpet/src/typecase | 15 +++++++++++++-- Carpet/CarpetLib/src/instantiate | 6 +++--- 3 files changed, 37 insertions(+), 6 deletions(-) (limited to 'Carpet') diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc index f50f0e3fb..2f7f6c2df 100644 --- a/Carpet/Carpet/src/SetupGH.cc +++ b/Carpet/Carpet/src/SetupGH.cc @@ -19,7 +19,7 @@ #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.36 2003/01/03 15:49:36 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.37 2003/01/07 22:17:32 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_SetupGH_cc); } @@ -77,23 +77,43 @@ namespace Carpet { } switch (type1) { +#ifdef CCTK_REAL8 case CCTK_VARIABLE_REAL8: // This type is supported. return true; +#endif +#ifdef CCTK_REAL4 case CCTK_VARIABLE_REAL4: +#endif +#ifdef CCTK_REAL16 case CCTK_VARIABLE_REAL16: +#endif +#ifdef CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: +#endif +#ifdef CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: +#endif +#ifdef CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: +#endif // This type is not supported, but could be. return false; case CCTK_VARIABLE_BYTE: +#ifdef CCTK_INT1 case CCTK_VARIABLE_INT1: +#endif +#ifdef CCTK_INT2 case CCTK_VARIABLE_INT2: +#endif +#ifdef CCTK_INT4 case CCTK_VARIABLE_INT4: +#endif +#ifdef CCTK_INT8 case CCTK_VARIABLE_INT8: +#endif // This type is not supported, and cannot be. return false; diff --git a/Carpet/Carpet/src/typecase b/Carpet/Carpet/src/typecase index edd5cb4a4..f126af887 100644 --- a/Carpet/Carpet/src/typecase +++ b/Carpet/Carpet/src/typecase @@ -1,7 +1,7 @@ // Instantiate type cases for all available types -*-C++-*- // (C) 2001 Erik Schnetter -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/typecase,v 1.4 2002/01/04 18:21:57 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/typecase,v 1.5 2003/01/07 22:17:32 schnetter Exp $ // Usage: // Define the macro TYPECASE(N,T) to be a typecase for the type T with name N, @@ -24,9 +24,11 @@ #endif #ifdef CARPET_ALL_INT +# undef CARPET_INT1 # undef CARPET_INT2 # undef CARPET_INT4 # undef CARPET_INT8 +# define CARPET_INT1 # define CARPET_INT2 # define CARPET_INT4 # define CARPET_INT8 @@ -59,6 +61,10 @@ #endif #ifdef CARPET_INT +# ifdef CCTK_INTEGER_PRECISION_1 +# undef CARPET_INT1 +# define CARPET_INT1 +# endif # ifdef CCTK_INTEGER_PRECISION_2 # undef CARPET_INT2 # define CARPET_INT2 @@ -104,7 +110,7 @@ // // Check -// #if !defined(CARPET_BYTE) && !defined(CARPET_INT2) && !defined(CARPET_INT4) && !defined(CARPET_INT8) && !defined(CARPET_REAL4) && !defined(CARPET_REAL8) && !defined(CARPET_REAL16) && !defined(CARPET_COMPLEX8) && !defined(CARPET_COMPLEX16) && !defined(CARPET_COMPLEX32) +// #if !defined(CARPET_BYTE) && !defined(CARPET_INT1) && !defined(CARPET_INT2) && !defined(CARPET_INT4) && !defined(CARPET_INT8) && !defined(CARPET_REAL4) && !defined(CARPET_REAL8) && !defined(CARPET_REAL16) && !defined(CARPET_COMPLEX8) && !defined(CARPET_COMPLEX16) && !defined(CARPET_COMPLEX32) // # error "You have not defined which grid function types to instantiate." // #endif @@ -119,6 +125,11 @@ TYPECASE(CCTK_VARIABLE_BYTE, CCTK_BYTE) #ifdef CARPET_INT TYPECASE(CCTK_VARIABLE_INT, CCTK_INT) #endif +#ifdef CARPET_INT1 +# ifdef CCTK_INT1 +TYPECASE(CCTK_VARIABLE_INT1, CCTK_INT1) +# endif +#endif #ifdef CARPET_INT2 # ifdef CCTK_INT2 TYPECASE(CCTK_VARIABLE_INT2, CCTK_INT2) diff --git a/Carpet/CarpetLib/src/instantiate b/Carpet/CarpetLib/src/instantiate index c3d24d53f..4199e0e91 100644 --- a/Carpet/CarpetLib/src/instantiate +++ b/Carpet/CarpetLib/src/instantiate @@ -1,7 +1,7 @@ // Instantiate templates for all available types -*-C++-*- // (C) 2001 Erik Schnetter -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/instantiate,v 1.5 2003/01/03 15:49:36 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/instantiate,v 1.6 2003/01/07 22:17:32 schnetter Exp $ // Usage: // Define the macro INSTANTIATE(T) to instantiate for the type T, @@ -56,7 +56,7 @@ # define CARPET_COMPLEX32 #endif -#if !defined(CARPET_BYTE) && !defined(CARPET_INT2) && !defined(CARPET_INT4) && !defined(CARPET_INT8) && !defined(CARPET_REAL4) && !defined(CARPET_REAL8) && !defined(CARPET_REAL16) && !defined(CARPET_COMPLEX8) && !defined(CARPET_COMPLEX16) && !defined(CARPET_COMPLEX32) +#if !defined(CARPET_BYTE) && !defined(CARPET_INT1) && !defined(CARPET_INT2) && !defined(CARPET_INT4) && !defined(CARPET_INT8) && !defined(CARPET_REAL4) && !defined(CARPET_REAL8) && !defined(CARPET_REAL16) && !defined(CARPET_COMPLEX8) && !defined(CARPET_COMPLEX16) && !defined(CARPET_COMPLEX32) // Assume the user just wants INT and REAL # undef CARPET_INT # define CARPET_INT @@ -114,7 +114,7 @@ // // Check -// #if !defined(CARPET_BYTE) && !defined(CARPET_INT2) && !defined(CARPET_INT4) && !defined(CARPET_INT8) && !defined(CARPET_REAL4) && !defined(CARPET_REAL8) && !defined(CARPET_REAL16) && !defined(CARPET_COMPLEX8) && !defined(CARPET_COMPLEX16) && !defined(CARPET_COMPLEX32) +// #if !defined(CARPET_BYTE) && !defined(CARPET_INT1) && !defined(CARPET_INT2) && !defined(CARPET_INT4) && !defined(CARPET_INT8) && !defined(CARPET_REAL4) && !defined(CARPET_REAL8) && !defined(CARPET_REAL16) && !defined(CARPET_COMPLEX8) && !defined(CARPET_COMPLEX16) && !defined(CARPET_COMPLEX32) // # error "You have not defined which grid function types to instantiate." // #endif -- cgit v1.2.3