From 979f7df97edbedc5fb4c8cd7d7a04c7d970d51c1 Mon Sep 17 00:00:00 2001
From: Andreas Marek <amarek@rzg.mpg.de>
Date: Mon, 21 Aug 2017 21:11:03 +0200
Subject: [PATCH] Fix some preprocessor definitions
---
test/Fortran/test.F90 | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/test/Fortran/test.F90 b/test/Fortran/test.F90
index d279ce32..376559f3 100644
--- a/test/Fortran/test.F90
+++ b/test/Fortran/test.F90
@@ -274,26 +274,26 @@ program test
endif
#ifdef TEST_HERMITIAN_MULTIPLY
-#if REALCASE == 1
+#ifdef TEST_REAL
-#ifdef DOUBLE_PRECISION_REAL
- b(:,:) = 2.0_rk8 * a(:,:)
- c(:,:) = 0.0_rk8
+#ifdef TEST_DOUBLE
+ b(:,:) = 2.0_c_double * a(:,:)
+ c(:,:) = 0.0_c_double
#else
- b(:,:) = 2.0_rk4 * a(:,:)
- c(:,:) = 0.0_rk4
+ b(:,:) = 2.0_c_float * a(:,:)
+ c(:,:) = 0.0_c_float
#endif
#endif
-#if COMPLEXCASE == 1
+#ifdef TEST_COMPLEX
-#ifdef DOUBLE_PRECISION_COMPLEX
- b(:,:) = 2.0_ck8 * a(:,:)
- c(:,:) = 0.0_ck8
+#ifdef TEST_DOUBLE
+ b(:,:) = 2.0_c_double * a(:,:)
+ c(:,:) = (0.0_c_double, 0.0_c_double)
#else
- b(:,:) = 2.0_ck4 * a(:,:)
- c(:,:) = 0.0_ck4
+ b(:,:) = 2.0_c_float * a(:,:)
+ c(:,:) = (0.0_c_float, 0.0_c_float)
#endif
#endif
@@ -510,9 +510,9 @@ program test
allocate(tmp1(na_rows,na_cols))
allocate(tmp2(na_rows,na_cols))
#ifdef TEST_DOUBLE
- tmp1(:,:) = 0.0_ck8
+ tmp1(:,:) = (0.0_c_double, 0.0_c_double)
#else
- tmp1(:,:) = 0.0_ck4
+ tmp1(:,:) = (0.0_c_float, 0.0_c_float)
#endif
! tmp1 = a**T
#ifdef WITH_MPI
--
GitLab