Bug fixes from Tom

git-svn-id: http://svn.cactuscode.org/flesh/trunk@260 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 18 insertions, 4 deletions

diff --git a/lib/sbin/GridFuncStuff.pl b/lib/sbin/GridFuncStuff.pl
index b2141940..726ea14c 100644
--- a/lib/sbin/GridFuncStuff.pl
+++ b/lib/sbin/GridFuncStuff.pl
@@ -212,12 +212,26 @@ sub GetThornArguments
 	{
 	  $type .= "$sep$group$dim";
 	  $sep = ",";
-	  $arguments{"$group$dim"} = "STORAGESIZE($thorn:$group, $dim)";
+	  if($block eq "PRIVATE")
+	  {
+	    $arguments{"$group$dim"} = "STORAGESIZE($thorn\::$group, $dim)";
+	  }
+	  else
+	  {
+	    $arguments{"$group$dim"} = "STORAGESIZE($imp\::$group, $dim)";
+	  }
 	}
 	$type .= ")";
       }
 
-      $type .= "!$thorn:$group";
+      if($block eq "PRIVATE")
+      {
+	$type .= "!$thorn\::$group";
+      }
+      else
+      {
+	$type .= "!$imp\::$group";
+      }
 
 #      print "Group is $group, resulting type is $type\n";
 
@@ -401,9 +415,9 @@ sub CreateCArgumentInitialisers
   {
     if($arguments{$argument} !~ m:STORAGESIZE:)
     {
-      $arguments{$argument} =~ m:([^ ]*) ?(.*)?!(.*):;
+      $arguments{$argument} =~ m,([^ ]*) ?(.*)?!(.*)\::(.*),;
 
-      push(@initialisers, "if(CCTKARGNUM_$argument == -1) CCTKARGNUM_$argument = CCTK_GetVarNum(\"$3\")");
+      push(@initialisers, "if(CCTKARGNUM_$argument == -1) CCTKARGNUM_$argument = CCTK_GetVarNum(\"$3\", \"$4\",\"$argument\")");
     }
   }