1 files changed, 38 insertions, 55 deletions

diff --git a/src/ParseGeometry.c b/src/ParseGeometry.c
index b060708..ad003f9 100644
--- a/src/ParseGeometry.c
+++ b/src/ParseGeometry.c
@@ -22,7 +22,7 @@ void IOJpeg_DefaultGeo(cGH *GH, int sdim, IOJpegGeo_t *geo) {
     [CCTK_GHExtensionHandle ("IOASCII")];
 
   geo->vdim = -1;
-  geo->sdim = -1;
+  geo->sdim = sdim;
 
   for (idim=0;idim<SLABSKEL_MAXDIM;idim++) {
     geo->direction[idim] = idim;
@@ -75,68 +75,51 @@ void IOJpeg_DefaultGeo(cGH *GH, int sdim, IOJpegGeo_t *geo) {
 }
 
 
-int IOJpeg_NumDirection(int sdim, int vdim)
+int IOJpeg_SetDirection (IOJpegGeo_t *geometry, int direction)
 {
-  int numdir=-1;
-  if (vdim==3) {
-    switch (sdim) { 
-      case 1: return(3);
-      case 2: return(3);
-      case 3: return(1);
-    }
-  } else if (vdim==2) {
-    switch (sdim) { 
-      case 1: return(2);
-      case 2: return(1);
-    }
-  }
-  else if (vdim==1) {
-    switch (sdim) { 
-      case 1: return(1);
-    }
-  }
-  else printf("Bad dimension: %d \n",vdim);
-  return(numdir);
-}
+  int retval = 0;
 
-int IOJpeg_SetDirection(int vdim, int sdim, int ci, int *direction)
-{
-  int retval=0;
 
-  if (sdim>vdim) {
-    printf("SetDirection: slabdim gt vdim");
-    return(-1);
-  }
-  
-  if (vdim==3) {
-    if (sdim==2) {
-      switch (ci) { 
-        case 0: direction[0]=0; direction[1]=1;  break;
-        case 1: direction[0]=0; direction[1]=2;  break;
-        case 2: direction[0]=1; direction[1]=2;  break;
+  if (geometry->vdim == 3)
+  {
+    if (geometry->sdim == 2)
+    {
+      switch (direction)
+      { 
+        case 0: geometry->direction[0]=0; geometry->direction[1]=1;  break;
+        case 1: geometry->direction[0]=0; geometry->direction[1]=2;  break;
+        case 2: geometry->direction[0]=1; geometry->direction[1]=2;  break;
       }
     }
-    else if (sdim==1) {
-      switch (ci) { 
-        case 0: direction[0]=0; break;
-        case 1: direction[0]=1; break;
-        case 2: direction[0]=2; break;
+    else if (geometry->sdim == 1)
+    {
+      switch (direction)
+      {
+        case 0: geometry->direction[0]=0; break;
+        case 1: geometry->direction[0]=1; break;
+        case 2: geometry->direction[0]=2; break;
       }
     }
   }
-  else if (vdim==2) {
-    if (sdim==2) {
-      direction[0]=0; direction[1]=1; 
-    } else if (sdim==1) {
-      switch (ci) { 
-        case 0: direction[0]=0; break;
-        case 1: direction[0]=1; break;
+  else if (geometry->vdim==2)
+  {
+    if (geometry->sdim == 2)
+    {
+      geometry->direction[0]=0; geometry->direction[1]=1; 
+    }
+    else if (geometry->sdim == 1)
+    {
+      switch (direction)
+      {
+        case 0: geometry->direction[0]=0; break;
+        case 1: geometry->direction[0]=1; break;
       }
     }
-  } else retval = -1;
-  return(retval);
+  }
+  else
+  {
+    retval = -1;
+  }
+
+  return (retval);
 }
-    
-      
-    
-