Index: src/macro/TRT_declare.h
===================================================================
--- src/macro/TRT_declare.h	(revision 113)
+++ src/macro/TRT_declare.h	(working copy)
@@ -19,25 +19,25 @@
 
 /* Input variables */
 #undef  TRT_TTT
-#define TRT_TTT Ttt
+#define TRT_TTT eTtt(i,j,k)
 #undef  TRT_TTX
-#define TRT_TTX Ttx
+#define TRT_TTX eTtx(i,j,k)
 #undef  TRT_TTY
-#define TRT_TTY Tty
+#define TRT_TTY eTty(i,j,k)
 #undef  TRT_TTZ
-#define TRT_TTZ Ttz
+#define TRT_TTZ eTtz(i,j,k)
 #undef  TRT_TXX
-#define TRT_TXX Txx
+#define TRT_TXX eTxx(i,j,k)
 #undef  TRT_TXY
-#define TRT_TXY Txy
+#define TRT_TXY eTxy(i,j,k)
 #undef  TRT_TXZ
-#define TRT_TXZ Txz
+#define TRT_TXZ eTxz(i,j,k)
 #undef  TRT_TYY
-#define TRT_TYY Tyy
+#define TRT_TYY eTyy(i,j,k)
 #undef  TRT_TYZ
-#define TRT_TYZ Tyz
+#define TRT_TYZ eTyz(i,j,k)
 #undef  TRT_TZZ
-#define TRT_TZZ Tzz
+#define TRT_TZZ eTzz(i,j,k)
 #undef  TRT_ALP
 #define TRT_ALP alp(i,j,k)
 #undef  TRT_BX
@@ -67,25 +67,25 @@
 
 /* Input variables */
 #undef  TRT_TTT
-#define TRT_TTT Ttt
+#define TRT_TTT eTtt[ijk]
 #undef  TRT_TTX
-#define TRT_TTX Ttx
+#define TRT_TTX eTtx[ijk]
 #undef  TRT_TTY
-#define TRT_TTY Tty
+#define TRT_TTY eTty[ijk]
 #undef  TRT_TTZ
-#define TRT_TTZ Ttz
+#define TRT_TTZ eTtz[ijk]
 #undef  TRT_TXX
-#define TRT_TXX Txx
+#define TRT_TXX eTxx[ijk]
 #undef  TRT_TXY
-#define TRT_TXY Txy
+#define TRT_TXY eTxy[ijk]
 #undef  TRT_TXZ
-#define TRT_TXZ Txz
+#define TRT_TXZ eTxz[ijk]
 #undef  TRT_TYY
-#define TRT_TYY Tyy
+#define TRT_TYY eTyy[ijk]
 #undef  TRT_TYZ
-#define TRT_TYZ Tyz
+#define TRT_TYZ eTyz[ijk]
 #undef  TRT_TZZ
-#define TRT_TZZ Tzz
+#define TRT_TZZ eTzz[ijk]
 #undef  TRT_ALP
 #define TRT_ALP alp[ijk]
 #undef  TRT_BX
Index: src/macro/STRESSENERGY_declare.h
===================================================================
--- src/macro/STRESSENERGY_declare.h	(revision 113)
+++ src/macro/STRESSENERGY_declare.h	(working copy)
@@ -17,26 +17,50 @@
 #include "TRT_declare.h"
 #include "CalcTmunu_temps.inc"
 
+#ifdef FCODE
 #undef  STRESSENERGY_TTT 
-#define STRESSENERGY_TTT Ttt
+#define STRESSENERGY_TTT eTtt(i,j,k)
 #undef  STRESSENERGY_TTX 
-#define STRESSENERGY_TTX Ttx
+#define STRESSENERGY_TTX eTtx(i,j,k)
 #undef  STRESSENERGY_TTY 
-#define STRESSENERGY_TTY Tty
+#define STRESSENERGY_TTY eTty(i,j,k)
 #undef  STRESSENERGY_TTZ 
-#define STRESSENERGY_TTZ Ttz
+#define STRESSENERGY_TTZ eTtz(i,j,k)
 #undef  STRESSENERGY_TXX 
-#define STRESSENERGY_TXX Txx
+#define STRESSENERGY_TXX eTxx(i,j,k)
 #undef  STRESSENERGY_TXY 
-#define STRESSENERGY_TXY Txy
+#define STRESSENERGY_TXY eTxy(i,j,k)
 #undef  STRESSENERGY_TXZ 
-#define STRESSENERGY_TXZ Txz
+#define STRESSENERGY_TXZ eTxz(i,j,k)
 #undef  STRESSENERGY_TYY 
-#define STRESSENERGY_TYY Tyy
+#define STRESSENERGY_TYY eTyy(i,j,k)
 #undef  STRESSENERGY_TYZ 
-#define STRESSENERGY_TYZ Tyz
+#define STRESSENERGY_TYZ eTyz(i,j,k)
 #undef  STRESSENERGY_TZZ 
-#define STRESSENERGY_TZZ Tzz
+#define STRESSENERGY_TZZ eTzz(i,j,k)
+#endif
+#ifdef CCODE
+#undef  STRESSENERGY_TTT 
+#define STRESSENERGY_TTT eTtt[ijk]
+#undef  STRESSENERGY_TTX 
+#define STRESSENERGY_TTX eTtx[ijk]
+#undef  STRESSENERGY_TTY 
+#define STRESSENERGY_TTY eTty[ijk]
+#undef  STRESSENERGY_TTZ 
+#define STRESSENERGY_TTZ eTtz[ijk]
+#undef  STRESSENERGY_TXX 
+#define STRESSENERGY_TXX eTxx[ijk]
+#undef  STRESSENERGY_TXY 
+#define STRESSENERGY_TXY eTxy[ijk]
+#undef  STRESSENERGY_TXZ 
+#define STRESSENERGY_TXZ eTxz[ijk]
+#undef  STRESSENERGY_TYY 
+#define STRESSENERGY_TYY eTyy[ijk]
+#undef  STRESSENERGY_TYZ 
+#define STRESSENERGY_TYZ eTyz[ijk]
+#undef  STRESSENERGY_TZZ 
+#define STRESSENERGY_TZZ eTzz[ijk]
+#endif
 
 /* Symmetries */
 #undef  STRESSENERGY_TXT
@@ -52,18 +76,18 @@
 #undef  STRESSENERGY_TZY
 #define STRESSENERGY_TZY STRESSENERGY_TYZ
 
-      CCTK_REAL STRESSENERGY_TTT
-      CCTK_REAL STRESSENERGY_TTX
-      CCTK_REAL STRESSENERGY_TTY
-      CCTK_REAL STRESSENERGY_TTZ
-      CCTK_REAL STRESSENERGY_TXX
-      CCTK_REAL STRESSENERGY_TXY
-      CCTK_REAL STRESSENERGY_TXZ
-      CCTK_REAL STRESSENERGY_TYY
-      CCTK_REAL STRESSENERGY_TYZ
-      CCTK_REAL STRESSENERGY_TZZ
-      
       CCTK_REAL uxx,uxy,uxz,uyy,uyz,uzz
       CCTK_REAL detg
 
+      CCTK_REAL Ttt
+      CCTK_REAL Ttx
+      CCTK_REAL Tty
+      CCTK_REAL Ttz
+      CCTK_REAL Txx
+      CCTK_REAL Txy
+      CCTK_REAL Txz
+      CCTK_REAL Tyy
+      CCTK_REAL Tyz
+      CCTK_REAL Tzz
+
 #endif