diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/cctk_Complex.h | 110 | ||||
| -rw-r--r-- | src/include/cctk_Types.h | 52 |
2 files changed, 45 insertions, 117 deletions
diff --git a/src/include/cctk_Complex.h b/src/include/cctk_Complex.h index 977896d3..96eaf17f 100644 --- a/src/include/cctk_Complex.h +++ b/src/include/cctk_Complex.h @@ -12,92 +12,32 @@ #define _CCTK_COMPLEX_H_ #ifdef __cplusplus -# define EXTERN_C_BEGIN extern "C" { -# define EXTERN_C_END } -#else -# define EXTERN_C_BEGIN -# define EXTERN_C_END -#endif - - -#ifndef DEFINE_CCTK_COMPLEX_EXTERN_FUNCTIONS -# define PREFIX static inline -#else -# define PREFIX -#endif - - -#ifdef __cplusplus - /* declare C++ overloaded operators */ -# include <complex> -# include <ostream> -# define DECLARE_CMPLX_CXX_OPERATORS(CCTK_Cmplx, cctk_real, cctk_complex) \ -PREFIX cctk_complex operator+ (cctk_complex const & a); \ -PREFIX cctk_complex operator- (cctk_complex const & a); \ -PREFIX cctk_complex conj (cctk_complex const & a); \ -PREFIX cctk_real abs (cctk_complex const & a); \ -PREFIX cctk_real arg (cctk_complex const & a); \ -PREFIX cctk_real norm (cctk_complex const & a); \ -PREFIX cctk_complex operator+ (cctk_complex const & a, cctk_complex const & b); \ -PREFIX cctk_complex operator+ (cctk_real const & a, cctk_complex const & b); \ -PREFIX cctk_complex operator+ (cctk_complex const & a, cctk_real const & b); \ -PREFIX cctk_complex operator- (cctk_complex const & a, cctk_complex const & b); \ -PREFIX cctk_complex operator- (cctk_real const & a, cctk_complex const & b); \ -PREFIX cctk_complex operator- (cctk_complex const & a, cctk_real const & b); \ -PREFIX cctk_complex operator* (cctk_complex const & a, cctk_complex const & b); \ -PREFIX cctk_complex operator* (cctk_real const & a, cctk_complex const & b); \ -PREFIX cctk_complex operator* (cctk_complex const & a, cctk_real const & b); \ -PREFIX cctk_complex operator/ (cctk_complex const & a, cctk_complex const & b); \ -PREFIX cctk_complex operator/ (cctk_real const & a, cctk_complex const & b); \ -PREFIX cctk_complex operator/ (cctk_complex const & a, cctk_real const & b); \ -PREFIX cctk_complex operator+= (cctk_complex & a, cctk_complex const & b); \ -PREFIX cctk_complex operator+= (cctk_complex & a, cctk_real const & b); \ -PREFIX cctk_complex operator-= (cctk_complex & a, cctk_complex const & b); \ -PREFIX cctk_complex operator-= (cctk_complex & a, cctk_real const & b); \ -PREFIX cctk_complex operator*= (cctk_complex & a, cctk_complex const & b); \ -PREFIX cctk_complex operator*= (cctk_complex & a, cctk_real const & b); \ -PREFIX cctk_complex operator/= (cctk_complex & a, cctk_complex const & b); \ -PREFIX cctk_complex operator/= (cctk_complex & a, cctk_real const & b); \ -PREFIX cctk_complex pow (cctk_complex const & a, int i); \ -PREFIX cctk_complex pow (cctk_complex const & a, cctk_real const & r); \ -PREFIX cctk_complex pow (cctk_complex const & a, cctk_complex const & b); \ -PREFIX cctk_complex sin (cctk_complex const & a); \ -PREFIX cctk_complex cos (cctk_complex const & a); \ -PREFIX cctk_complex exp (cctk_complex const & a); \ -PREFIX cctk_complex log (cctk_complex const & a); \ -PREFIX cctk_complex sqrt (cctk_complex const & a); \ -PREFIX std::ostream & operator << (std::ostream & os, cctk_complex const & a); -#else - /* declare no C++ overloaded operators */ -# define DECLARE_CMPLX_CXX_OPERATORS(CCTK_Cmplx, cctk_real, cctk_complex) +extern "C" { #endif /* macro to declare a set of complex functions for a given precision */ #define DECLARE_CMPLX_FUNCTIONS(CCTK_Cmplx, cctk_real, cctk_complex) \ -EXTERN_C_BEGIN \ -PREFIX cctk_complex CCTK_Cmplx (cctk_real Re, cctk_real Im); \ -PREFIX cctk_real CCTK_Cmplx##Real (cctk_complex a); \ -PREFIX cctk_real CCTK_Cmplx##Imag (cctk_complex a); \ -PREFIX cctk_complex CCTK_Cmplx##Neg (cctk_complex a); \ -PREFIX cctk_complex CCTK_Cmplx##Conjg (cctk_complex a); \ -PREFIX cctk_real CCTK_Cmplx##Abs (cctk_complex a); \ -PREFIX cctk_real CCTK_Cmplx##Arg (cctk_complex a); \ -PREFIX cctk_real CCTK_Cmplx##Norm (cctk_complex a); \ -PREFIX cctk_complex CCTK_Cmplx##Add (cctk_complex a, cctk_complex b); \ -PREFIX cctk_complex CCTK_Cmplx##Sub (cctk_complex a, cctk_complex b); \ -PREFIX cctk_complex CCTK_Cmplx##Mul (cctk_complex a, cctk_complex b); \ -PREFIX cctk_complex CCTK_Cmplx##Div (cctk_complex a, cctk_complex b); \ -PREFIX cctk_complex CCTK_Cmplx##CPow (cctk_complex a, cctk_complex b); \ -PREFIX cctk_complex CCTK_Cmplx##Sin (cctk_complex a); \ -PREFIX cctk_complex CCTK_Cmplx##Cos (cctk_complex a); \ -PREFIX cctk_complex CCTK_Cmplx##Exp (cctk_complex a); \ -PREFIX cctk_complex CCTK_Cmplx##Log (cctk_complex a); \ -PREFIX cctk_complex CCTK_Cmplx##Sqrt (cctk_complex a); \ -PREFIX cctk_complex CCTK_Cmplx##Pow (cctk_complex a, cctk_real b); \ -PREFIX cctk_complex CCTK_Cmplx##IPow (cctk_complex a, int b); \ -EXTERN_C_END \ -DECLARE_CMPLX_CXX_OPERATORS(CCTK_Cmplx, cctk_real, cctk_complex) +cctk_complex CCTK_Cmplx (cctk_real Re, cctk_real Im); \ +cctk_real CCTK_Cmplx##Real (cctk_complex a); \ +cctk_real CCTK_Cmplx##Imag (cctk_complex a); \ +cctk_complex CCTK_Cmplx##Neg (cctk_complex a); \ +cctk_complex CCTK_Cmplx##Conjg (cctk_complex a); \ +cctk_real CCTK_Cmplx##Abs (cctk_complex a); \ +cctk_real CCTK_Cmplx##Arg (cctk_complex a); \ +cctk_real CCTK_Cmplx##Norm (cctk_complex a); \ +cctk_complex CCTK_Cmplx##Add (cctk_complex a, cctk_complex b); \ +cctk_complex CCTK_Cmplx##Sub (cctk_complex a, cctk_complex b); \ +cctk_complex CCTK_Cmplx##Mul (cctk_complex a, cctk_complex b); \ +cctk_complex CCTK_Cmplx##Div (cctk_complex a, cctk_complex b); \ +cctk_complex CCTK_Cmplx##CPow (cctk_complex a, cctk_complex b); \ +cctk_complex CCTK_Cmplx##Sin (cctk_complex a); \ +cctk_complex CCTK_Cmplx##Cos (cctk_complex a); \ +cctk_complex CCTK_Cmplx##Exp (cctk_complex a); \ +cctk_complex CCTK_Cmplx##Log (cctk_complex a); \ +cctk_complex CCTK_Cmplx##Sqrt (cctk_complex a); \ +cctk_complex CCTK_Cmplx##Pow (cctk_complex a, cctk_real b); \ +cctk_complex CCTK_Cmplx##IPow (cctk_complex a, int b); /* declare complex functions for all available precisions */ @@ -113,8 +53,6 @@ DECLARE_CMPLX_FUNCTIONS (CCTK_Cmplx16, CCTK_REAL8, CCTK_COMPLEX16) DECLARE_CMPLX_FUNCTIONS (CCTK_Cmplx32, CCTK_REAL16, CCTK_COMPLEX32) #endif -#undef PREFIX - /* declare the default precision complex functions as #define'd macros */ #ifdef CCTK_REAL_PRECISION_4 @@ -182,10 +120,8 @@ DECLARE_CMPLX_FUNCTIONS (CCTK_Cmplx32, CCTK_REAL16, CCTK_COMPLEX32) #define CCTK_CmplxIPow CCTK_Cmplx32IPow #endif -#ifndef DEFINE_CCTK_COMPLEX_EXTERN_FUNCTIONS -# define DEFINE_CCTK_COMPLEX_INLINE_FUNCTIONS -# include "../main/Complex.c" -# undef DEFINE_CCTK_COMPLEX_INLINE_FUNCTIONS +#ifdef __cplusplus +} #endif #endif /* _CCTK_COMPLEX_H_ */ diff --git a/src/include/cctk_Types.h b/src/include/cctk_Types.h index e3fb55a6..eeda7d77 100644 --- a/src/include/cctk_Types.h +++ b/src/include/cctk_Types.h @@ -34,45 +34,37 @@ typedef const char * CCTK_STRING; #define HAVE_CCTK_CHAR 1 #define HAVE_CCTK_STRING 1 -/* Structures for complex types */ +/* Declarations for complex types */ -#ifdef HAVE_CCTK_REAL16 -#define HAVE_CCTK_COMPLEX32 1 -typedef struct CCTK_COMPLEX32 -{ - CCTK_REAL16 Re; - CCTK_REAL16 Im; #ifdef __cplusplus - CCTK_REAL16 real() const { return Re; } - CCTK_REAL16 imag() const { return Im; } +# include <complex> #endif -} CCTK_COMPLEX32; + +#ifdef HAVE_CCTK_REAL16 +# define HAVE_CCTK_COMPLEX32 1 +# ifdef __cplusplus +typedef std::complex<CCTK_REAL16> CCTK_COMPLEX32; +# else +typedef long double _Complex CCTK_COMPLEX32; +# endif #endif #ifdef HAVE_CCTK_REAL8 #define HAVE_CCTK_COMPLEX16 1 -typedef struct CCTK_COMPLEX16 -{ - CCTK_REAL8 Re; - CCTK_REAL8 Im; -#ifdef __cplusplus - CCTK_REAL8 real() const { return Re; } - CCTK_REAL8 imag() const { return Im; } -#endif -} CCTK_COMPLEX16; +# ifdef __cplusplus +typedef std::complex<CCTK_REAL8> CCTK_COMPLEX16; +# else +typedef double _Complex CCTK_COMPLEX16; +# endif #endif #ifdef HAVE_CCTK_REAL4 -#define HAVE_CCTK_COMPLEX8 1 -typedef struct CCTK_COMPLEX8 -{ - CCTK_REAL4 Re; - CCTK_REAL4 Im; -#ifdef __cplusplus - CCTK_REAL4 real() const { return Re; } - CCTK_REAL4 imag() const { return Im; } -#endif -} CCTK_COMPLEX8; +# define HAVE_CCTK_COMPLEX8 1 +# ifdef __cplusplus +typedef std::complex<CCTK_REAL4> CCTK_COMPLEX8; +# else +typedef float _Complex CCTK_COMPLEX8; +# endif #endif /* Small positive integer type */ @@ -262,7 +254,7 @@ typedef unsigned char CCTK_BYTE; /* We have __attribute__((unused)), so use it */ #define CCTK_DECLARE_INIT(typ,nam,val) \ - typ nam __attribute__((unused)) = (val); + typ nam CCTK_ATTRIBUTE_UNUSED = (val); #else |