diff options
Diffstat (limited to 'src/Write2D.c')
| -rw-r--r-- | src/Write2D.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/Write2D.c b/src/Write2D.c index c708440..4153d4c 100644 --- a/src/Write2D.c +++ b/src/Write2D.c @@ -219,20 +219,20 @@ void IOFlexIO_Write2D (cGH *GH, int index, const char *alias, int first) /* Set up the number of global points and the points in the "i" and "j" directions */ if (dir == 0) { - ngpoints = GH->global_shape[1] * GH->global_shape[2]; + ngpoints = GH->cctk_gsh[1] * GH->cctk_gsh[2]; /* FIXME : origin */ - ni = GH->global_shape[1]; origin[0] = 0.0; delta[0] = pughGH->dy0; - nj = GH->global_shape[2]; origin[1] = 0.0; delta[1] = pughGH->dz0; + ni = GH->cctk_gsh[1]; origin[0] = 0.0; delta[0] = pughGH->dy0; + nj = GH->cctk_gsh[2]; origin[1] = 0.0; delta[1] = pughGH->dz0; } else if (dir == 1) { - ngpoints = GH->global_shape[0] * GH->global_shape[2]; + ngpoints = GH->cctk_gsh[0] * GH->cctk_gsh[2]; /* FIXME : Origin */ - ni = GH->global_shape[0]; origin[0] = 0.0; delta[0] = pughGH->dx0; - nj = GH->global_shape[2]; origin[1] = 0.0; delta[1] = pughGH->dz0; + ni = GH->cctk_gsh[0]; origin[0] = 0.0; delta[0] = pughGH->dx0; + nj = GH->cctk_gsh[2]; origin[1] = 0.0; delta[1] = pughGH->dz0; } else { - ngpoints = GH->global_shape[0] * GH->global_shape[1]; + ngpoints = GH->cctk_gsh[0] * GH->cctk_gsh[1]; /* FIXME : Origin */ - ni = GH->global_shape[0]; origin[0] = 0.0; delta[0] = pughGH->dx0; - nj = GH->global_shape[1]; origin[1] = 0.0; delta[1] = pughGH->dy0; + ni = GH->cctk_gsh[0]; origin[0] = 0.0; delta[0] = pughGH->dx0; + nj = GH->cctk_gsh[1]; origin[1] = 0.0; delta[1] = pughGH->dy0; } if (IO_verbose) { @@ -270,14 +270,14 @@ void IOFlexIO_Write2D (cGH *GH, int index, const char *alias, int first) if (dir == 2) {lo = 0; hi = 2;} if (npoints > 0) { /* See above comment ... */ - bnd [lo] = GH->lower_bound[(dir+1)%3] + + bnd [lo] = GH->cctk_lbnd[(dir+1)%3] + pughGH->ownership[pughGH->stagger][(dir+1)%3][0]; - bnd [lo+1] = GH->lower_bound[(dir+1)%3] + + bnd [lo+1] = GH->cctk_lbnd[(dir+1)%3] + pughGH->ownership[pughGH->stagger][(dir+1)%3][1]; - bnd [hi] = GH->lower_bound[(dir+2)%3] + + bnd [hi] = GH->cctk_lbnd[(dir+2)%3] + pughGH->ownership[pughGH->stagger][(dir+2)%3][0]; - bnd [hi+1] = GH->lower_bound[(dir+2)%3] + + bnd [hi+1] = GH->cctk_lbnd[(dir+2)%3] + pughGH->ownership[pughGH->stagger][(dir+2)%3][1]; locbnd [lo] = pughGH->ownership[pughGH->stagger][(dir+1)%3][0]; @@ -436,7 +436,7 @@ void IOFlexIO_Write2D (cGH *GH, int index, const char *alias, int first) /* Time and space attributes */ CACTUS_IEEEIO_ERROR (IOwriteAttribute (myGH->IEEEfile_2D [index][dir], - "time", FLEXIO_REAL, 1, &GH->time)); + "time", FLEXIO_REAL, 1, &GH->cctk_time)); CACTUS_IEEEIO_ERROR (IOwriteAttribute (myGH->IEEEfile_2D [index][dir], "origin", FLEXIO_REAL, 2, origin)); CACTUS_IEEEIO_ERROR (IOwriteAttribute (myGH->IEEEfile_2D [index][dir], |