Replace "double" declarations by "CCTK_REAL" declarations.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@66 b1d164ef-f17a-46e7-89d4-021c7118ef4e

41 files changed, 223 insertions, 226 deletions

diff --git a/src/macro/CDCDA_declare.h b/src/macro/CDCDA_declare.h
index a677b31..a232b94 100644
--- a/src/macro/CDCDA_declare.h
+++ b/src/macro/CDCDA_declare.h
@@ -45,12 +45,12 @@
 #ifdef CCODE
 
 /* Declare output variables */
-      double CDCDA_CDXXDA;
-      double CDCDA_CDXYDA;
-      double CDCDA_CDXZDA;
-      double CDCDA_CDYYDA;
-      double CDCDA_CDYZDA;
-      double CDCDA_CDZZDA;
+      CCTK_REAL CDCDA_CDXXDA;
+      CCTK_REAL CDCDA_CDXYDA;
+      CCTK_REAL CDCDA_CDXZDA;
+      CCTK_REAL CDCDA_CDYYDA;
+      CCTK_REAL CDCDA_CDYZDA;
+      CCTK_REAL CDCDA_CDZZDA;
 
 #endif
 
diff --git a/src/macro/CDXCDK_declare.h b/src/macro/CDXCDK_declare.h
index 82ef58e..4f3c105 100644
--- a/src/macro/CDXCDK_declare.h
+++ b/src/macro/CDXCDK_declare.h
@@ -86,12 +86,12 @@
 #define CDXCDK_CDXCDKZZ  cdxcdk_cdxcdkzz
 
 /* Declare output variables */
-double CDXCDK_CDXCDKXX;
-double CDXCDK_CDXCDKXY;
-double CDXCDK_CDXCDKXZ;
-double CDXCDK_CDXCDKYY;
-double CDXCDK_CDXCDKYZ;
-double CDXCDK_CDXCDKZZ;
+CCTK_REAL CDXCDK_CDXCDKXX;
+CCTK_REAL CDXCDK_CDXCDKXY;
+CCTK_REAL CDXCDK_CDXCDKXZ;
+CCTK_REAL CDXCDK_CDXCDKYY;
+CCTK_REAL CDXCDK_CDXCDKYZ;
+CCTK_REAL CDXCDK_CDXCDKZZ;
 
 #endif
 
diff --git a/src/macro/CDYCDK_declare.h b/src/macro/CDYCDK_declare.h
index 46b0148..91b0299 100644
--- a/src/macro/CDYCDK_declare.h
+++ b/src/macro/CDYCDK_declare.h
@@ -86,12 +86,12 @@
 #define CDYCDK_CDYCDKZZ  cdycdk_cdycdkzz
 
 /* Declare output variables */
-double CDYCDK_CDYCDKXX;
-double CDYCDK_CDYCDKXY;
-double CDYCDK_CDYCDKXZ;
-double CDYCDK_CDYCDKYY;
-double CDYCDK_CDYCDKYZ;
-double CDYCDK_CDYCDKZZ;
+CCTK_REAL CDYCDK_CDYCDKXX;
+CCTK_REAL CDYCDK_CDYCDKXY;
+CCTK_REAL CDYCDK_CDYCDKXZ;
+CCTK_REAL CDYCDK_CDYCDKYY;
+CCTK_REAL CDYCDK_CDYCDKYZ;
+CCTK_REAL CDYCDK_CDYCDKZZ;
 
 #endif
 
diff --git a/src/macro/CDZCDK_declare.h b/src/macro/CDZCDK_declare.h
index 003c4b2..6ca6aff 100644
--- a/src/macro/CDZCDK_declare.h
+++ b/src/macro/CDZCDK_declare.h
@@ -86,12 +86,12 @@
 #define CDZCDK_CDZCDKZZ  cdzcdk_cdzcdkzz
 
 /* Declare output variables */
-double CDZCDK_CDZCDKXX;
-double CDZCDK_CDZCDKXY;
-double CDZCDK_CDZCDKXZ;
-double CDZCDK_CDZCDKYY;
-double CDZCDK_CDZCDKYZ;
-double CDZCDK_CDZCDKZZ;
+CCTK_REAL CDZCDK_CDZCDKXX;
+CCTK_REAL CDZCDK_CDZCDKXY;
+CCTK_REAL CDZCDK_CDZCDKXZ;
+CCTK_REAL CDZCDK_CDZCDKYY;
+CCTK_REAL CDZCDK_CDZCDKYZ;
+CCTK_REAL CDZCDK_CDZCDKZZ;
 
 #endif
 
diff --git a/src/macro/DA_declare.h b/src/macro/DA_declare.h
index 2dd14ba..6f9c738 100644
--- a/src/macro/DA_declare.h
+++ b/src/macro/DA_declare.h
@@ -101,14 +101,14 @@
 #define DA_DZ cctkGH->cctk_delta_space[2]
 
 /* Declare internal variables */
