aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorallen <allen@b1d164ef-f17a-46e7-89d4-021c7118ef4e>1999-06-25 17:09:56 +0000
committerallen <allen@b1d164ef-f17a-46e7-89d4-021c7118ef4e>1999-06-25 17:09:56 +0000
commitb7092682af466d6568a3c2c685abeb11102579c6 (patch)
tree62a2194706df31118a3f33b6ae48dee9444f15ee
parent5196aee45b1f5bcf74d27b8bf1c8d9223c7b1b47 (diff)
Implementing new naming convention for variables on the cGH. See cGH.h for
details. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@7 b1d164ef-f17a-46e7-89d4-021c7118ef4e
-rw-r--r--src/macro/CDCDA_declare.h6
-rw-r--r--src/macro/CDCDA_guts.h6
-rw-r--r--src/macro/CDCDA_undefine.h6
-rw-r--r--src/macro/CDK_declare.h6
-rw-r--r--src/macro/CDK_guts.h6
-rw-r--r--src/macro/CDK_undefine.h6
-rw-r--r--src/macro/CDXCDK_declare.h4
-rw-r--r--src/macro/CDXCDK_guts.h4
-rw-r--r--src/macro/CDXCDK_undefine.h4
-rw-r--r--src/macro/CDYCDK_declare.h4
-rw-r--r--src/macro/CDYCDK_guts.h4
-rw-r--r--src/macro/CDYCDK_undefine.h4
-rw-r--r--src/macro/CDZCDK_declare.h4
-rw-r--r--src/macro/CDZCDK_guts.h4
-rw-r--r--src/macro/CDZCDK_undefine.h4
-rw-r--r--src/macro/CHR1_declare.h2
-rw-r--r--src/macro/CHR1_guts.h2
-rw-r--r--src/macro/CHR1_undefine.h2
-rw-r--r--src/macro/CHR2_declare.h4
-rw-r--r--src/macro/CHR2_guts.h4
-rw-r--r--src/macro/CHR2_undefine.h4
-rw-r--r--src/macro/DB_declare.h6
-rw-r--r--src/macro/DB_guts.h6
-rw-r--r--src/macro/DB_undefine.h6
-rw-r--r--src/macro/DCGDT_declare.h2
-rw-r--r--src/macro/DCGDT_guts.h4
-rw-r--r--src/macro/DCGDT_undefine.h2
-rw-r--r--src/macro/DDG_declare.h12
-rw-r--r--src/macro/DDG_guts.h12
-rw-r--r--src/macro/DDG_undefine.h12
-rw-r--r--src/macro/DG_declare.h6
-rw-r--r--src/macro/DG_guts.h6
-rw-r--r--src/macro/DG_undefine.h6
-rw-r--r--src/macro/DKDT_declare.h10
-rw-r--r--src/macro/DKDT_guts.h12
-rw-r--r--src/macro/DKDT_undefine.h10
-rw-r--r--src/macro/DK_declare.h6
-rw-r--r--src/macro/DK_guts.h6
-rw-r--r--src/macro/DK_undefine.h6
-rw-r--r--src/macro/DXDG_declare.h2
-rw-r--r--src/macro/DXDG_guts.h2
-rw-r--r--src/macro/DXDG_undefine.h2
-rw-r--r--src/macro/DXXDG_declare.h2
-rw-r--r--src/macro/DXXDG_guts.h2
-rw-r--r--src/macro/DXXDG_undefine.h2
-rw-r--r--src/macro/DXYDG_declare.h4
-rw-r--r--src/macro/DXYDG_guts.h4
-rw-r--r--src/macro/DXYDG_undefine.h4
-rw-r--r--src/macro/DXZDG_declare.h4
-rw-r--r--src/macro/DXZDG_guts.h4
-rw-r--r--src/macro/DXZDG_undefine.h4
-rw-r--r--src/macro/DYDG_declare.h2
-rw-r--r--src/macro/DYDG_guts.h2
-rw-r--r--src/macro/DYDG_undefine.h2
-rw-r--r--src/macro/DYYDG_declare.h2
-rw-r--r--src/macro/DYYDG_guts.h2
-rw-r--r--src/macro/DYYDG_undefine.h2
-rw-r--r--src/macro/DYZDG_declare.h4
-rw-r--r--src/macro/DYZDG_guts.h4
-rw-r--r--src/macro/DYZDG_undefine.h4
-rw-r--r--src/macro/DZDG_declare.h2
-rw-r--r--src/macro/DZDG_guts.h2
-rw-r--r--src/macro/DZDG_undefine.h2
-rw-r--r--src/macro/DZZDG_guts.h2
-rw-r--r--src/macro/DZZDG_undefine.h2
-rw-r--r--src/macro/GAMMA_declare.h4
-rw-r--r--src/macro/GAMMA_guts.h4
-rw-r--r--src/macro/GAMMA_undefine.h4
-rw-r--r--src/macro/HAMADM_declare.h6
-rw-r--r--src/macro/HAMADM_guts.h6
-rw-r--r--src/macro/HAMADM_undefine.h6
-rw-r--r--src/macro/KK_declare.h2
-rw-r--r--src/macro/KK_guts.h2
-rw-r--r--src/macro/KK_undefine.h2
-rw-r--r--src/macro/LIEG_declare.h4
-rw-r--r--src/macro/LIEG_guts.h4
-rw-r--r--src/macro/LIEG_undefine.h4
-rw-r--r--src/macro/LIEK_declare.h4
-rw-r--r--src/macro/LIEK_guts.h4
-rw-r--r--src/macro/LIEK_undefine.h4
-rw-r--r--src/macro/MOMXADM_declare.h4
-rw-r--r--src/macro/MOMXADM_guts.h4
-rw-r--r--src/macro/MOMXADM_undefine.h4
-rw-r--r--src/macro/MOMYADM_declare.h4
-rw-r--r--src/macro/MOMYADM_guts.h4
-rw-r--r--src/macro/MOMYADM_undefine.h4
-rw-r--r--src/macro/MOMZADM_declare.h4
-rw-r--r--src/macro/MOMZADM_guts.h4
-rw-r--r--src/macro/MOMZADM_undefine.h4
-rw-r--r--src/macro/NABA_declare.h4
-rw-r--r--src/macro/NABA_guts.h4
-rw-r--r--src/macro/NABA_undefine.h4
-rw-r--r--src/macro/RICCI_declare.h8
-rw-r--r--src/macro/RICCI_guts.h8
-rw-r--r--src/macro/RICCI_undefine.h8
-rw-r--r--src/macro/STRESSENERGY_declare.h6
-rw-r--r--src/macro/STRESSENERGY_guts.h6
-rw-r--r--src/macro/STRESSENERGY_undefine.h6
-rw-r--r--src/macro/TRKK_declare.h4
-rw-r--r--src/macro/TRKK_guts.h4
-rw-r--r--src/macro/TRKK_undefine.h4
-rw-r--r--src/macro/TRK_declare.h2
-rw-r--r--src/macro/TRK_guts.h2
-rw-r--r--src/macro/TRK_undefine.h2
-rw-r--r--src/macro/TRRICCI_declare.h4
-rw-r--r--src/macro/TRRICCI_guts.h4
-rw-r--r--src/macro/TRRICCI_undefine.h4
-rw-r--r--src/macro/TRT_declare.h2
-rw-r--r--src/macro/TRT_guts.h2
-rw-r--r--src/macro/TRT_undefine.h2
-rw-r--r--src/macro/UPPERMET_declare.h2
-rw-r--r--src/macro/UPPERMET_guts.h2
-rw-r--r--src/macro/UPPERMET_undefine.h2
-rw-r--r--src/macro/WAVEG_declare.h4
-rw-r--r--src/macro/WAVEG_guts.h4
-rw-r--r--src/macro/WAVEG_undefine.h4
116 files changed, 247 insertions, 247 deletions
diff --git a/src/macro/CDCDA_declare.h b/src/macro/CDCDA_declare.h
index f8ee5d8..58ced29 100644
--- a/src/macro/CDCDA_declare.h
+++ b/src/macro/CDCDA_declare.h
@@ -12,9 +12,9 @@
#ifndef CDCDA_DECLARE
#define CDCDA_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DA_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DDA_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DA_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DDA_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
/* Output variables */
#undef CDCDA_CDXXDA
diff --git a/src/macro/CDCDA_guts.h b/src/macro/CDCDA_guts.h
index 08d7661..c594773 100644
--- a/src/macro/CDCDA_guts.h
+++ b/src/macro/CDCDA_guts.h
@@ -13,9 +13,9 @@
#ifndef CDCDA_GUTS
#define CDCDA_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DA_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DDA_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DA_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DDA_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
#ifdef FCODE
diff --git a/src/macro/CDCDA_undefine.h b/src/macro/CDCDA_undefine.h
index ff34780..a060b67 100644
--- a/src/macro/CDCDA_undefine.h
+++ b/src/macro/CDCDA_undefine.h
@@ -8,8 +8,8 @@
#undef CDCDA_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DA_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DDA_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DA_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DDA_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
diff --git a/src/macro/CDK_declare.h b/src/macro/CDK_declare.h
index 47fd651..3674b01 100644
--- a/src/macro/CDK_declare.h
+++ b/src/macro/CDK_declare.h
@@ -12,8 +12,8 @@
#ifndef CDK_DECLARE
#define CDK_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDXCDK_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDYCDK_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDZCDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CDXCDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CDYCDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CDZCDK_declare.h"
#endif
diff --git a/src/macro/CDK_guts.h b/src/macro/CDK_guts.h
index 527e442..742f3e5 100644
--- a/src/macro/CDK_guts.h
+++ b/src/macro/CDK_guts.h
@@ -11,8 +11,8 @@
#ifndef CDK_GUTS
#define CDK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDXCDK_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDYCDK_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDZCDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CDXCDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CDYCDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CDZCDK_guts.h"
#endif
diff --git a/src/macro/CDK_undefine.h b/src/macro/CDK_undefine.h
index 29b16c7..254cc59 100644
--- a/src/macro/CDK_undefine.h
+++ b/src/macro/CDK_undefine.h
@@ -8,7 +8,7 @@
#undef CDK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDXCDK_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDYCDK_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDZCDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CDXCDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CDYCDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CDZCDK_undefine.h"
diff --git a/src/macro/CDXCDK_declare.h b/src/macro/CDXCDK_declare.h
index 75fca9a..3d639af 100644
--- a/src/macro/CDXCDK_declare.h
+++ b/src/macro/CDXCDK_declare.h
@@ -11,8 +11,8 @@
#ifndef CDXCDK_DECLARE
#define CDXCDK_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDK_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DXDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
#ifdef FCODE
diff --git a/src/macro/CDXCDK_guts.h b/src/macro/CDXCDK_guts.h
index 710d791..a617da2 100644
--- a/src/macro/CDXCDK_guts.h
+++ b/src/macro/CDXCDK_guts.h
@@ -11,8 +11,8 @@
#ifndef CDXCDK_GUTS
#define CDXCDK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDK_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DXDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
#ifdef FCODE
diff --git a/src/macro/CDXCDK_undefine.h b/src/macro/CDXCDK_undefine.h
index 774daae..960a8ab 100644
--- a/src/macro/CDXCDK_undefine.h
+++ b/src/macro/CDXCDK_undefine.h
@@ -8,5 +8,5 @@
#undef CDXCDK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDK_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DXDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
diff --git a/src/macro/CDYCDK_declare.h b/src/macro/CDYCDK_declare.h
index dbe2871..8c44163 100644
--- a/src/macro/CDYCDK_declare.h
+++ b/src/macro/CDYCDK_declare.h
@@ -11,8 +11,8 @@
#ifndef CDYCDK_DECLARE
#define CDYCDK_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDK_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DYDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
#ifdef FCODE
diff --git a/src/macro/CDYCDK_guts.h b/src/macro/CDYCDK_guts.h
index 21ea703..293ffa3 100644
--- a/src/macro/CDYCDK_guts.h
+++ b/src/macro/CDYCDK_guts.h
@@ -11,8 +11,8 @@
#ifndef CDYCDK_GUTS
#define CDYCDK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDK_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DYDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
#ifdef FCODE
diff --git a/src/macro/CDYCDK_undefine.h b/src/macro/CDYCDK_undefine.h
index fb33304..82eab35 100644
--- a/src/macro/CDYCDK_undefine.h
+++ b/src/macro/CDYCDK_undefine.h
@@ -8,6 +8,6 @@
#undef CDYCDK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDK_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DYDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
diff --git a/src/macro/CDZCDK_declare.h b/src/macro/CDZCDK_declare.h
index 5d09669..a935f00 100644
--- a/src/macro/CDZCDK_declare.h
+++ b/src/macro/CDZCDK_declare.h
@@ -11,8 +11,8 @@
#ifndef CDZCDK_DECLARE
#define CDZCDK_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDK_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DZDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
#ifdef FCODE
diff --git a/src/macro/CDZCDK_guts.h b/src/macro/CDZCDK_guts.h
index 20a99db..a95cd8b 100644
--- a/src/macro/CDZCDK_guts.h
+++ b/src/macro/CDZCDK_guts.h
@@ -11,8 +11,8 @@
#ifndef CDZCDK_GUTS
#define CDZCDK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDK_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DZDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
#ifdef FCODE
diff --git a/src/macro/CDZCDK_undefine.h b/src/macro/CDZCDK_undefine.h
index fe41aa2..eeb8102 100644
--- a/src/macro/CDZCDK_undefine.h
+++ b/src/macro/CDZCDK_undefine.h
@@ -8,5 +8,5 @@
#undef CDZCDK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDK_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DZDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
diff --git a/src/macro/CHR1_declare.h b/src/macro/CHR1_declare.h
index b45f78e..5ba296c 100644
--- a/src/macro/CHR1_declare.h
+++ b/src/macro/CHR1_declare.h
@@ -11,7 +11,7 @@
#ifndef CHR1_DECLARE
#define CHR1_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DG_declare.h"
#ifdef FCODE
diff --git a/src/macro/CHR1_guts.h b/src/macro/CHR1_guts.h
index 84bac21..ffaa1fd 100644
--- a/src/macro/CHR1_guts.h
+++ b/src/macro/CHR1_guts.h
@@ -13,7 +13,7 @@
#ifndef CHR1_GUTS
#define CHR1_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DG_guts.h"
#ifdef FCODE
diff --git a/src/macro/CHR1_undefine.h b/src/macro/CHR1_undefine.h
index 5735508..dc0568a 100644
--- a/src/macro/CHR1_undefine.h
+++ b/src/macro/CHR1_undefine.h
@@ -8,6 +8,6 @@
#undef CHR1_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DG_undefine.h"
diff --git a/src/macro/CHR2_declare.h b/src/macro/CHR2_declare.h
index b198fd0..eeebc98 100644
--- a/src/macro/CHR2_declare.h
+++ b/src/macro/CHR2_declare.h
@@ -21,8 +21,8 @@
#ifndef CHR2_DECLARE
#define CHR2_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR1_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CHR1_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
#ifdef FCODE
diff --git a/src/macro/CHR2_guts.h b/src/macro/CHR2_guts.h
index 596b089..e011bc6 100644
--- a/src/macro/CHR2_guts.h
+++ b/src/macro/CHR2_guts.h
@@ -20,8 +20,8 @@
#ifndef CHR2_GUTS
#define CHR2_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR1_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CHR1_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
#ifdef FCODE
diff --git a/src/macro/CHR2_undefine.h b/src/macro/CHR2_undefine.h
index 97d0bbb..d873757 100644
--- a/src/macro/CHR2_undefine.h
+++ b/src/macro/CHR2_undefine.h
@@ -8,6 +8,6 @@
#undef CHR2_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR1_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CHR1_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
diff --git a/src/macro/DB_declare.h b/src/macro/DB_declare.h
index 51341ba..fabba8a 100644
--- a/src/macro/DB_declare.h
+++ b/src/macro/DB_declare.h
@@ -17,8 +17,8 @@
#ifndef DB_DECLARE
#define DB_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDB_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDB_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDB_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DXDB_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DYDB_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DZDB_declare.h"
#endif
diff --git a/src/macro/DB_guts.h b/src/macro/DB_guts.h
index 72ea813..87c265a 100644
--- a/src/macro/DB_guts.h
+++ b/src/macro/DB_guts.h
@@ -18,8 +18,8 @@
#ifndef DB_GUTS
#define DB_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDB_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDB_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDB_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DXDB_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DYDB_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DZDB_guts.h"
#endif
diff --git a/src/macro/DB_undefine.h b/src/macro/DB_undefine.h
index 3083532..307489f 100644
--- a/src/macro/DB_undefine.h
+++ b/src/macro/DB_undefine.h
@@ -8,7 +8,7 @@
#undef DB_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDB_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDB_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDB_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DXDB_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DYDB_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DZDB_undefine.h"
diff --git a/src/macro/DCGDT_declare.h b/src/macro/DCGDT_declare.h
index 71df0cf..230a543 100644
--- a/src/macro/DCGDT_declare.h
+++ b/src/macro/DCGDT_declare.h
@@ -15,7 +15,7 @@
#ifndef DCGDT_DECLARE
#define DCGDT_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/LIEG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/LIEG_declare.h"
#ifdef FCODE
diff --git a/src/macro/DCGDT_guts.h b/src/macro/DCGDT_guts.h
index acac1a0..a88a831 100644
--- a/src/macro/DCGDT_guts.h
+++ b/src/macro/DCGDT_guts.h
@@ -40,7 +40,7 @@
IF (shift_state .ne. SHIFT_INACTIVE) THEN
-#include "../../packages/CactusEinstein/Einstein/src/macro/LIEG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/LIEG_guts.h"
DCGDT_DCGXXDT = DCGDT_DCGXXDT + LIEG_LGXX
DCGDT_DCGXYDT = DCGDT_DCGXYDT + LIEG_LGXY
@@ -79,7 +79,7 @@
if (shift)
{
-#include "../../packages/CactusEinstein/Einstein/src/macro/LIEG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/LIEG_guts.h"
DCGDT_DCGXXDT = DCGDT_DCGXXDT + LIEG_LGXX
DCGDT_DCGXYDT = DCGDT_DCGXYDT + LIEG_LGXY
diff --git a/src/macro/DCGDT_undefine.h b/src/macro/DCGDT_undefine.h
index 312fcbd..99d81fa 100644
--- a/src/macro/DCGDT_undefine.h
+++ b/src/macro/DCGDT_undefine.h
@@ -8,6 +8,6 @@
#undef DCGDT_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/LIEG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/LIEG_undefine.h"
diff --git a/src/macro/DDG_declare.h b/src/macro/DDG_declare.h
index 4a951f8..5403065 100644
--- a/src/macro/DDG_declare.h
+++ b/src/macro/DDG_declare.h
@@ -17,12 +17,12 @@
#ifndef DDG_DECLARE
#define DDG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXXDG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXYDG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXZDG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYYDG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYZDG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZZDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DXXDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DXYDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DXZDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DYYDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DYZDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DZZDG_declare.h"
#undef DDG_DXXDGXX
#define DDG_DXXDGXX DXXDG_DXXDGXX
diff --git a/src/macro/DDG_guts.h b/src/macro/DDG_guts.h
index 87f350e..42e7f9f 100644
--- a/src/macro/DDG_guts.h
+++ b/src/macro/DDG_guts.h
@@ -16,11 +16,11 @@
#ifndef DDG_GUTS
#define DDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXXDG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXYDG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXZDG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYYDG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYZDG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZZDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DXXDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DXYDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DXZDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DYYDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DYZDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DZZDG_guts.h"
#endif
diff --git a/src/macro/DDG_undefine.h b/src/macro/DDG_undefine.h
index 62b62de..67785de 100644
--- a/src/macro/DDG_undefine.h
+++ b/src/macro/DDG_undefine.h
@@ -8,10 +8,10 @@
#undef DDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXXDG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXYDG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXZDG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYYDG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYZDG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZZDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DXXDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DXYDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DXZDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DYYDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DYZDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DZZDG_undefine.h"
diff --git a/src/macro/DG_declare.h b/src/macro/DG_declare.h
index a2a31a4..a444284 100644
--- a/src/macro/DG_declare.h
+++ b/src/macro/DG_declare.h
@@ -17,8 +17,8 @@
#ifndef DG_DECLARE
#define DG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DZDG_declare.h"
#endif
diff --git a/src/macro/DG_guts.h b/src/macro/DG_guts.h
index 1d7b1ac..4c1b211 100644
--- a/src/macro/DG_guts.h
+++ b/src/macro/DG_guts.h
@@ -18,8 +18,8 @@
#ifndef DG_GUTS
#define DG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DZDG_guts.h"
#endif
diff --git a/src/macro/DG_undefine.h b/src/macro/DG_undefine.h
index 72e899e..7943f8e 100644
--- a/src/macro/DG_undefine.h
+++ b/src/macro/DG_undefine.h
@@ -8,7 +8,7 @@
#undef DG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
diff --git a/src/macro/DKDT_declare.h b/src/macro/DKDT_declare.h
index f37ee31..1364f3b 100644
--- a/src/macro/DKDT_declare.h
+++ b/src/macro/DKDT_declare.h
@@ -16,11 +16,11 @@
#ifndef DKDT_DECLARE
#define DKDT_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/RICCI_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/KK_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRK_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDCDA_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/LIEK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/RICCI_declare.h"
+#include "CactusEinstein/Einstein/src/macro/KK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/TRK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CDCDA_declare.h"
+#include "CactusEinstein/Einstein/src/macro/LIEK_declare.h"
#ifdef FCODE
diff --git a/src/macro/DKDT_guts.h b/src/macro/DKDT_guts.h
index 6078936..5e6ca42 100644
--- a/src/macro/DKDT_guts.h
+++ b/src/macro/DKDT_guts.h
@@ -16,10 +16,10 @@
#ifndef DKDT_GUTS
#define DKDT_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/RICCI_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/KK_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRK_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDCDA_guts.h"
+#include "CactusEinstein/Einstein/src/macro/RICCI_guts.h"
+#include "CactusEinstein/Einstein/src/macro/KK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/TRK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CDCDA_guts.h"
#ifdef FCODE
@@ -32,7 +32,7 @@
IF (shift_state .ne. SHIFT_INACTIVE) THEN
-#include "../../packages/CactusEinstein/Einstein/src/macro/LIEK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/LIEK_guts.h"
DKDT_DKXXDT = DKDT_DKXXDT + LIEK_LKXX
DKDT_DKXYDT = DKDT_DKXYDT + LIEK_LKXY
@@ -58,7 +58,7 @@
if (shift)
{
-#include "../../packages/CactusEinstein/Einstein/src/macro/LIEK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/LIEK_guts.h"
DKDT_DKXXDT = DKDT_DKXXDT + LIEK_LKXX;
DKDT_DKXYDT = DKDT_DKXYDT + LIEK_LKXY;
diff --git a/src/macro/DKDT_undefine.h b/src/macro/DKDT_undefine.h
index 15c34cd..abc20bc 100644
--- a/src/macro/DKDT_undefine.h
+++ b/src/macro/DKDT_undefine.h
@@ -8,10 +8,10 @@
#undef DKDT_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/RICCI_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/KK_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRK_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDCDA_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/LIEK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/RICCI_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/KK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/TRK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CDCDA_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/LIEK_undefine.h"
diff --git a/src/macro/DK_declare.h b/src/macro/DK_declare.h
index 4cc0a65..d699eba 100644
--- a/src/macro/DK_declare.h
+++ b/src/macro/DK_declare.h
@@ -17,8 +17,8 @@
#ifndef DK_DECLARE
#define DK_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDK_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDK_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DXDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DYDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DZDK_declare.h"
#endif
diff --git a/src/macro/DK_guts.h b/src/macro/DK_guts.h
index f525f18..ec9be1e 100644
--- a/src/macro/DK_guts.h
+++ b/src/macro/DK_guts.h
@@ -18,8 +18,8 @@
#ifndef DK_GUTS
#define DK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDK_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDK_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DXDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DYDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DZDK_guts.h"
#endif
diff --git a/src/macro/DK_undefine.h b/src/macro/DK_undefine.h
index cf637ea..a7e1e78 100644
--- a/src/macro/DK_undefine.h
+++ b/src/macro/DK_undefine.h
@@ -8,7 +8,7 @@
#undef DK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDK_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDK_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DXDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DYDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DZDK_undefine.h"
diff --git a/src/macro/DXDG_declare.h b/src/macro/DXDG_declare.h
index 99aab1e..a148566 100644
--- a/src/macro/DXDG_declare.h
+++ b/src/macro/DXDG_declare.h
@@ -11,7 +11,7 @@
#ifndef DXDG_DECLARE
#define DXDG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDCG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DXDCG_declare.h"
#ifdef FCODE
diff --git a/src/macro/DXDG_guts.h b/src/macro/DXDG_guts.h
index d89610f..9ebaec9 100644
--- a/src/macro/DXDG_guts.h
+++ b/src/macro/DXDG_guts.h
@@ -14,7 +14,7 @@
#ifndef DXDG_GUTS
#define DXDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDCG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DXDCG_guts.h"
#ifdef FCODE
diff --git a/src/macro/DXDG_undefine.h b/src/macro/DXDG_undefine.h
index 4f1cd7f..56cbd49 100644
--- a/src/macro/DXDG_undefine.h
+++ b/src/macro/DXDG_undefine.h
@@ -8,5 +8,5 @@
#undef DXDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDCG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DXDCG_undefine.h"
diff --git a/src/macro/DXXDG_declare.h b/src/macro/DXXDG_declare.h
index a5b4f2c..f2328e3 100644
--- a/src/macro/DXXDG_declare.h
+++ b/src/macro/DXXDG_declare.h
@@ -13,7 +13,7 @@
#ifndef DXXDG_DECLARE
#define DXXDG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_declare.h"
#ifdef FCODE
diff --git a/src/macro/DXXDG_guts.h b/src/macro/DXXDG_guts.h
index 92053d6..21eda88 100644
--- a/src/macro/DXXDG_guts.h
+++ b/src/macro/DXXDG_guts.h
@@ -16,7 +16,7 @@
#ifndef DXXDG_GUTS
#define DXXDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_guts.h"
#ifdef FCODE
diff --git a/src/macro/DXXDG_undefine.h b/src/macro/DXXDG_undefine.h
index 8d82f3e..88d2d00 100644
--- a/src/macro/DXXDG_undefine.h
+++ b/src/macro/DXXDG_undefine.h
@@ -8,4 +8,4 @@
#undef DXXDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
diff --git a/src/macro/DXYDG_declare.h b/src/macro/DXYDG_declare.h
index 5ca0ca2..bc3a345 100644
--- a/src/macro/DXYDG_declare.h
+++ b/src/macro/DXYDG_declare.h
@@ -14,8 +14,8 @@
#ifndef DXYDG_DECLARE
#define DXYDG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_declare.h"
#ifdef FCODE
diff --git a/src/macro/DXYDG_guts.h b/src/macro/DXYDG_guts.h
index 3054f61..65dd06b 100644
--- a/src/macro/DXYDG_guts.h
+++ b/src/macro/DXYDG_guts.h
@@ -17,8 +17,8 @@
#ifndef DXYDG_GUTS
#define DXYDG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_guts.h"
#ifdef FCODE
diff --git a/src/macro/DXYDG_undefine.h b/src/macro/DXYDG_undefine.h
index 32210c9..92e1328 100644
--- a/src/macro/DXYDG_undefine.h
+++ b/src/macro/DXYDG_undefine.h
@@ -8,6 +8,6 @@
#undef DXYDG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
diff --git a/src/macro/DXZDG_declare.h b/src/macro/DXZDG_declare.h
index 1e7e39a..2e9c562 100644
--- a/src/macro/DXZDG_declare.h
+++ b/src/macro/DXZDG_declare.h
@@ -14,8 +14,8 @@
#ifndef DXZDG_DECLARE
#define DXZDG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DZDG_declare.h"
#ifdef FCODE
diff --git a/src/macro/DXZDG_guts.h b/src/macro/DXZDG_guts.h
index e2f2861..6ad02b1 100644
--- a/src/macro/DXZDG_guts.h
+++ b/src/macro/DXZDG_guts.h
@@ -17,8 +17,8 @@
#ifndef DXZDG_GUTS
#define DXZDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DZDG_guts.h"
#ifdef FCODE
diff --git a/src/macro/DXZDG_undefine.h b/src/macro/DXZDG_undefine.h
index 260894c..c9cd16b 100644
--- a/src/macro/DXZDG_undefine.h
+++ b/src/macro/DXZDG_undefine.h
@@ -8,5 +8,5 @@
#undef DXZDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
diff --git a/src/macro/DYDG_declare.h b/src/macro/DYDG_declare.h
index f75eb22..d635ed3 100644
--- a/src/macro/DYDG_declare.h
+++ b/src/macro/DYDG_declare.h
@@ -11,7 +11,7 @@
#ifndef DYDG_DECLARE
#define DYDG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDCG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DYDCG_declare.h"
#ifdef FCODE
diff --git a/src/macro/DYDG_guts.h b/src/macro/DYDG_guts.h
index 802d3c4..2dea9f3 100644
--- a/src/macro/DYDG_guts.h
+++ b/src/macro/DYDG_guts.h
@@ -14,7 +14,7 @@
#ifndef DYDG_GUTS
#define DYDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDCG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DYDCG_guts.h"
#ifdef FCODE
diff --git a/src/macro/DYDG_undefine.h b/src/macro/DYDG_undefine.h
index 95b873d..11a0c7d 100644
--- a/src/macro/DYDG_undefine.h
+++ b/src/macro/DYDG_undefine.h
@@ -8,5 +8,5 @@
#undef DYDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDCG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DYDCG_undefine.h"
diff --git a/src/macro/DYYDG_declare.h b/src/macro/DYYDG_declare.h
index 8ba9964..ceefedf 100644
--- a/src/macro/DYYDG_declare.h
+++ b/src/macro/DYYDG_declare.h
@@ -13,7 +13,7 @@
#ifndef DYYDG_DECLARE
#define DYYDG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_declare.h"
#ifdef FCODE
diff --git a/src/macro/DYYDG_guts.h b/src/macro/DYYDG_guts.h
index 96870e0..3766b25 100644
--- a/src/macro/DYYDG_guts.h
+++ b/src/macro/DYYDG_guts.h
@@ -16,7 +16,7 @@
#ifndef DYYDG_GUTS
#define DYYDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_guts.h"
#ifdef FCODE
diff --git a/src/macro/DYYDG_undefine.h b/src/macro/DYYDG_undefine.h
index d9cdf17..abb3e82 100644
--- a/src/macro/DYYDG_undefine.h
+++ b/src/macro/DYYDG_undefine.h
@@ -8,6 +8,6 @@
#undef DYYDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
diff --git a/src/macro/DYZDG_declare.h b/src/macro/DYZDG_declare.h
index ab6027d..c9614ef 100644
--- a/src/macro/DYZDG_declare.h
+++ b/src/macro/DYZDG_declare.h
@@ -14,8 +14,8 @@
#ifndef DYZDG_DECLARE
#define DYZDG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DZDG_declare.h"
#ifdef FCODE
diff --git a/src/macro/DYZDG_guts.h b/src/macro/DYZDG_guts.h
index 5122860..3303fb5 100644
--- a/src/macro/DYZDG_guts.h
+++ b/src/macro/DYZDG_guts.h
@@ -17,8 +17,8 @@
#ifndef DYZDG_GUTS
#define DYZDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DZDG_guts.h"
#ifdef FCODE
diff --git a/src/macro/DYZDG_undefine.h b/src/macro/DYZDG_undefine.h
index 8575755..1e4b30b 100644
--- a/src/macro/DYZDG_undefine.h
+++ b/src/macro/DYZDG_undefine.h
@@ -8,7 +8,7 @@
#undef DYZDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
diff --git a/src/macro/DZDG_declare.h b/src/macro/DZDG_declare.h
index 7005726..07d638b 100644
--- a/src/macro/DZDG_declare.h
+++ b/src/macro/DZDG_declare.h
@@ -11,7 +11,7 @@
#ifndef DZDG_DECLARE
#define DZDG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDCG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DZDCG_declare.h"
#ifdef FCODE
diff --git a/src/macro/DZDG_guts.h b/src/macro/DZDG_guts.h
index 897ea07..2c87eac 100644
--- a/src/macro/DZDG_guts.h
+++ b/src/macro/DZDG_guts.h
@@ -14,7 +14,7 @@
#ifndef DZDG_GUTS
#define DZDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDCG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DZDCG_guts.h"
#ifdef FCODE
diff --git a/src/macro/DZDG_undefine.h b/src/macro/DZDG_undefine.h
index 0b95e10..9aaa508 100644
--- a/src/macro/DZDG_undefine.h
+++ b/src/macro/DZDG_undefine.h
@@ -8,5 +8,5 @@
#undef DZDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDCG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DZDCG_undefine.h"
diff --git a/src/macro/DZZDG_guts.h b/src/macro/DZZDG_guts.h
index ef0a946..57abce1 100644
--- a/src/macro/DZZDG_guts.h
+++ b/src/macro/DZZDG_guts.h
@@ -16,7 +16,7 @@
#ifndef DZZDG_GUTS
#define DZZDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DZDG_guts.h"
#ifdef FCODE
diff --git a/src/macro/DZZDG_undefine.h b/src/macro/DZZDG_undefine.h
index b62646a..df1401f 100644
--- a/src/macro/DZZDG_undefine.h
+++ b/src/macro/DZZDG_undefine.h
@@ -8,5 +8,5 @@
#undef DZZDG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
diff --git a/src/macro/GAMMA_declare.h b/src/macro/GAMMA_declare.h
index 6a8b285..7d59d68 100644
--- a/src/macro/GAMMA_declare.h
+++ b/src/macro/GAMMA_declare.h
@@ -13,8 +13,8 @@
#ifndef GAMMA_DECLARE
#define GAMMA_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
#ifdef FCODE
diff --git a/src/macro/GAMMA_guts.h b/src/macro/GAMMA_guts.h
index cae7376..eaa6908 100644
--- a/src/macro/GAMMA_guts.h
+++ b/src/macro/GAMMA_guts.h
@@ -13,8 +13,8 @@
#ifndef GAMMA_GUTS
#define GAMMA_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
#ifdef FCODE
diff --git a/src/macro/GAMMA_undefine.h b/src/macro/GAMMA_undefine.h
index b653490..5fc5d65 100644
--- a/src/macro/GAMMA_undefine.h
+++ b/src/macro/GAMMA_undefine.h
@@ -8,6 +8,6 @@
#undef GAMMA_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
diff --git a/src/macro/HAMADM_declare.h b/src/macro/HAMADM_declare.h
index 3a81b5c..64bd5f7 100644
--- a/src/macro/HAMADM_declare.h
+++ b/src/macro/HAMADM_declare.h
@@ -12,9 +12,9 @@
#ifndef HAMADM_DECLARE
#define HAMADM_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRRICCI_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRKK_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/TRRICCI_declare.h"
+#include "CactusEinstein/Einstein/src/macro/TRKK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/TRK_declare.h"
#ifdef FCODE
diff --git a/src/macro/HAMADM_guts.h b/src/macro/HAMADM_guts.h
index 667987f..68c4a5c 100644
--- a/src/macro/HAMADM_guts.h
+++ b/src/macro/HAMADM_guts.h
@@ -14,9 +14,9 @@
#ifndef HAMADM_GUTS
#define HAMADM_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRRICCI_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRKK_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/TRRICCI_guts.h"
+#include "CactusEinstein/Einstein/src/macro/TRKK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/TRK_guts.h"
#ifdef FCODE
diff --git a/src/macro/HAMADM_undefine.h b/src/macro/HAMADM_undefine.h
index ee0638a..58ca220 100644
--- a/src/macro/HAMADM_undefine.h
+++ b/src/macro/HAMADM_undefine.h
@@ -8,9 +8,9 @@
#undef HAMADM_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRRICCI_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRKK_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/TRRICCI_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/TRKK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/TRK_undefine.h"
diff --git a/src/macro/KK_declare.h b/src/macro/KK_declare.h
index 007b45f..fa09fe0 100644
--- a/src/macro/KK_declare.h
+++ b/src/macro/KK_declare.h
@@ -16,7 +16,7 @@
#ifndef KK_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
#ifdef FCODE
diff --git a/src/macro/KK_guts.h b/src/macro/KK_guts.h
index ec3ac83..f587f49 100644
--- a/src/macro/KK_guts.h
+++ b/src/macro/KK_guts.h
@@ -20,7 +20,7 @@
#ifndef KK_GUTS
#define KK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
#ifdef FCODE
diff --git a/src/macro/KK_undefine.h b/src/macro/KK_undefine.h
index 1d02704..b00cddf 100644
--- a/src/macro/KK_undefine.h
+++ b/src/macro/KK_undefine.h
@@ -8,6 +8,6 @@
#undef KK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
diff --git a/src/macro/LIEG_declare.h b/src/macro/LIEG_declare.h
index 68724b0..0f98c3b 100644
--- a/src/macro/LIEG_declare.h
+++ b/src/macro/LIEG_declare.h
@@ -12,8 +12,8 @@
#ifndef LIEG_DECLARE
#define LIEG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DB_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DB_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DG_declare.h"
#ifdef FCODE
diff --git a/src/macro/LIEG_guts.h b/src/macro/LIEG_guts.h
index a769079..5f16f02 100644
--- a/src/macro/LIEG_guts.h
+++ b/src/macro/LIEG_guts.h
@@ -12,8 +12,8 @@
#ifndef LIEG_GUTS
#define LIEG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DB_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DB_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DG_guts.h"
#ifdef FCODE
diff --git a/src/macro/LIEG_undefine.h b/src/macro/LIEG_undefine.h
index 99bf94a..0e6639b 100644
--- a/src/macro/LIEG_undefine.h
+++ b/src/macro/LIEG_undefine.h
@@ -8,7 +8,7 @@
#undef LIEG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DB_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DB_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DG_undefine.h"
diff --git a/src/macro/LIEK_declare.h b/src/macro/LIEK_declare.h
index cbd4580..7efab65 100644
--- a/src/macro/LIEK_declare.h
+++ b/src/macro/LIEK_declare.h
@@ -12,8 +12,8 @@
#ifndef LIEK_DECLARE
#define LIEK_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DB_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DB_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DK_declare.h"
#ifdef FCODE
diff --git a/src/macro/LIEK_guts.h b/src/macro/LIEK_guts.h
index 4f35250..9641df3 100644
--- a/src/macro/LIEK_guts.h
+++ b/src/macro/LIEK_guts.h
@@ -12,8 +12,8 @@
#ifndef LIEK_GUTS
#define LIEK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DB_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DB_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DK_guts.h"
#ifdef FCODE
diff --git a/src/macro/LIEK_undefine.h b/src/macro/LIEK_undefine.h
index d733b27..04d248d 100644
--- a/src/macro/LIEK_undefine.h
+++ b/src/macro/LIEK_undefine.h
@@ -8,7 +8,7 @@
#undef LIEK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DB_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DB_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DK_undefine.h"
diff --git a/src/macro/MOMXADM_declare.h b/src/macro/MOMXADM_declare.h
index ba42b3e..15987c3 100644
--- a/src/macro/MOMXADM_declare.h
+++ b/src/macro/MOMXADM_declare.h
@@ -12,8 +12,8 @@
#ifndef MOMXADM_DECLARE
#define MOMXADM_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CDK_declare.h"
#ifdef FCODE
diff --git a/src/macro/MOMXADM_guts.h b/src/macro/MOMXADM_guts.h
index a497b41..e826131 100644
--- a/src/macro/MOMXADM_guts.h
+++ b/src/macro/MOMXADM_guts.h
@@ -14,8 +14,8 @@
#ifndef MOMXADM_GUTS
#define MOMXADM_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CDK_guts.h"
#ifdef FCODE
diff --git a/src/macro/MOMXADM_undefine.h b/src/macro/MOMXADM_undefine.h
index 45309ec..90d5d2b 100644
--- a/src/macro/MOMXADM_undefine.h
+++ b/src/macro/MOMXADM_undefine.h
@@ -8,8 +8,8 @@
#undef MOMXADM_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CDK_undefine.h"
diff --git a/src/macro/MOMYADM_declare.h b/src/macro/MOMYADM_declare.h
index 45651d7..4d7b72f 100644
--- a/src/macro/MOMYADM_declare.h
+++ b/src/macro/MOMYADM_declare.h
@@ -12,8 +12,8 @@
#ifndef MOMYADM_DECLARE
#define MOMYADM_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CDK_declare.h"
#ifdef FCODE
diff --git a/src/macro/MOMYADM_guts.h b/src/macro/MOMYADM_guts.h
index 00e246d..6aa344f 100644
--- a/src/macro/MOMYADM_guts.h
+++ b/src/macro/MOMYADM_guts.h
@@ -14,8 +14,8 @@
#ifndef MOMYADM_GUTS
#define MOMYADM_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CDK_guts.h"
#ifdef FCODE
diff --git a/src/macro/MOMYADM_undefine.h b/src/macro/MOMYADM_undefine.h
index 815bc15..b969afd 100644
--- a/src/macro/MOMYADM_undefine.h
+++ b/src/macro/MOMYADM_undefine.h
@@ -8,8 +8,8 @@
#undef MOMYADM_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CDK_undefine.h"
diff --git a/src/macro/MOMZADM_declare.h b/src/macro/MOMZADM_declare.h
index 79941a5..125fda9 100644
--- a/src/macro/MOMZADM_declare.h
+++ b/src/macro/MOMZADM_declare.h
@@ -12,8 +12,8 @@
#ifndef MOMZADM_DECLARE
#define MOMZADM_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CDK_declare.h"
#ifdef FCODE
diff --git a/src/macro/MOMZADM_guts.h b/src/macro/MOMZADM_guts.h
index d846cef..33ed313 100644
--- a/src/macro/MOMZADM_guts.h
+++ b/src/macro/MOMZADM_guts.h
@@ -14,8 +14,8 @@
#ifndef MOMZADM_GUTS
#define MOMZADM_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CDK_guts.h"
#ifdef FCODE
diff --git a/src/macro/MOMZADM_undefine.h b/src/macro/MOMZADM_undefine.h
index 6099bc1..11f179f 100644
--- a/src/macro/MOMZADM_undefine.h
+++ b/src/macro/MOMZADM_undefine.h
@@ -8,8 +8,8 @@
#undef MOMZADM_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CDK_undefine.h"
diff --git a/src/macro/NABA_declare.h b/src/macro/NABA_declare.h
index ead01e0..fad5126 100644
--- a/src/macro/NABA_declare.h
+++ b/src/macro/NABA_declare.h
@@ -12,8 +12,8 @@
#ifndef NABA_DECLARE
#define NABA_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDCDA_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CDCDA_declare.h"
/* Output variables */
#undef NABA_NABA
diff --git a/src/macro/NABA_guts.h b/src/macro/NABA_guts.h
index ad44638..53897fe 100644
--- a/src/macro/NABA_guts.h
+++ b/src/macro/NABA_guts.h
@@ -13,8 +13,8 @@
#ifndef NABA_GUTS
#define NABA_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDCDA_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CDCDA_guts.h"
#ifdef FCODE
diff --git a/src/macro/NABA_undefine.h b/src/macro/NABA_undefine.h
index 8081b5d..6b98cf9 100644
--- a/src/macro/NABA_undefine.h
+++ b/src/macro/NABA_undefine.h
@@ -8,7 +8,7 @@
#undef NABA_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CDCDA_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CDCDA_undefine.h"
diff --git a/src/macro/RICCI_declare.h b/src/macro/RICCI_declare.h
index 9cf0c89..f70c149 100644
--- a/src/macro/RICCI_declare.h
+++ b/src/macro/RICCI_declare.h
@@ -18,10 +18,10 @@
#ifndef RICCI_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DDG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR1_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CHR1_declare.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
#ifdef FCODE
diff --git a/src/macro/RICCI_guts.h b/src/macro/RICCI_guts.h
index 03f7321..e43caff 100644
--- a/src/macro/RICCI_guts.h
+++ b/src/macro/RICCI_guts.h
@@ -18,10 +18,10 @@
#ifndef RICCI_GUTS
#define RICCI_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DDG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR1_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CHR1_guts.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
#ifdef FCODE
diff --git a/src/macro/RICCI_undefine.h b/src/macro/RICCI_undefine.h
index f05fa3f..31347fa 100644
--- a/src/macro/RICCI_undefine.h
+++ b/src/macro/RICCI_undefine.h
@@ -8,7 +8,7 @@
#undef RICCI_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DDG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR1_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CHR1_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
diff --git a/src/macro/STRESSENERGY_declare.h b/src/macro/STRESSENERGY_declare.h
index 53f15c4..e04e4ea 100644
--- a/src/macro/STRESSENERGY_declare.h
+++ b/src/macro/STRESSENERGY_declare.h
@@ -12,9 +12,9 @@
#ifndef STRESSENERGY_DECLARE
#define STRESSENERGY_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DETG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRT_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DETG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/TRT_declare.h"
#undef STRESSENERGY_TTT
#define STRESSENERGY_TTT Ttt
diff --git a/src/macro/STRESSENERGY_guts.h b/src/macro/STRESSENERGY_guts.h
index cffa42f..1fb388f 100644
--- a/src/macro/STRESSENERGY_guts.h
+++ b/src/macro/STRESSENERGY_guts.h
@@ -13,8 +13,8 @@
c These geometrical quantities are supplied for CalcTmunu
-#include "../../packages/CactusEinstein/Einstein/src/macro/DETG_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DETG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
uxx = UPPERMET_UXX; uyy = UPPERMET_UYY; uzz = UPPERMET_UZZ
uxy = UPPERMET_UXY; uxz = UPPERMET_UXZ; uyz = UPPERMET_UYZ
@@ -35,6 +35,6 @@ c Calculate the stress-energy tensor
c Calculate the trace of the stress-energy tensor
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRT_guts.h"
+#include "CactusEinstein/Einstein/src/macro/TRT_guts.h"
#endif
diff --git a/src/macro/STRESSENERGY_undefine.h b/src/macro/STRESSENERGY_undefine.h
index 808a5e0..3f93cd2 100644
--- a/src/macro/STRESSENERGY_undefine.h
+++ b/src/macro/STRESSENERGY_undefine.h
@@ -11,7 +11,7 @@
#undef STRESSENERGY_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DETG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/TRT_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DETG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/TRT_undefine.h"
diff --git a/src/macro/TRKK_declare.h b/src/macro/TRKK_declare.h
index 0963f0a..a152d75 100644
--- a/src/macro/TRKK_declare.h
+++ b/src/macro/TRKK_declare.h
@@ -13,8 +13,8 @@
#ifndef TRKK_DECLARE
#define TRKK_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/KK_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/KK_declare.h"
#ifdef FCODE
diff --git a/src/macro/TRKK_guts.h b/src/macro/TRKK_guts.h
index 2740fcb..734e166 100644
--- a/src/macro/TRKK_guts.h
+++ b/src/macro/TRKK_guts.h
@@ -12,8 +12,8 @@
#ifndef TRKK_GUTS
#define TRKK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/KK_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/KK_guts.h"
#ifdef FCODE
diff --git a/src/macro/TRKK_undefine.h b/src/macro/TRKK_undefine.h
index 5ec5ff5..248b65c 100644
--- a/src/macro/TRKK_undefine.h
+++ b/src/macro/TRKK_undefine.h
@@ -8,8 +8,8 @@
#undef TRKK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/KK_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/KK_undefine.h"
diff --git a/src/macro/TRK_declare.h b/src/macro/TRK_declare.h
index cdc004e..07589da 100644
--- a/src/macro/TRK_declare.h
+++ b/src/macro/TRK_declare.h
@@ -13,7 +13,7 @@
#ifndef TRK_DECLARE
#define TRK_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
#ifdef FCODE
diff --git a/src/macro/TRK_guts.h b/src/macro/TRK_guts.h
index 3b94e94..9ec04f9 100644
--- a/src/macro/TRK_guts.h
+++ b/src/macro/TRK_guts.h
@@ -20,7 +20,7 @@
#ifndef TRK_GUTS
#define TRK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
#ifdef FCODE
diff --git a/src/macro/TRK_undefine.h b/src/macro/TRK_undefine.h
index c4a7a9f..a01516a 100644
--- a/src/macro/TRK_undefine.h
+++ b/src/macro/TRK_undefine.h
@@ -8,7 +8,7 @@
#undef TRK_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
diff --git a/src/macro/TRRICCI_declare.h b/src/macro/TRRICCI_declare.h
index 9a5581d..a3e4c37 100644
--- a/src/macro/TRRICCI_declare.h
+++ b/src/macro/TRRICCI_declare.h
@@ -12,8 +12,8 @@
#ifndef TRRICCI_DECLARE
#define TRRICCI_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/RICCI_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/RICCI_declare.h"
#ifdef FCODE
diff --git a/src/macro/TRRICCI_guts.h b/src/macro/TRRICCI_guts.h
index 88e78df..9448f85 100644
--- a/src/macro/TRRICCI_guts.h
+++ b/src/macro/TRRICCI_guts.h
@@ -12,8 +12,8 @@
#ifndef TRRICCI_GUTS
#define TRRICCI_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/RICCI_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/RICCI_guts.h"
#ifdef FCODE
diff --git a/src/macro/TRRICCI_undefine.h b/src/macro/TRRICCI_undefine.h
index c049ad5..de4928e 100644
--- a/src/macro/TRRICCI_undefine.h
+++ b/src/macro/TRRICCI_undefine.h
@@ -8,8 +8,8 @@
#undef TRRICCI_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/RICCI_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/RICCI_undefine.h"
diff --git a/src/macro/TRT_declare.h b/src/macro/TRT_declare.h
index a7051a7..293f945 100644
--- a/src/macro/TRT_declare.h
+++ b/src/macro/TRT_declare.h
@@ -13,7 +13,7 @@
#ifndef TRT_DECLARE
#define TRT_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
#ifdef FCODE
diff --git a/src/macro/TRT_guts.h b/src/macro/TRT_guts.h
index eec7b10..1424ba8 100644
--- a/src/macro/TRT_guts.h
+++ b/src/macro/TRT_guts.h
@@ -12,7 +12,7 @@
#ifndef TRT_GUTS
#define TRT_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
#ifdef FCODE
diff --git a/src/macro/TRT_undefine.h b/src/macro/TRT_undefine.h
index df2510e..cb794cc 100644
--- a/src/macro/TRT_undefine.h
+++ b/src/macro/TRT_undefine.h
@@ -8,7 +8,7 @@
#undef TRT_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
diff --git a/src/macro/UPPERMET_declare.h b/src/macro/UPPERMET_declare.h
index 6fb6006..7985c99 100644
--- a/src/macro/UPPERMET_declare.h
+++ b/src/macro/UPPERMET_declare.h
@@ -11,7 +11,7 @@
#ifndef UPPERMET_DECLARE
#define UPPERMET_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/DETG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DETG_declare.h"
#ifdef FCODE
diff --git a/src/macro/UPPERMET_guts.h b/src/macro/UPPERMET_guts.h
index 43ceb7f..e4f2c17 100644
--- a/src/macro/UPPERMET_guts.h
+++ b/src/macro/UPPERMET_guts.h
@@ -11,7 +11,7 @@ Gabrielle Allen, 11th June 1998
#ifndef UPPERMET_GUTS
#define UPPERMET_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DETG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DETG_guts.h"
#ifdef FCODE
diff --git a/src/macro/UPPERMET_undefine.h b/src/macro/UPPERMET_undefine.h
index ee5e9fd..99fa947 100644
--- a/src/macro/UPPERMET_undefine.h
+++ b/src/macro/UPPERMET_undefine.h
@@ -8,4 +8,4 @@
#undef UPPERMET_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/DETG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DETG_undefine.h"
diff --git a/src/macro/WAVEG_declare.h b/src/macro/WAVEG_declare.h
index 94089f2..f83531d 100644
--- a/src/macro/WAVEG_declare.h
+++ b/src/macro/WAVEG_declare.h
@@ -13,8 +13,8 @@
#ifndef WAVEG_DECLARE
#define WAVEG_DECLARE
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DDG_declare.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/DDG_declare.h"
/* Output variables */
#undef WAVEG_DDGXX
diff --git a/src/macro/WAVEG_guts.h b/src/macro/WAVEG_guts.h
index 512daba..6453679 100644
--- a/src/macro/WAVEG_guts.h
+++ b/src/macro/WAVEG_guts.h
@@ -13,8 +13,8 @@
#ifndef WAVEG_GUTS
#define WAVEG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DDG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DDG_guts.h"
#ifdef FCODE
diff --git a/src/macro/WAVEG_undefine.h b/src/macro/WAVEG_undefine.h
index ed2a4c0..ac4f9e8 100644
--- a/src/macro/WAVEG_undefine.h
+++ b/src/macro/WAVEG_undefine.h
@@ -12,6 +12,6 @@
#undef WAVEG_GUTS
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DDG_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DDG_undefine.h"