Correct asserts statements.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Slab/trunk@47 2e825fa2-fb71-486d-8b7f-a5ff3f0f6cb8

1 files changed, 6 insertions, 4 deletions

diff --git a/src/slab.c b/src/slab.c
index fc95c75..7f367fa 100644
--- a/src/slab.c
+++ b/src/slab.c
@@ -956,7 +956,7 @@ int Slab_MultiTransfer (cGH             const         * const cctkGH,
     srcoffset[n+1] = srcoffset[n] + srccount[n];
   }
   srcdata = malloc (srcoffset[size] * srctypesize);
-  check (nvars==0 || srcdata);
+  check (srcoffset[size]==0 || srcdata);
   ifcheck {
     if (srctype == CCTK_VARIABLE_REAL) {
       CCTK_REAL * restrict const srcdataptr = srcdata;
@@ -1028,7 +1028,7 @@ int Slab_MultiTransfer (cGH             const         * const cctkGH,
     dstoffset[n+1] = dstoffset[n] + dstcount[n];
   }
   dstdata = malloc (dstoffset[size] * dsttypesize);
-  check (nvars==0 || dstdata);
+  check (dstoffset[size]==0 || dstdata);
   ifcheck {
     if (dsttype == CCTK_VARIABLE_REAL) {
       CCTK_REAL * restrict const dstdataptr = dstdata;
@@ -1091,7 +1091,8 @@ int Slab_MultiTransfer (cGH             const         * const cctkGH,
       int const srcdetaillenk = srcdetail[n*SLAB_MAXDIM+2].len;
       
       if (n==0) assert (srcoffset[n]==0);
-      if (n<size-1) assert (srcoffset[n+1]==srcoffset[n]+srcdetailleni*srcdetaillenj*srcdetaillenk);
+      /* TODO: This does not take nvars into account */
+/*       if (n<size-1) assert (srcoffset[n+1]==srcoffset[n]+srcdetailleni*srcdetaillenj*srcdetaillenk); */
       
       for (k = 0; k < srcdetaillenk; ++k) {
         for (j = 0; j < srcdetaillenj; ++j) {
@@ -1133,7 +1134,8 @@ int Slab_MultiTransfer (cGH             const         * const cctkGH,
       int const srcdetaillenk = srcdetail[n*SLAB_MAXDIM+2].len;
       
       if (n==0) assert (srcoffset[n]==0);
-      if (n<size-1) assert (srcoffset[n+1]==srcoffset[n]+srcdetailleni*srcdetaillenj*srcdetaillenk);
+      /* TODO: This does not take nvars into account */
+/*       if (n<size-1) assert (srcoffset[n+1]==srcoffset[n]+srcdetailleni*srcdetaillenj*srcdetaillenk); */
       
       for (k = 0; k < srcdetaillenk; ++k) {
         for (j = 0; j < srcdetaillenj; ++j) {