-      double DA_OO2DX;
-      double DA_OO2DY;
-      double DA_OO2DZ;
+      CCTK_REAL DA_OO2DX;
+      CCTK_REAL DA_OO2DY;
+      CCTK_REAL DA_OO2DZ;
 
 /* Declare output variables */
-      double DA_DXDA;
-      double DA_DYDA;
-      double DA_DZDA;
+      CCTK_REAL DA_DXDA;
+      CCTK_REAL DA_DYDA;
+      CCTK_REAL DA_DZDA;
 
 #endif
 
diff --git a/src/macro/DCGDT_declare.h b/src/macro/DCGDT_declare.h
index c2ea1c3..24bbdff 100644
--- a/src/macro/DCGDT_declare.h
+++ b/src/macro/DCGDT_declare.h
@@ -108,15 +108,15 @@
 #define DCGDT_DCGZZDT cdgdt_cdgzzdt
 
 /* Declare internal variables */
-      double DCGDT_IPSI4;
+      CCTK_REAL DCGDT_IPSI4;
 
 /* Declare output variables */
-      double DCGDT_DCGXXDT;
-      double DCGDT_DCGXYDT;
-      double DCGDT_DCGXZDT;
-      double DCGDT_DCGYYDT;
-      double DCGDT_DCGYZDT;
-      double DCGDT_DCGZZDT;
+      CCTK_REAL DCGDT_DCGXXDT;
+      CCTK_REAL DCGDT_DCGXYDT;
+      CCTK_REAL DCGDT_DCGXZDT;
+      CCTK_REAL DCGDT_DCGYYDT;
+      CCTK_REAL DCGDT_DCGYZDT;
+      CCTK_REAL DCGDT_DCGZZDT;
 
 #endif
 
diff --git a/src/macro/DETG_declare.h b/src/macro/DETG_declare.h
index 640515c..50aecde 100644
--- a/src/macro/DETG_declare.h
+++ b/src/macro/DETG_declare.h
@@ -110,17 +110,17 @@
 #define DETG_TEMPZZ detg_tempzz
 
 /* Declare internal variables */
-double DETG_PSI4;
-double DETG_TEMPXX;
-double DETG_TEMPXY;
-double DETG_TEMPXZ;
-double DETG_TEMPYY;
-double DETG_TEMPYZ;
-double DETG_TEMPZZ;
+CCTK_REAL DETG_PSI4;
+CCTK_REAL DETG_TEMPXX;
+CCTK_REAL DETG_TEMPXY;
+CCTK_REAL DETG_TEMPXZ;
+CCTK_REAL DETG_TEMPYY;
+CCTK_REAL DETG_TEMPYZ;
+CCTK_REAL DETG_TEMPZZ;
 
 /* Declare output variables */
-double DETG_DETG;
-double DETG_DETCG;
+CCTK_REAL DETG_DETG;
+CCTK_REAL DETG_DETCG;
 
 #endif
 
diff --git a/src/macro/DETG_guts.h b/src/macro/DETG_guts.h
index e175125..3facc99 100644
--- a/src/macro/DETG_guts.h
+++ b/src/macro/DETG_guts.h
@@ -37,9 +37,6 @@ Gabrielle Allen, 5th November 1998
 
 #ifdef CCODE
 
-#define Cal(x,y,z) ((x)?(y):(z))
-#define Power(x,y) (pow((CCTK_REAL) (x), (CCTK_REAL) (y)))
-
 DETG_PSI4 = ((*conformal_state == 0)?1:DETG_PSI*DETG_PSI*DETG_PSI*DETG_PSI);
 
 DETG_TEMPXX =  DETG_GYY*DETG_GZZ - DETG_GYZ*DETG_GYZ;
diff --git a/src/macro/DKDT_declare.h b/src/macro/DKDT_declare.h
index 8caab41..ccf59ba 100644
--- a/src/macro/DKDT_declare.h
+++ b/src/macro/DKDT_declare.h
@@ -99,12 +99,12 @@
 #define DKDT_DKZZDT dkdt_dkzzdt
 
 /* Declare output variables */
-      double DKDT_DKXXDT;
-      double DKDT_DKXYDT;
-      double DKDT_DKXZDT;
-      double DKDT_DKYYDT;
-      double DKDT_DKYZDT;
-      double DKDT_DKZZDT;
+      CCTK_REAL DKDT_DKXXDT;
+      CCTK_REAL DKDT_DKXYDT;
+      CCTK_REAL DKDT_DKXZDT;
+      CCTK_REAL DKDT_DKYYDT;
+      CCTK_REAL DKDT_DKYZDT;
+      CCTK_REAL DKDT_DKZZDT;
 
 #endif
 
diff --git a/src/macro/DXDB_declare.h b/src/macro/DXDB_declare.h
index 54aaaf6..1e8f18d 100644
--- a/src/macro/DXDB_declare.h
+++ b/src/macro/DXDB_declare.h
@@ -105,12 +105,12 @@
 #define DXDB_OO2DX dxdb_oo2dx
 
 /* Declare internal variables */
-double DXDB_OO2DX;
+CCTK_REAL DXDB_OO2DX;
 
 /* Declare output variables */
