12 files changed, 11 insertions, 44 deletions
diff --git a/src/patch/coords.cc b/src/patch/coords.cc
index d152b57..d906345 100644
--- a/src/patch/coords.cc
+++ b/src/patch/coords.cc
@@ -21,7 +21,7 @@
 #include "jt/stdc.h"
 #include "jt/util.hh"
 
-#include "fp.hh"
+#include "../config.hh"
 #include "coords.hh"
 
 using jtutil::error_exit;
diff --git a/src/patch/fd_grid.cc b/src/patch/fd_grid.cc
index 4bb9480..10ac5b5 100644
--- a/src/patch/fd_grid.cc
+++ b/src/patch/fd_grid.cc
@@ -15,7 +15,7 @@
 #include "jt/linear_map.hh"
 using jtutil::error_exit;
 
-#include "fp.hh"
+#include "../config.hh"
 #include "coords.hh"
 #include "grid.hh"
 #include "fd_grid.hh"
diff --git a/src/patch/fp.hh b/src/patch/fp.hh
deleted file mode 100644
index 7a136ff..0000000
--- a/src/patch/fp.hh
+++ /dev/null
@@ -1,33 +0,0 @@
-// fp.hh -- set up floating point types
-// $Id$
-
-#ifdef CCTK_VARIABLE_REAL
-   // CCTK_REAL is defined
-   typedef CCTK_REAL fp;
-#else
-   // we must be doing a test compilation outside of Cactus
-   // FIXME: this is just a hack until my Cactus problem report #725
-   //	     is acted on and Cactus defines these
-   #define CCTK_REAL_CTYPE_FLOAT	4
-   #define CCTK_REAL_CTYPE_DOUBLE	8
-   #define CCTK_REAL_CTYPE_LONG_DOUBLE	16
-
-   typedef double fp;
-   #define CCTK_REAL_CTYPE	CCTK_REAL_CTYPE_DOUBLE
-#endif
-
-// scanf(3) formats for reading fp values
-#if   (CCTK_REAL_CTYPE == CCTK_REAL_CTYPE_FLOAT)
-  #define FP_SCANF_FORMAT "%f"
-#elif (CCTK_REAL_CTYPE == CCTK_REAL_CTYPE_DOUBLE)
-  #define FP_SCANF_FORMAT "%lf"
-#else
-  #error "don't know scanf(3) format for this CCTK_REAL!"
-#endif
-
-// FIXME: another hack
-#ifdef FINITE_DIFF_ORDER
-  // someone (probably a Makefile) has already defined this ==> leave it alone
-#else
-  #define FINITE_DIFF_ORDER	2
-#endif
diff --git a/src/patch/ghost_zone.cc b/src/patch/ghost_zone.cc
index 894a8a5..d686460 100644
--- a/src/patch/ghost_zone.cc
+++ b/src/patch/ghost_zone.cc
@@ -31,7 +31,7 @@
 #include "jt/linear_map.hh"
 using jtutil::error_exit;
 
-#include "fp.hh"
+#include "../config.hh"
 #include "coords.hh"
 #include "grid.hh"
 #include "fd_grid.hh"
diff --git a/src/patch/grid.cc b/src/patch/grid.cc
index 8812ab1..0e96b78 100644
--- a/src/patch/grid.cc
+++ b/src/patch/grid.cc
@@ -17,7 +17,7 @@
 #include "jt/array.hh"
 #include "jt/linear_map.hh"
 
-#include "fp.hh"
+#include "../config.hh"
 #include "coords.hh"
 #include "grid.hh"
 
diff --git a/src/patch/patch.cc b/src/patch/patch.cc
index 58df4bb..a56a6e3 100644
--- a/src/patch/patch.cc
+++ b/src/patch/patch.cc
@@ -40,7 +40,7 @@ using std::printf;
 #include "jt/linear_map.hh"
 using jtutil::error_exit;
 
-#include "fp.hh"
+#include "../config.hh"
 #include "coords.hh"
 #include "grid.hh"
 #include "fd_grid.hh"
diff --git a/src/patch/patch.hh b/src/patch/patch.hh
index de084f4..7bfdc37 100644
--- a/src/patch/patch.hh
+++ b/src/patch/patch.hh
@@ -18,7 +18,7 @@
 //	"jt/util.hh"
 //	"jt/array.hh"
 //	"jt/linear_map.hh"
-//	"fp.hh"
+//	"../config.hh"
 //	"coords.hh"
 //	"grid.hh"
 //	"fd_grid.hh"
diff --git a/src/patch/patch_interp.cc b/src/patch/patch_interp.cc
index ce3efc0..91af04e 100644
--- a/src/patch/patch_interp.cc
+++ b/src/patch/patch_interp.cc
@@ -22,7 +22,7 @@
 #include "jt/linear_map.hh"
 using jtutil::error_exit;
 
-#include "fp.hh"
+#include "../config.hh"
 #include "coords.hh"
 #include "grid.hh"
 #include "fd_grid.hh"
diff --git a/src/patch/patch_system.cc b/src/patch/patch_system.cc
index ea85344..f61cdde 100644
--- a/src/patch/patch_system.cc
+++ b/src/patch/patch_system.cc
@@ -43,7 +43,7 @@ using std::strcmp;
 #include "jt/linear_map.hh"
 using jtutil::error_exit;
 
-#include "fp.hh"
+#include "../config.hh"
 #include "coords.hh"
 #include "grid.hh"
 #include "fd_grid.hh"
diff --git a/src/patch/test_coords.cc b/src/patch/test_coords.cc
index 109a29e..4f0f117 100644
--- a/src/patch/test_coords.cc
+++ b/src/patch/test_coords.cc
@@ -9,7 +9,7 @@
 #include "jt/stdc.h"
 #include "jt/util.hh"
 
-#include "fp.hh"
+#include "../config.hh"
 #include "coords.hh"
 
 using jtutil::error_exit;
diff --git a/src/patch/test_coords2.cc b/src/patch/test_coords2.cc
index 770e497..3dbde2e 100644
--- a/src/patch/test_coords2.cc
+++ b/src/patch/test_coords2.cc
@@ -9,7 +9,7 @@
 #include "jt/stdc.h"
 #include "jt/util.hh"
 
-#include "fp.hh"
+#include "../config.hh"
 #include "coords.hh"
 
 using jtutil::fuzzy;
diff --git a/src/patch/test_patch_system.cc b/src/patch/test_patch_system.cc
index 1e03543..5c1cfe8 100644
--- a/src/patch/test_patch_system.cc
+++ b/src/patch/test_patch_system.cc
@@ -40,7 +40,7 @@
 #include "jt/linear_map.hh"
 using jtutil::error_exit;
 
-#include "fp.hh"
+#include "../config.hh"
 #include "coords.hh"
 #include "grid.hh"
 #include "fd_grid.hh"