Take the ScratchSpace pointers from VarIndex instead of making assumptions about memory layout.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/MoL/trunk@22 578cdeb0-5ea1-4b81-8215-5a3b8777ee0b

1 files changed, 6 insertions, 1 deletions

diff --git a/src/InitialCopy.c b/src/InitialCopy.c
index 160fdee..6388550 100644
--- a/src/InitialCopy.c
+++ b/src/InitialCopy.c
@@ -225,7 +225,12 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
                                                SandRVariableIndex[var]);
     CurrentVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0, 
                                               SandRVariableIndex[var]);
-    ScratchVar = &SandRScratchSpace[var*totalsize];
+    /*
+      ScratchVar = &SandRScratchSpace[var*totalsize];
+    */
+    ScratchVar = CCTK_VarDataPtrI(cctkGH, 0, 
+                                  CCTK_FirstVarIndex("MOL::SCRATCHSPACE")
+                                  + var);
 #ifdef MOLDEBUG
     printf("Pointers for the SandR vars are to %ld, %ld and %ld.\n",
            PreviousVar, CurrentVar, ScratchVar);