Introduce cctk_ash, retire cctk_lssh

Introduce cctk_ash, describing the process-local array shape that has
been allocated. This may be larger than cctk_lsh, the process-local
shape that should be used.

Retire cctk_lssh and related infrastructure to handle staggered grid
functions.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOASCII/trunk@220 94b1c47f-dcfd-45ef-a468-0854c0e9e350

3 files changed, 3 insertions, 45 deletions

diff --git a/src/Write1D.c b/src/Write1D.c
index 7779c86..4134e06 100644
--- a/src/Write1D.c
+++ b/src/Write1D.c
@@ -174,8 +174,8 @@ int IOASCII_Write1D (const cGH *GH, int vindex, const char *alias)
   do_dir[0] = out1D_x && gdata.dim >= 1;
   do_dir[1] = out1D_y && gdata.dim >= 2;
   do_dir[2] = out1D_z && gdata.dim >= 3;
-  /* diagonal slice is done only if variable is non-staggered and 3D */
-  do_dir[3] = out1D_d && gdata.dim == 3 && gdata.stagtype == 0;
+  /* diagonal slice is done only if variable is 3D */
+  do_dir[3] = out1D_d && gdata.dim == 3;
   if (out1D_d && ! do_dir[3] && myGH->out1D_last[vindex] < 0)
   {
     CCTK_VWarn (3, __LINE__, __FILE__, CCTK_THORNSTRING,
@@ -327,12 +327,6 @@ int IOASCII_Write1D (const cGH *GH, int vindex, const char *alias)
         origin[i] = myGH->spxyz[gdata.dim-1][dir][i];
       }
       extent -= origin[dir];
-
-      /* correct extent in the case of staggered grids */
-      if (CCTK_StaggerDirIndex(dir,gdata.stagtype)==1)
-      {
-        --extent;
-      }
     }
     else    /* origin for CCTK_ARRAYS is always (0, 0, 0) */
     {
@@ -394,13 +388,7 @@ int IOASCII_Write1D (const cGH *GH, int vindex, const char *alias)
         {
           if (dir < 3)
           {
-            /* get the staggering offset for the xyz coordinates */
-            offset = 0.5 * GH->cctk_delta_space[dir] *
-                     CCTK_StaggerDirIndex (dir, gdata.stagtype);
-            for (i = 0; i < hsize; i++)
-            {
-              ((CCTK_REAL *) hdata[1])[i] += offset;
-            }
+            /* do nothing */
           }
           else
           {
diff --git a/src/Write2D.c b/src/Write2D.c
index fa8246f..8ed0c65 100644
--- a/src/Write2D.c
+++ b/src/Write2D.c
@@ -330,20 +330,6 @@ int IOASCII_Write2D (const cGH *GH, int vindex, const char *alias)
     {
       if (num_returned_hslabs == num_requested_hslabs)
       {
-        if (have_coords)
-        {
-          /* get the staggering offset for the coordinates */
-          offset[0] = 0.5 * GH->cctk_delta_space[dir_i] *
-                      CCTK_StaggerDirIndex (dir_i, gdata.stagtype);
-          offset[1] = 0.5 * GH->cctk_delta_space[dir_j] *
-                      CCTK_StaggerDirIndex (dir_j, gdata.stagtype);
-          for (i = 0; i < total_hsize; i++)
-          {
-            ((CCTK_REAL *) hdata[1])[i] += offset[0];
-            ((CCTK_REAL *) hdata[2])[i] += offset[1];
-          }
-        }
-
         WriteData (gdata.vartype, header, format, hsize, hdata, fileset[dir]);
       }
       else
diff --git a/src/Write3D.c b/src/Write3D.c
index 52fe554..998143a 100644
--- a/src/Write3D.c
+++ b/src/Write3D.c
@@ -278,22 +278,6 @@ int IOASCII_Write3D (const cGH *GH, int vindex, const char *alias)
   {
     if (num_returned_hslabs == num_requested_hslabs)
     {
-      if (have_coords)
-      {
-        /* get the staggering offset for the coordinates */
-        for (i = 0; i < 3; i++)
-        {
-          offset[i] = 0.5 * GH->cctk_delta_space[i] *
-                      CCTK_StaggerDirIndex (i, gdata.stagtype);
-        }
-        for (i = 0; i < total_hsize; i++)
-        {
-          ((CCTK_REAL *) hdata[1])[i] += offset[0];
-          ((CCTK_REAL *) hdata[2])[i] += offset[1];
-          ((CCTK_REAL *) hdata[3])[i] += offset[2];
-        }
-      }
-
       WriteData (gdata.vartype, header, format, hsize, hdata, file);
     }
     else