-double DXDB_DXDBX;
-double DXDB_DXDBY;
-double DXDB_DXDBZ;
+CCTK_REAL DXDB_DXDBX;
+CCTK_REAL DXDB_DXDBY;
+CCTK_REAL DXDB_DXDBZ;
 
 #endif
 
diff --git a/src/macro/DXDCG_declare.h b/src/macro/DXDCG_declare.h
index 2df9c22..311a0c0 100644
--- a/src/macro/DXDCG_declare.h
+++ b/src/macro/DXDCG_declare.h
@@ -124,15 +124,15 @@
 #define DXDCG_OO2DX cdxdg_oo2dx
 
 /* Declare internal variables */
-double DXDCG_OO2DX;
+CCTK_REAL DXDCG_OO2DX;
 
 /* Declare output variables */
-double DXDCG_DXDCGXX;
-double DXDCG_DXDCGXY;
-double DXDCG_DXDCGXZ;
-double DXDCG_DXDCGYY;
-double DXDCG_DXDCGYZ;
-double DXDCG_DXDCGZZ;
+CCTK_REAL DXDCG_DXDCGXX;
+CCTK_REAL DXDCG_DXDCGXY;
+CCTK_REAL DXDCG_DXDCGXZ;
+CCTK_REAL DXDCG_DXDCGYY;
+CCTK_REAL DXDCG_DXDCGYZ;
+CCTK_REAL DXDCG_DXDCGZZ;
 
 #endif
 
diff --git a/src/macro/DXDG_declare.h b/src/macro/DXDG_declare.h
index 028806e..c2a61d5 100644
--- a/src/macro/DXDG_declare.h
+++ b/src/macro/DXDG_declare.h
@@ -114,16 +114,16 @@
 #define DXDG_FAC   dxdg_fac
 
 /* Declare internal variables */
-double DXDG_PSI4;
-double DXDG_FAC;
+CCTK_REAL DXDG_PSI4;
+CCTK_REAL DXDG_FAC;
 
 /* Declare output variables */
-double DXDG_DXDGXX;
-double DXDG_DXDGXY;
-double DXDG_DXDGXZ;
-double DXDG_DXDGYY;
-double DXDG_DXDGYZ;
-double DXDG_DXDGZZ;
+CCTK_REAL DXDG_DXDGXX;
+CCTK_REAL DXDG_DXDGXY;
+CCTK_REAL DXDG_DXDGXZ;
+CCTK_REAL DXDG_DXDGYY;
+CCTK_REAL DXDG_DXDGYZ;
+CCTK_REAL DXDG_DXDGZZ;
 
 #endif
 
diff --git a/src/macro/DXDK_declare.h b/src/macro/DXDK_declare.h
index d1a10cb..3f75f3c 100644
--- a/src/macro/DXDK_declare.h
+++ b/src/macro/DXDK_declare.h
@@ -122,16 +122,16 @@
 #define DXDK_OO2DX dxdk_oo2dx
 
 /* Declare internal variables */
-double DXDK_DX;
-double DXDK_OO2DX;
+CCTK_REAL DXDK_DX;
+CCTK_REAL DXDK_OO2DX;
 
 /* Declare output variables */
-double DXDK_DXDKXX;
-double DXDK_DXDKXY;
-double DXDK_DXDKXZ;
-double DXDK_DXDKYY;
-double DXDK_DXDKYZ;
-double DXDK_DXDKZZ;
+CCTK_REAL DXDK_DXDKXX;
+CCTK_REAL DXDK_DXDKXY;
+CCTK_REAL DXDK_DXDKXZ;
+CCTK_REAL DXDK_DXDKYY;
+CCTK_REAL DXDK_DXDKYZ;
+CCTK_REAL DXDK_DXDKZZ;
 
 #endif
 
diff --git a/src/macro/DXXDG_declare.h b/src/macro/DXXDG_declare.h
index 87bf248..51e81d7 100644
--- a/src/macro/DXXDG_declare.h
+++ b/src/macro/DXXDG_declare.h
@@ -79,17 +79,17 @@
 #define DXXDG_DXXDPSI_O_PSI psixx[ijk]
 
 /* Declare internal variables */
-double DXXDG_FAC;
-double DXXDG_OODX2 = 1/(cctkGH->cctk_delta_space[0]*cctkGH->cctk_delta_space[0]);
-/*double DXXDG_DXXDPSI_O_PSI;*/
+CCTK_REAL DXXDG_FAC;
+CCTK_REAL DXXDG_OODX2 = 1/(cctkGH->cctk_delta_space[0]*cctkGH->cctk_delta_space[0]);
+/*CCTK_REAL DXXDG_DXXDPSI_O_PSI;*/
 
 /* Declare output variables */
-double DXXDG_DXXDGXX;
-double DXXDG_DXXDGXY;
-double DXXDG_DXXDGXZ;
-double DXXDG_DXXDGYY;
-double DXXDG_DXXDGYZ;
-double DXXDG_DXXDGZZ;
+CCTK_REAL DXXDG_DXXDGXX;
+CCTK_REAL DXXDG_DXXDGXY;
+CCTK_REAL DXXDG_DXXDGXZ;
+CCTK_REAL DXXDG_DXXDGYY;
+CCTK_REAL DXXDG_DXXDGYZ;
+CCTK_REAL DXXDG_DXXDGZZ;
 
 #endif
 
