aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknarf <knarf@54511f98-0e4f-0410-826e-eb8b393f5a1e>2010-05-24 14:05:28 +0000
committerknarf <knarf@54511f98-0e4f-0410-826e-eb8b393f5a1e>2010-05-24 14:05:28 +0000
commit981bb1abc05806e909e9736162374583e68b3efa (patch)
treef92b26018e7b4327d4e03a80453f1b10f440a8cc
parentf8c31de4b2d5f2aa2e0bfecee7c92b3aaea2e53a (diff)
'fix' paths for new location of ADMMacros, patch from Luca Baiotti
git-svn-id: http://svn.aei.mpg.de/numrel/AEIThorns/ADMMass/trunk@30 54511f98-0e4f-0410-826e-eb8b393f5a1e
-rw-r--r--src/surface_integral.c6
-rw-r--r--src/volume_integral.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/surface_integral.c b/src/surface_integral.c
index 83490d0..fa14602 100644
--- a/src/surface_integral.c
+++ b/src/surface_integral.c
@@ -74,7 +74,7 @@ void ADMMass_Surface(CCTK_ARGUMENTS)
char coordinate_parameter_type[9];
-#include "CactusEinstein/ADMMacros/src/macro/UPPERMET_declare.h"
+#include "EinsteinBase/ADMMacros/src/macro/UPPERMET_declare.h"
/* grid-function strides for ADMMacros */
const CCTK_INT di = 1;
@@ -242,7 +242,7 @@ void ADMMass_Surface(CCTK_ARGUMENTS)
if ((ds[0] != 0.0) || (ds[1] != 0.0) || (ds[2] != 0.0))
{
-#include "CactusEinstein/ADMMacros/src/macro/UPPERMET_guts.h"
+#include "EinsteinBase/ADMMacros/src/macro/UPPERMET_guts.h"
u[0][0] = UPPERMET_UXX;
u[0][1] = UPPERMET_UXY;
u[0][2] = UPPERMET_UXZ;
@@ -301,7 +301,7 @@ void ADMMass_Surface(CCTK_ARGUMENTS)
}
}
-#include "CactusEinstein/ADMMacros/src/macro/UPPERMET_undefine.h"
+#include "EinsteinBase/ADMMacros/src/macro/UPPERMET_undefine.h"
}
void ADMMass_Surface_Global(CCTK_ARGUMENTS)
diff --git a/src/volume_integral.c b/src/volume_integral.c
index 4e54976..119d293 100644
--- a/src/volume_integral.c
+++ b/src/volume_integral.c
@@ -38,7 +38,7 @@ void ADMMass_Volume(CCTK_ARGUMENTS)
int avoid_origin_parameter;
-#include "CactusEinstein/ADMMacros/src/macro/UPPERMET_declare.h"
+#include "EinsteinBase/ADMMacros/src/macro/UPPERMET_declare.h"
/* grid-function strides */
const CCTK_INT di = 1;
@@ -105,7 +105,7 @@ void ADMMass_Volume(CCTK_ARGUMENTS)
{
ijk = CCTK_GFINDEX3D(cctkGH, i, j, k);
-#include "CactusEinstein/ADMMacros/src/macro/UPPERMET_guts.h"
+#include "EinsteinBase/ADMMacros/src/macro/UPPERMET_guts.h"
u[0][0] = UPPERMET_UXX;
u[0][1] = UPPERMET_UXY;
u[0][2] = UPPERMET_UXZ;
@@ -284,7 +284,7 @@ void ADMMass_Volume(CCTK_ARGUMENTS)
cctk_delta_space[1]*
cctk_delta_space[2];
-#include "CactusEinstein/ADMMacros/src/macro/UPPERMET_undefine.h"
+#include "EinsteinBase/ADMMacros/src/macro/UPPERMET_undefine.h"
}
void ADMMass_Volume_Global(CCTK_ARGUMENTS)