aboutsummaryrefslogtreecommitdiff
path: root/src/driver/mask.cc
diff options
context:
space:
mode:
authorjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2003-10-15 15:59:12 +0000
committerjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2003-10-15 15:59:12 +0000
commitebc4e1319d7da12e3495316a28309f9fb5521518 (patch)
tree1074af859bc9476bfffe78f6122156eed643a50d /src/driver/mask.cc
parent87c81ead6f70b07efb4c74b8c71276d1e4c398c5 (diff)
some changes to the (integer array index) <--> (floating point Cactus coords)
mapping data structures, inspired by Ian Hawke and worked out with help from Erik Schnetter - delete global_coord_origin[N_GRID_DIMS] because it was never used except for debug printing - switch some cctk_origin_space[...] to CCTK_ORIGIN_SPACE(...) git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@1195 f88db872-0e4f-0410-b76b-b9085cfa78c5
Diffstat (limited to 'src/driver/mask.cc')
-rw-r--r--src/driver/mask.cc15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/driver/mask.cc b/src/driver/mask.cc
index cca76e3..db0cd72 100644
--- a/src/driver/mask.cc
+++ b/src/driver/mask.cc
@@ -79,8 +79,6 @@ struct mask_grid_info
cGH *GH; // --> Cactus grid hierarchy
// Cactus coordinate system
- fp global_coord_origin[N_GRID_DIMS]; // global (x,y,z)
- // = global origin + ijk*delta
fp local_coord_origin[N_GRID_DIMS]; // global (x,y,z)
// of (i,j,k) = (0,0,0)
// on this processor
@@ -208,14 +206,11 @@ mgi.base_grid_mean_coord_delta = pow(base_grid_delta_product, 1.0/3.0);
// get global/local Cactus grid origin
// KLUDGE -- is this the right way to get this??
-mgi.global_coord_origin[X_AXIS] = cctk_origin_space[X_AXIS];
-mgi.global_coord_origin[Y_AXIS] = cctk_origin_space[Y_AXIS];
-mgi.global_coord_origin[Z_AXIS] = cctk_origin_space[Z_AXIS];
-mgi.local_coord_origin[X_AXIS] = cctk_origin_space[X_AXIS]
+mgi.local_coord_origin[X_AXIS] = CCTK_ORIGIN_SPACE(X_AXIS)
+ cctk_lbnd[X_AXIS] * mgi.coord_delta[X_AXIS];
-mgi.local_coord_origin[Y_AXIS] = cctk_origin_space[Y_AXIS]
+mgi.local_coord_origin[Y_AXIS] = CCTK_ORIGIN_SPACE(Y_AXIS)
+ cctk_lbnd[Y_AXIS] * mgi.coord_delta[Y_AXIS];
-mgi.local_coord_origin[Z_AXIS] = cctk_origin_space[Z_AXIS]
+mgi.local_coord_origin[Z_AXIS] = CCTK_ORIGIN_SPACE(Z_AXIS)
+ cctk_lbnd[Z_AXIS] * mgi.coord_delta[Z_AXIS];
mgi.local_gridfn_dims[X_AXIS] = cctk_lsh[X_AXIS];
mgi.local_gridfn_dims[Y_AXIS] = cctk_lsh[Y_AXIS];
@@ -230,10 +225,6 @@ printf("mask.cc:: mgi.coord_delta[] = [%g,%g,%g]\n",
double(mgi.coord_delta[X_AXIS]),
double(mgi.coord_delta[Y_AXIS]),
double(mgi.coord_delta[Z_AXIS]));
-printf("mask.cc:: mgi.global_coord_origin[] = [%g,%g,%g]\n",
- double(mgi.global_coord_origin[X_AXIS]),
- double(mgi.global_coord_origin[Y_AXIS]),
- double(mgi.global_coord_origin[Z_AXIS]));
printf("mask.cc:: mgi.local_coord_origin[] = [%g,%g,%g]\n",
double(mgi.local_coord_origin[X_AXIS]),
double(mgi.local_coord_origin[Y_AXIS]),