diff --git a/src/macro/DXYDG_declare.h b/src/macro/DXYDG_declare.h
index c979e58..2d26f92 100644
--- a/src/macro/DXYDG_declare.h
+++ b/src/macro/DXYDG_declare.h
@@ -190,16 +190,16 @@
 #define DXYDG_DXYDPSI_O_PSI psixy[ijk]
 
 /* Declare internal variables */
-double DXYDG_FAC;
-double DXYDG_OO4DXDY = 1/(4*cctkGH->cctk_delta_space[0]*cctkGH->cctk_delta_space[1]);
+CCTK_REAL DXYDG_FAC;
+CCTK_REAL DXYDG_OO4DXDY = 1/(4*cctkGH->cctk_delta_space[0]*cctkGH->cctk_delta_space[1]);
 
 /* Declare output variables */
-double DXYDG_DXYDGXX;
-double DXYDG_DXYDGXY;
-double DXYDG_DXYDGXZ;
-double DXYDG_DXYDGYY;
-double DXYDG_DXYDGYZ;
-double DXYDG_DXYDGZZ;
+CCTK_REAL DXYDG_DXYDGXX;
+CCTK_REAL DXYDG_DXYDGXY;
+CCTK_REAL DXYDG_DXYDGXZ;
+CCTK_REAL DXYDG_DXYDGYY;
+CCTK_REAL DXYDG_DXYDGYZ;
+CCTK_REAL DXYDG_DXYDGZZ;
 
 #endif
 
diff --git a/src/macro/DXZDG_declare.h b/src/macro/DXZDG_declare.h
index fc8d169..d486b85 100644
--- a/src/macro/DXZDG_declare.h
+++ b/src/macro/DXZDG_declare.h
@@ -190,16 +190,16 @@
 #define DXZDG_DXZDPSI_O_PSI psixz[ijk]
 
 /* Declare internal variables */
-double DXZDG_FAC;
-double DXZDG_OO4DXDZ = 1/(4*cctkGH->cctk_delta_space[0]*cctkGH->cctk_delta_space[2]);
+CCTK_REAL DXZDG_FAC;
+CCTK_REAL DXZDG_OO4DXDZ = 1/(4*cctkGH->cctk_delta_space[0]*cctkGH->cctk_delta_space[2]);
 
 /* Declare output variables */
-double DXZDG_DXZDGXX;
-double DXZDG_DXZDGXY;
-double DXZDG_DXZDGXZ;
-double DXZDG_DXZDGYY;
-double DXZDG_DXZDGYZ;
-double DXZDG_DXZDGZZ;
+CCTK_REAL DXZDG_DXZDGXX;
+CCTK_REAL DXZDG_DXZDGXY;
+CCTK_REAL DXZDG_DXZDGXZ;
+CCTK_REAL DXZDG_DXZDGYY;
+CCTK_REAL DXZDG_DXZDGYZ;
+CCTK_REAL DXZDG_DXZDGZZ;
 
 #endif
 
diff --git a/src/macro/DYDB_declare.h b/src/macro/DYDB_declare.h
index 3b73b7d..bbba555 100644
--- a/src/macro/DYDB_declare.h
+++ b/src/macro/DYDB_declare.h
@@ -98,12 +98,12 @@
 #define DYDB_OO2DY dydb_oo2dy
 
 /* Declare internal variables */
-double DYDB_OO2DY;
+CCTK_REAL DYDB_OO2DY;
 
 /* Declare output variables */
-double DYDB_DYDBX;
-double DYDB_DYDBY;
-double DYDB_DYDBZ;
+CCTK_REAL DYDB_DYDBX;
+CCTK_REAL DYDB_DYDBY;
+CCTK_REAL DYDB_DYDBZ;
 
 #endif
 
diff --git a/src/macro/DYDCG_declare.h b/src/macro/DYDCG_declare.h
index 7497be4..5b4e530 100644
--- a/src/macro/DYDCG_declare.h
+++ b/src/macro/DYDCG_declare.h
@@ -119,15 +119,15 @@
 #define DYDCG_OO2DY cdydg_oo2dy
 
 /* Declare internal variables */
-double DYDCG_OO2DY;
+CCTK_REAL DYDCG_OO2DY;
 
 /* Declare output variables */
-double DYDCG_DYDCGXX;
-double DYDCG_DYDCGXY;
-double DYDCG_DYDCGXZ;
-double DYDCG_DYDCGYY;
-double DYDCG_DYDCGYZ;
-double DYDCG_DYDCGZZ;
+CCTK_REAL DYDCG_DYDCGXX;
+CCTK_REAL DYDCG_DYDCGXY;
+CCTK_REAL DYDCG_DYDCGXZ;
+CCTK_REAL DYDCG_DYDCGYY;
+CCTK_REAL DYDCG_DYDCGYZ;
+CCTK_REAL DYDCG_DYDCGZZ;
 
 #endif
 
