FORTRAN_NAME -> CCTK_FNAME

FMODIFIER -> CCTK_FCALL

Old names will work until beta 9


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

3 files changed, 19 insertions, 8 deletions

diff --git a/lib/sbin/CreateParameterBindings.pl b/lib/sbin/CreateParameterBindings.pl
index 45768004..fc2dd439 100644
--- a/lib/sbin/CreateParameterBindings.pl
+++ b/lib/sbin/CreateParameterBindings.pl
@@ -404,7 +404,7 @@ sub CreateParameterBindings
 
   foreach $structure (keys %structures)
   {
-    print OUT "#define $structure FORTRAN_COMMON_NAME($structures{$structure})\n";
+    print OUT "#define $structure CCTK_FORTRAN_COMMON_NAME($structures{$structure})\n";
   }
 
   print OUT "\n";
diff --git a/lib/sbin/CreateScheduleBindings.pl b/lib/sbin/CreateScheduleBindings.pl
index fa86e0de..af1b0829 100644
--- a/lib/sbin/CreateScheduleBindings.pl
+++ b/lib/sbin/CreateScheduleBindings.pl
@@ -180,7 +180,7 @@ sub ScheduleCreateFile
   $outbuf .=  "{\n";
   $outbuf .=  "  DECLARE_CCTK_PARAMETERS\n";
   $outbuf .=  "$buffer\n";
-  $outbuf .=  "  USE_CCTK_PARAMETERS\n";
+  $outbuf .=  "return;\n";
   $outbuf .=  "}\n";
   $outbuf .=  "\n";
 
@@ -236,7 +236,7 @@ sub ParameterRecoveryCreateFile
 	}
 	elsif($rhschedule_db->{"\U$thorn\E BLOCK_$block LANG"} =~ m:^\s*(F|F77|FORTRAN|F90)\s*$:i )
         {
-	  $block_buffer = "FORTRAN_NAME(".$rhschedule_db->{"\U$thorn\E BLOCK_$block NAME"} .")";
+	  $block_buffer = "CCTK_FNAME(".$rhschedule_db->{"\U$thorn\E BLOCK_$block NAME"} .")";
 	}
 
       $buffer =~ s:\@BLOCK\@$block:result =  $block_buffer();:;
@@ -289,7 +289,6 @@ sub ParameterRecoveryCreateFile
   $outbuf .=  "  int result = 0;\n\n";
   $outbuf .=  "$buffer\n";
   $outbuf .=  "  return (result);\n";
-  $outbuf .=  "  USE_CCTK_PARAMETERS\n";
   $outbuf .=  "}\n";
   $outbuf .=  "\n";
 
@@ -523,7 +522,7 @@ sub ScheduleBlock
     elsif($rhschedule_db->{"\U$thorn\E BLOCK_$block LANG"} =~ m:^\s*(F|F77|FORTRAN|F90)\s*$:i )
     {
       $language = "Fortran";
-      $function = "FORTRAN_NAME(".$rhschedule_db->{"\U$thorn\E BLOCK_$block NAME"} .")";
+      $function = "CCTK_FNAME(".$rhschedule_db->{"\U$thorn\E BLOCK_$block NAME"} .")";
     }
     else
     {
diff --git a/lib/sbin/c_file_processor.pl b/lib/sbin/c_file_processor.pl
index d16619b5..2aaf6512 100644
--- a/lib/sbin/c_file_processor.pl
+++ b/lib/sbin/c_file_processor.pl
@@ -128,7 +128,18 @@ sub fixfnames {
 
   foreach $fline (@flines)
   {
-  
+      while($fline =~ m:CCTK_FNAME\s*\(([^\)]*)\):)
+    {
+        $arglist = $1;
+        $arglist =~ s:[\s\n\t]+::g;
+
+        @args = split(",", $arglist );
+
+        $new = &fortran_name($args[$#args]);
+
+        $fline =~ s:CCTK_FNAME\s*\(([^\)]*)\):$new:;
+    }
+    # DEPRECATED IN BETA 9
     while($fline =~ m:FORTRAN_NAME\s*\(([^\)]*)\):)
     {
         $arglist = $1;
@@ -140,7 +151,8 @@ sub fixfnames {
 
         $fline =~ s:FORTRAN_NAME\s*\(([^\)]*)\):$new:;
     }
-    while($fline =~ m:FORTRAN_COMMON_NAME\s*\(([^\)]*)\):)
+    # END DEPRECATED IN BETA 9
+    while($fline =~ m:CCTK_FORTRAN_COMMON_NAME\s*\(([^\)]*)\):)
     {
         $arglist = $1;
         $arglist =~ s:[\s\n\t]+::g;
@@ -149,7 +161,7 @@ sub fixfnames {
 
         $new = &fortran_common_name($args[$#args]);
 
-        $fline =~ s:FORTRAN_COMMON_NAME\s*\(([^\)]*)\):$new:;
+        $fline =~ s:CCTK_FORTRAN_COMMON_NAME\s*\(([^\)]*)\):$new:;
     }
 
     print $fline;