summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorschnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac>2003-10-13 19:53:55 +0000
committerschnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac>2003-10-13 19:53:55 +0000
commit89d5839fc04508ce4870598629ef8147ed4c7273 (patch)
tree77d3b9f552528c07ea26375a8f631b9ebe417853 /src
parent72d874c3dc2d6c607c2f7c5feb894f2f61f34d6f (diff)
Include cctk_Faces.h automatically when "cctk.h" is included, for both
Fortran and C. Also fix a bug in cctk_Faces.h, which used the non-existing macro CCTK_INTEGER_PRECISION. git-svn-id: http://svn.cactuscode.org/flesh/trunk@3436 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src')
-rw-r--r--src/include/cctk.h5
-rw-r--r--src/include/cctk_Faces.h5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/include/cctk.h b/src/include/cctk.h
index f7642fb3..7181eba9 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -26,8 +26,10 @@
#ifdef FCODE
+#include "cctk_Faces.h"
+
#define CCTK_PRINTSEPARATOR\
- print *,"-----------------------------------------------------------"
+ print '("--------------------------------------------------------------------------------")'
#define _CCTK_FARGUMENTS cctk_dim, cctk_gsh, cctk_lsh, cctk_lbnd,\
cctk_ubnd, cctk_lssh, cctk_from, cctk_to, cctk_bbox,\
@@ -90,6 +92,7 @@
#include "cctk_Comm.h"
#include "cctk_CommandLine.h"
#include "cctk_Complex.h"
+#include "cctk_Faces.h"
#include "cctk_File.h"
#include "cctk_Flesh.h"
#include "cctk_FunctionAliases.h"
diff --git a/src/include/cctk_Faces.h b/src/include/cctk_Faces.h
index a9a3109d..f3ce4c2d 100644
--- a/src/include/cctk_Faces.h
+++ b/src/include/cctk_Faces.h
@@ -12,8 +12,11 @@
#ifndef _CCTK_FACES_H_
#define _CCTK_FACES_H_ 1
+/* Grab the main configuration info. */
+#include "cctk_Config.h"
+
/* The set of all faces */
-#if CCTK_INTEGER_PRECISION>=4
+#if defined(CCTK_INTEGER_PRECISION_4) || defined(CCTK_INTEGER_PRECISION_8)
#define CCTK_ALL_FACES 1073741823
/* (This is 2^30-1, so it will set the 'last' 30 bits to 1.)
* (The 'top' two bits are useless because there is no unsigned int in