diff --git a/src/macro/DYDG_declare.h b/src/macro/DYDG_declare.h
index 97eacf7..1c8c745 100644
--- a/src/macro/DYDG_declare.h
+++ b/src/macro/DYDG_declare.h
@@ -115,16 +115,16 @@
 #define DYDG_FAC   dydg_fac
 
 /* Declare internal variables */
-double DYDG_PSI4;
-double DYDG_FAC;
+CCTK_REAL DYDG_PSI4;
+CCTK_REAL DYDG_FAC;
 
 /* Declare output variables */
-double DYDG_DYDGXX;
-double DYDG_DYDGXY;
-double DYDG_DYDGXZ;
-double DYDG_DYDGYY;
-double DYDG_DYDGYZ;
-double DYDG_DYDGZZ;
+CCTK_REAL DYDG_DYDGXX;
+CCTK_REAL DYDG_DYDGXY;
+CCTK_REAL DYDG_DYDGXZ;
+CCTK_REAL DYDG_DYDGYY;
+CCTK_REAL DYDG_DYDGYZ;
+CCTK_REAL DYDG_DYDGZZ;
 
 #endif
 
diff --git a/src/macro/DYDK_declare.h b/src/macro/DYDK_declare.h
index 1b62085..d22106f 100644
--- a/src/macro/DYDK_declare.h
+++ b/src/macro/DYDK_declare.h
@@ -119,15 +119,15 @@
 #define DYDK_OO2DY dydk_oo2dy
 
 /* Declare internal variables */
-double DYDK_OO2DY;
+CCTK_REAL DYDK_OO2DY;
 
 /* Declare output variables */
-double DYDK_DYDKXX;
-double DYDK_DYDKXY;
-double DYDK_DYDKXZ;
-double DYDK_DYDKYY;
-double DYDK_DYDKYZ;
-double DYDK_DYDKZZ;
+CCTK_REAL DYDK_DYDKXX;
+CCTK_REAL DYDK_DYDKXY;
+CCTK_REAL DYDK_DYDKXZ;
+CCTK_REAL DYDK_DYDKYY;
+CCTK_REAL DYDK_DYDKYZ;
+CCTK_REAL DYDK_DYDKZZ;
 
 #endif
 
diff --git a/src/macro/DYYDG_declare.h b/src/macro/DYYDG_declare.h
index ec88efa..100441a 100644
--- a/src/macro/DYYDG_declare.h
+++ b/src/macro/DYYDG_declare.h
@@ -78,16 +78,16 @@
 #define DYYDG_DYYDPSI_O_PSI psiyy[ijk]
 
 /* Declare internal variables */
-double DYYDG_FAC;
-double DYYDG_OODY2 = 1/(cctkGH->cctk_delta_space[1]*cctkGH->cctk_delta_space[1]);
+CCTK_REAL DYYDG_FAC;
+CCTK_REAL DYYDG_OODY2 = 1/(cctkGH->cctk_delta_space[1]*cctkGH->cctk_delta_space[1]);
 
 /* Declare output variables */
-double DYYDG_DYYDGXX;
-double DYYDG_DYYDGXY;
-double DYYDG_DYYDGXZ;
-double DYYDG_DYYDGYY;
-double DYYDG_DYYDGYZ;
-double DYYDG_DYYDGZZ;
+CCTK_REAL DYYDG_DYYDGXX;
+CCTK_REAL DYYDG_DYYDGXY;
+CCTK_REAL DYYDG_DYYDGXZ;
+CCTK_REAL DYYDG_DYYDGYY;
+CCTK_REAL DYYDG_DYYDGYZ;
+CCTK_REAL DYYDG_DYYDGZZ;
 
 #endif
 
diff --git a/src/macro/DYZDG_declare.h b/src/macro/DYZDG_declare.h
index 6ef4702..0145aca 100644
--- a/src/macro/DYZDG_declare.h
+++ b/src/macro/DYZDG_declare.h
@@ -190,16 +190,16 @@
 #define DYZDG_DYZDPSI_O_PSI psiyz[ijk]
 
 /* Declare internal variables */
-double DYZDG_FAC;
-double DYZDG_OO4DYDZ = 1/(4*cctkGH->cctk_delta_space[1]*cctkGH->cctk_delta_space[2]);
+CCTK_REAL DYZDG_FAC;
+CCTK_REAL DYZDG_OO4DYDZ = 1/(4*cctkGH->cctk_delta_space[1]*cctkGH->cctk_delta_space[2]);
 
 /* Declare output variables */
-double DYZDG_DYZDGXX;
-double DYZDG_DYZDGXY;
-double DYZDG_DYZDGXZ;
-double DYZDG_DYZDGYY;
-double DYZDG_DYZDGYZ;
-double DYZDG_DYZDGZZ;
+CCTK_REAL DYZDG_DYZDGXX;
+CCTK_REAL DYZDG_DYZDGXY;
+CCTK_REAL DYZDG_DYZDGXZ;
+CCTK_REAL DYZDG_DYZDGYY;
+CCTK_REAL DYZDG_DYZDGYZ;
+CCTK_REAL DYZDG_DYZDGZZ;
 
 #endif
 
