Fix for an implementation with more than one thorn

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

1 files changed, 11 insertions, 5 deletions

diff --git a/lib/sbin/GridFuncStuff.pl b/lib/sbin/GridFuncStuff.pl
index a74f9dc2..1c4e4d20 100644
--- a/lib/sbin/GridFuncStuff.pl
+++ b/lib/sbin/GridFuncStuff.pl
@@ -193,11 +193,9 @@ sub GetThornArguments
     next if (! defined $imp);
 
     $interface_database{"IMPLEMENTATION \U$imp\E THORNS"} =~ m:([^ ]*):;
-
+    
     $thorn = $1;
 
-#    print "This thorn is $thorn, implementation $imp\n";
-
     foreach $group (split(" ",$interface_database{"\U$thorn $block GROUPS\E"}))
     {
       $vtype = $interface_database{"\U$thorn GROUP $group VTYPE\E"};
@@ -216,7 +214,7 @@ sub GetThornArguments
 	  $sep = ",";
 	  if($block eq "PRIVATE")
 	  {
-	    $arguments{"$group$dim"} = "STORAGESIZE($thorn\::$group, $dim)";
+	    $arguments{"$group$dim"} = "STORAGESIZE($this_thorn\::$group, $dim)";
 	  }
 	  else
 	  {
@@ -228,7 +226,7 @@ sub GetThornArguments
 
       if($block eq "PRIVATE")
       {
-	$type .= "!$thorn\::$group";
+	$type .= "!$this_thorn\::$group";
       }
       else
       {
@@ -877,6 +875,14 @@ sub CreateThornArgumentHeaderFile
     
     %data = &GetThornArguments($thorn, $block, %interface_database);
 
+    $print_data = 0;
+    if ($print_data)
+    {
+      foreach $arg (keys data)
+      {
+	print "$thorn data: $arg : $data{\"$arg\"}\n";
+      }
+    }
     # Remember if there actually are any arguments here.
     $hasvars{$block} = 1 if(keys %data > 0) ;