diff --git a/src/macro/DZDB_declare.h b/src/macro/DZDB_declare.h
index 6e08b3a..3e8bda2 100644
--- a/src/macro/DZDB_declare.h
+++ b/src/macro/DZDB_declare.h
@@ -98,12 +98,12 @@
 #define DZDB_OO2DZ dzdb_oo2dz
 
 /* Declare internal variables */
-double DZDB_OO2DZ;
+CCTK_REAL DZDB_OO2DZ;
 
 /* Declare output variables */
-double DZDB_DZDBX;
-double DZDB_DZDBY;
-double DZDB_DZDBZ;
+CCTK_REAL DZDB_DZDBX;
+CCTK_REAL DZDB_DZDBY;
+CCTK_REAL DZDB_DZDBZ;
 
 #endif
 
diff --git a/src/macro/DZDCG_declare.h b/src/macro/DZDCG_declare.h
index 49c92dd..de9db93 100644
--- a/src/macro/DZDCG_declare.h
+++ b/src/macro/DZDCG_declare.h
@@ -119,15 +119,15 @@
 #define DZDCG_OO2DZ cdzdg_oo2dz
 
 /* Declare internal variables */
-double DZDCG_OO2DZ;
+CCTK_REAL DZDCG_OO2DZ;
 
 /* Declare output variables */
-double DZDCG_DZDCGXX;
-double DZDCG_DZDCGXY;
-double DZDCG_DZDCGXZ;
-double DZDCG_DZDCGYY;
-double DZDCG_DZDCGYZ;
-double DZDCG_DZDCGZZ;
+CCTK_REAL DZDCG_DZDCGXX;
+CCTK_REAL DZDCG_DZDCGXY;
+CCTK_REAL DZDCG_DZDCGXZ;
+CCTK_REAL DZDCG_DZDCGYY;
+CCTK_REAL DZDCG_DZDCGYZ;
+CCTK_REAL DZDCG_DZDCGZZ;
 
 #endif
 
diff --git a/src/macro/DZDG_declare.h b/src/macro/DZDG_declare.h
index 110fe73..19b367b 100644
--- a/src/macro/DZDG_declare.h
+++ b/src/macro/DZDG_declare.h
@@ -116,16 +116,16 @@
 #define DZDG_FAC   dzdg_fac
 
 /* Declare internal variables */
-double DZDG_PSI4;
-double DZDG_FAC;
+CCTK_REAL DZDG_PSI4;
+CCTK_REAL DZDG_FAC;
 
 /* Declare output variables */
-double DZDG_DZDGXX;
-double DZDG_DZDGXY;
-double DZDG_DZDGXZ;
-double DZDG_DZDGYY;
-double DZDG_DZDGYZ;
-double DZDG_DZDGZZ;
+CCTK_REAL DZDG_DZDGXX;
+CCTK_REAL DZDG_DZDGXY;
+CCTK_REAL DZDG_DZDGXZ;
+CCTK_REAL DZDG_DZDGYY;
+CCTK_REAL DZDG_DZDGYZ;
+CCTK_REAL DZDG_DZDGZZ;
 
 #endif
 
diff --git a/src/macro/DZDK_declare.h b/src/macro/DZDK_declare.h
index 2b8ab0a..e93233f 100644
--- a/src/macro/DZDK_declare.h
+++ b/src/macro/DZDK_declare.h
@@ -120,15 +120,15 @@
 #define DZDK_OO2DZ dzdk_oo2dz
 
 /* Declare internal variables */
-double DZDK_OO2DZ;
+CCTK_REAL DZDK_OO2DZ;
 
 /* Declare output variables */
-double DZDK_DZDKXX;
-double DZDK_DZDKXY;
-double DZDK_DZDKXZ;
-double DZDK_DZDKYY;
-double DZDK_DZDKYZ;
-double DZDK_DZDKZZ;
+CCTK_REAL DZDK_DZDKXX;
+CCTK_REAL DZDK_DZDKXY;
+CCTK_REAL DZDK_DZDKXZ;
+CCTK_REAL DZDK_DZDKYY;
+CCTK_REAL DZDK_DZDKYZ;
+CCTK_REAL DZDK_DZDKZZ;
 
 #endif
 
diff --git a/src/macro/DZZDG_declare.h b/src/macro/DZZDG_declare.h
index 0c9b12e..fd94c08 100644
--- a/src/macro/DZZDG_declare.h
+++ b/src/macro/DZZDG_declare.h
@@ -78,16 +78,16 @@
 #define DZZDG_DZZDPSI_O_PSI psizz[ijk]
 
 /* Declare internal variables */
-double DZZDG_FAC;
-double DZZDG_OODZ2 = 1/(cctkGH->cctk_delta_space[2]*cctkGH->cctk_delta_space[2]);
+CCTK_REAL DZZDG_FAC;
+CCTK_REAL DZZDG_OODZ2 = 1/(cctkGH->cctk_delta_space[2]*cctkGH->cctk_delta_space[2]);
 
 /* Declare output variables */
-double DZZDG_DZZDGXX;
-double DZZDG_DZZDGXY;
-double DZZDG_DZZDGXZ;
-double DZZDG_DZZDGYY;
-double DZZDG_DZZDGYZ;
-double DZZDG_DZZDGZZ;
+CCTK_REAL DZZDG_DZZDGXX;
+CCTK_REAL DZZDG_DZZDGXY;
+CCTK_REAL DZZDG_DZZDGXZ;
+CCTK_REAL DZZDG_DZZDGYY;
+CCTK_REAL DZZDG_DZZDGYZ;
+CCTK_REAL DZZDG_DZZDGZZ;
 
 #endif
 
diff --git a/src/macro/GAMMA_declare.h b/src/macro/GAMMA_declare.h
index 8d61f5d..97e9638 100644
--- a/src/macro/GAMMA_declare.h
+++ b/src/macro/GAMMA_declare.h
@@ -45,9 +45,9 @@
 #define GAMMA_GAMMAZ gamma_gammaz
 
 /* Declare output variables */
-double GAMMA_GAMMAX;
-double GAMMA_GAMMAY;
-double GAMMA_GAMMAZ;
+CCTK_REAL GAMMA_GAMMAX;
+CCTK_REAL GAMMA_GAMMAY;
+CCTK_REAL GAMMA_GAMMAZ;
 
 #endif
 
diff --git a/src/macro/HAMADM_declare.h b/src/macro/HAMADM_declare.h
index 946a794..40309bb 100644
--- a/src/macro/HAMADM_declare.h
+++ b/src/macro/HAMADM_declare.h
@@ -42,8 +42,8 @@
 #define HAMADM_HAMADMABS hamadm_ham_adm_abs
 
 /* Declare output variables */
-      double HAMADM_HAMADM;
-      double HAMADM_HAMADMABS;
+      CCTK_REAL HAMADM_HAMADM;
+      CCTK_REAL HAMADM_HAMADMABS;
 
 #endif
 
diff --git a/src/macro/KK_declare.h b/src/macro/KK_declare.h
index f4ace5a..d9e03f3 100644
--- a/src/macro/KK_declare.h
+++ b/src/macro/KK_declare.h
@@ -89,12 +89,12 @@
 #define KK_KKZZ KK33
 
 /* Declare output variables */
-double KK_KKXX;
-double KK_KKXY;
-double KK_KKXZ;
-double KK_KKYY;
-double KK_KKYZ;
-double KK_KKZZ;
+CCTK_REAL KK_KKXX;
+CCTK_REAL KK_KKXY;
+CCTK_REAL KK_KKXZ;
+CCTK_REAL KK_KKYY;
+CCTK_REAL KK_KKYZ;
+CCTK_REAL KK_KKZZ;
 
 #endif
 
diff --git a/src/macro/LIEG_declare.h b/src/macro/LIEG_declare.h
index 632f0d2..de0e7c8 100644
--- a/src/macro/LIEG_declare.h
+++ b/src/macro/LIEG_declare.h
@@ -105,12 +105,12 @@
 #define LIEG_LGZZ lieg_lgzz
 
 /* Declare output variables */
-      double LIEG_LGXX;
-      double LIEG_LGXY;
-      double LIEG_LGXZ;
-      double LIEG_LGYY;
-      double LIEG_LGYZ;
-      double LIEG_LGZZ;
+      CCTK_REAL LIEG_LGXX;
+      CCTK_REAL LIEG_LGXY;
+      CCTK_REAL LIEG_LGXZ;
+      CCTK_REAL LIEG_LGYY;
+      CCTK_REAL LIEG_LGYZ;
+      CCTK_REAL LIEG_LGZZ;
 
 #endif
 
diff --git a/src/macro/LIEK_declare.h b/src/macro/LIEK_declare.h
index 410f1f5..d0392f7 100644
--- a/src/macro/LIEK_declare.h
+++ b/src/macro/LIEK_declare.h
@@ -105,12 +105,12 @@
 #define LIEK_LKZZ liek_lkzz
 
 /* Declare output variables */
-      double LIEK_LKXX;
-      double LIEK_LKXY;
-      double LIEK_LKXZ;
-      double LIEK_LKYY;
-      double LIEK_LKYZ;
-      double LIEK_LKZZ;
+      CCTK_REAL LIEK_LKXX;
+      CCTK_REAL LIEK_LKXY;
+      CCTK_REAL LIEK_LKXZ;
+      CCTK_REAL LIEK_LKYY;
+      CCTK_REAL LIEK_LKYZ;
+      CCTK_REAL LIEK_LKZZ;
 
 #endif
 
diff --git a/src/macro/MOMXADM_declare.h b/src/macro/MOMXADM_declare.h
index a43adf9..bd2ecaa 100644
--- a/src/macro/MOMXADM_declare.h
+++ b/src/macro/MOMXADM_declare.h
@@ -34,7 +34,7 @@
 #define MOMXADM_MOMXADM momxadm_momxadm
 
 /* Declare output variables */
-      double MOMXADM_MOMXADM;
+      CCTK_REAL MOMXADM_MOMXADM;
 
 #endif
 
diff --git a/src/macro/MOMYADM_declare.h b/src/macro/MOMYADM_declare.h
index bc72b79..c733944 100644
--- a/src/macro/MOMYADM_declare.h
+++ b/src/macro/MOMYADM_declare.h
@@ -34,7 +34,7 @@
 #define MOMYADM_MOMYADM momyadm_momyadm
 
 /* Declare output variables */
-      double MOMYADM_MOMYADM;
+      CCTK_REAL MOMYADM_MOMYADM;
 
 #endif
 
diff --git a/src/macro/MOMZADM_declare.h b/src/macro/MOMZADM_declare.h
index 306751f..0177f09 100644
--- a/src/macro/MOMZADM_declare.h
+++ b/src/macro/MOMZADM_declare.h
@@ -34,7 +34,7 @@
 #define MOMZADM_MOMZADM momzadm_momzadm
 
 /* Declare output variables */
-      double MOMZADM_MOMZADM;
+      CCTK_REAL MOMZADM_MOMZADM;
 
 #endif
 
diff --git a/src/macro/NABA_declare.h b/src/macro/NABA_declare.h
index 18eb829..900f5f1 100644
--- a/src/macro/NABA_declare.h
+++ b/src/macro/NABA_declare.h
@@ -29,7 +29,7 @@
 #ifdef CCODE
 
 /* Declare output variables */
-      double  NABA_NABA;
+      CCTK_REAL  NABA_NABA;
 
 #endif
 
diff --git a/src/macro/RICCI_declare.h b/src/macro/RICCI_declare.h
index f2642d9..ec1f8fe 100644
--- a/src/macro/RICCI_declare.h
+++ b/src/macro/RICCI_declare.h
@@ -66,12 +66,12 @@
 #define RICCI_RZZ ricci_R33
 
 /* Declare output variables */
-double RICCI_RXX;
-double RICCI_RXY;
-double RICCI_RXZ;
-double RICCI_RYY;
-double RICCI_RYZ;
-double RICCI_RZZ;
+CCTK_REAL RICCI_RXX;
+CCTK_REAL RICCI_RXY;
+CCTK_REAL RICCI_RXZ;
+CCTK_REAL RICCI_RYY;
+CCTK_REAL RICCI_RYZ;
+CCTK_REAL RICCI_RZZ;
 
 #endif
 
diff --git a/src/macro/TRKK_declare.h b/src/macro/TRKK_declare.h
index c2fd779..9a5a8b4 100644
--- a/src/macro/TRKK_declare.h
+++ b/src/macro/TRKK_declare.h
@@ -34,7 +34,7 @@
 #define TRKK_TRKK trkk_trkk
 
 /* Declare output variables */
-double TRKK_TRKK;
+CCTK_REAL TRKK_TRKK;
 
 #endif
 
diff --git a/src/macro/TRRICCI_declare.h b/src/macro/TRRICCI_declare.h
index 9c837e0..82ca046 100644
--- a/src/macro/TRRICCI_declare.h
+++ b/src/macro/TRRICCI_declare.h
@@ -37,7 +37,7 @@
 #define TRRICCI_TRRICCI trricci_trricci
 
 /* Declare output variables */
-double TRRICCI_TRRICCI;
+CCTK_REAL TRRICCI_TRRICCI;
 
 #endif
 
diff --git a/src/macro/TRT_declare.h b/src/macro/TRT_declare.h
index 00d5f35..e70997f 100644
--- a/src/macro/TRT_declare.h
+++ b/src/macro/TRT_declare.h
@@ -104,10 +104,10 @@
 #define TRT_TRT trt_trt
 
 /* Declare temporary variables */
-       double TRT_IALP2;
+       CCTK_REAL TRT_IALP2;
 
 /* Declare output variables */
-       double TRT_TR;
+       CCTK_REAL TRT_TR;
 
 #endif
 
diff --git a/src/macro/WAVEG_declare.h b/src/macro/WAVEG_declare.h
index 7050722..f701771 100644
--- a/src/macro/WAVEG_declare.h
+++ b/src/macro/WAVEG_declare.h
@@ -43,12 +43,12 @@
 
 #ifdef CCODE
 
-      double WAVEG_DDGXX
-      double WAVEG_DDGXY
-      double WAVEG_DDGXZ
-      double WAVEG_DDGYY
-      double WAVEG_DDGYZ
-      double WAVEG_DDGZZ
+      CCTK_REAL WAVEG_DDGXX
+      CCTK_REAL WAVEG_DDGXY
+      CCTK_REAL WAVEG_DDGXZ
+      CCTK_REAL WAVEG_DDGYY
+      CCTK_REAL WAVEG_DDGYZ
+      CCTK_REAL WAVEG_DDGZZ
 
 #endif