Removing warnings from rcsid variables.

Tidied include files a bit, removing a few cctk.h's, so I've introduced a few more warnings to fix


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

35 files changed, 113 insertions, 31 deletions

diff --git a/src/main/ActiveThorns.c b/src/main/ActiveThorns.c
index d78eab65..3bfc37b1 100644
--- a/src/main/ActiveThorns.c
+++ b/src/main/ActiveThorns.c
@@ -13,12 +13,15 @@
 
 #include "SKBinTree.h"
 
+#include "cctk_Flesh.h"
 #include "cctk_Config.h"
 #include "cctk_ActiveThorns.h"
 #include "cctk_FortranString.h"
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_ActiveThorns_c)
+
 /* Local routine */
 static int RegisterImp(const char *name, const char *thorn);
 
diff --git a/src/main/Banner.c b/src/main/Banner.c
index 970a6409..73d18e4f 100644
--- a/src/main/Banner.c
+++ b/src/main/Banner.c
@@ -14,12 +14,15 @@
 #include <string.h>
 
 #include "cctk_Config.h"
+#include "cctk_Flesh.h"
 #include "cctk_Parameters.h"
 #include "cctk_Banner.h"
 #include "cctk_FortranString.h"
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_Banner_c)
+
 static int number_banners = 0;
 static char **banner_strings = NULL;
 
diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c
index 7df38f95..162b266a 100644
--- a/src/main/CactusDefaultEvolve.c
+++ b/src/main/CactusDefaultEvolve.c
@@ -19,6 +19,8 @@
 
 static char *rcsid="$Header$";
 
+CCTK_FILEVERSION(main_CactusDefaultEvolve_c)
+
 /* Define some macros for convenience. */
 
 #define ForallConvLevels(iteration, conv_level)  {                     \
diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index e49bb96a..113510fe 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -26,6 +26,8 @@
 
 static char *rcsid = "$Id$";
 
+CCTK_FILEVERSION(main_CactusDefaultInitialise_c)
+
 /* Local function prototypes */
 int CactusInitialiseGH(cGH *GH);
 
diff --git a/src/main/CactusDefaultShutdown.c b/src/main/CactusDefaultShutdown.c
index 03956f97..95f26d8a 100644
--- a/src/main/CactusDefaultShutdown.c
+++ b/src/main/CactusDefaultShutdown.c
@@ -21,6 +21,8 @@
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_CactusDefaultShutdown_c)
+
 #ifdef MPI
 extern char MPI_Active;
 #endif
diff --git a/src/main/CallStartupFunctions.c b/src/main/CallStartupFunctions.c
index caf44190..f6951255 100644
--- a/src/main/CallStartupFunctions.c
+++ b/src/main/CallStartupFunctions.c
@@ -8,13 +8,14 @@
    @version $Header$
  @@*/
 
-static char *rcsid = "$Header$";
-
 #include <stdio.h>
 
 #include "cctk_Flesh.h"
 #include "cctk_Schedule.h"
 
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_CallStartupFunctions_c)
 
  /*@@
    @routine    CCTKi_CallStartupFunctions
diff --git a/src/main/CommandLine.c b/src/main/CommandLine.c
index b1446bfe..8ff8442c 100644
--- a/src/main/CommandLine.c
+++ b/src/main/CommandLine.c
@@ -30,6 +30,8 @@
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_CommandLine_c)
+
 /*Prototypes for some functions */
 
 char *compileTime(void);
diff --git a/src/main/Complex.c b/src/main/Complex.c
index cba03c24..a083dc4b 100644
--- a/src/main/Complex.c
+++ b/src/main/Complex.c
@@ -7,13 +7,15 @@
    @enddesc 
  @@*/
 
-static char *rcsid = "$Header$";
-
 #include <math.h>
 
-#include "cctk.h"
+#include "cctk_Flesh.h"
 #include "cctk_Complex.h"
 
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_Complex_c)
+
  /*@@
    @routine    CCTK_Cmplx
    @date       Tue Dec 14 12:16:01 1999
diff --git a/src/main/ConfigData.c b/src/main/ConfigData.c
index b919ad31..5aff3991 100644
--- a/src/main/ConfigData.c
+++ b/src/main/ConfigData.c
@@ -14,6 +14,8 @@
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_ConfigData_c)
+
  /*@@
    @routine    CCTKi_AddGH
    @date       Fri Jan 15 13:43:11 1999
diff --git a/src/main/Coord.c b/src/main/Coord.c
index 9d5a8279..df7ec733 100644
--- a/src/main/Coord.c
+++ b/src/main/Coord.c
@@ -9,16 +9,21 @@
 
 /*#define DEBUG_COORD*/
 
-static char *rcsid = "$Header$";
-
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "cctk.h"
+#include "cctk_Flesh.h"
+#include "cctk_Coord.h"
+#include "cctk_WarnLevel.h"
+#include "cctk_Groups.h"
 #include "StoreHandledData.h"
 #include "ErrorCodes.h"
 #include "cctk_FortranString.h"
 
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_Coord_c)
+
 struct Coordprops
 { 
   char *    name;
diff --git a/src/main/DefaultTimers.c b/src/main/DefaultTimers.c
index abdb04df..6890b6dd 100644
--- a/src/main/DefaultTimers.c
+++ b/src/main/DefaultTimers.c
@@ -7,12 +7,11 @@
    @enddesc 
  @@*/
 
-static char *rcsid = "$Header$";
-
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "cctk_Config.h"
+#include "cctk_Flesh.h"
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -27,6 +26,10 @@ static char *rcsid = "$Header$";
 
 #include "CactusTimers.h"
 
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_DefaultTimers_c)
+
 /* Prototypes for registration functions */
 
 #ifdef HAVE_TIME_GETTIMEOFDAY
diff --git a/src/main/Dummies.c b/src/main/Dummies.c
index 3100ab75..39f03bf9 100644
--- a/src/main/Dummies.c
+++ b/src/main/Dummies.c
@@ -8,8 +8,11 @@
  @@*/
 
 #include "Dummies.h"
+#include "cctk_Flesh.h"
 
-static char *rcsid = "$Id$";
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_Dummies_c)
 
 int CCTKi_DummyStorageOn(void *GH, int group)
 {
diff --git a/src/main/FortranWrappers.c b/src/main/FortranWrappers.c
index a7366e25..d0312044 100644
--- a/src/main/FortranWrappers.c
+++ b/src/main/FortranWrappers.c
@@ -7,14 +7,17 @@
    @enddesc 
  @@*/
 
-static char *rcsid = "$Header$";
-
 #include <stdlib.h>
 
 #include "cctki_FortranWrappers.h"
+#include "cctk_Flesh.h"
 
 #include "StoreNamedData.h"
 
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_FortranWrappers_c)
+
 static pNamedData *registry = NULL;
 
  /*@@
diff --git a/src/main/GHExtensions.c b/src/main/GHExtensions.c
index 9cb2ce32..1206f318 100644
--- a/src/main/GHExtensions.c
+++ b/src/main/GHExtensions.c
@@ -20,6 +20,7 @@
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_GHExtensions_c)
 
 /* Local data holding info on extensions..*/
 
diff --git a/src/main/Groups.c b/src/main/Groups.c
index 2de69206..4d4d2791 100644
--- a/src/main/Groups.c
+++ b/src/main/Groups.c
@@ -14,6 +14,7 @@
 
 #include "cctk_WarnLevel.h"
 #include "cctk_Config.h"
+#include "cctk_Flesh.h"
 #include "cctk_Groups.h"
 #include "cctk_Types.h"
 #include "cctk_Constants.h"
@@ -25,6 +26,8 @@
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_Groups_c)
+
 /* Typedefs. */
 typedef struct 
 {
diff --git a/src/main/GroupsOnGH.c b/src/main/GroupsOnGH.c
index 4e95426b..ebc41804 100644
--- a/src/main/GroupsOnGH.c
+++ b/src/main/GroupsOnGH.c
@@ -23,6 +23,7 @@
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_GroupsOnGH_c)
 
  /*@@
    @routine    CCTK_VarDataPtr
diff --git a/src/main/InitialiseCactus.c b/src/main/InitialiseCactus.c
index 46f7b313..27fbc891 100644
--- a/src/main/InitialiseCactus.c
+++ b/src/main/InitialiseCactus.c
@@ -7,8 +7,6 @@
    @enddesc 
  @@*/
 
-static char *rcsid = "$Header$";
-
 #include <stdio.h>
 
 #include "cctk.h"
@@ -17,6 +15,10 @@ static char *rcsid = "$Header$";
 #include "cctk_Schedule.h"
 #include "cctki_Schedule.h"
 
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_InitialiseCactus_c)
+
 int ProcessCommandLine(int *inargc, char ***inargv, tFleshConfig *ConfigData);
 int ProcessEnvironment(int *argc, char ***argv,tFleshConfig *ConfigData);
 
diff --git a/src/main/InitialiseDataStructures.c b/src/main/InitialiseDataStructures.c
index 341efff1..604875cd 100644
--- a/src/main/InitialiseDataStructures.c
+++ b/src/main/InitialiseDataStructures.c
@@ -7,8 +7,6 @@
    @enddesc 
  @@*/
 
-static char *rcsid = "$Id$";
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -21,6 +19,9 @@ static char *rcsid = "$Id$";
 /* FIXME - remove this when ActiveThorns doesn't need it */
 #include "SKBinTree.h"
 
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_InitialiseDataStructures_c)
 
  /*@@
    @routine    CCTKi_InitialiseDataStructures
diff --git a/src/main/Names.c b/src/main/Names.c
index 8d69279d..c9311d6c 100644
--- a/src/main/Names.c
+++ b/src/main/Names.c
@@ -13,11 +13,13 @@
 #include <ctype.h>
 
 #include "cctki_Names.h"
-
+#include "cctk_Flesh.h"
 #include "util_Hash.h"
 
 static char *rcsid="$Header$";
 
+CCTK_FILEVERSION(main_Names_c)
+
 /********************************************************************
  *********************     Local Data Types   ***********************
  ********************************************************************/
diff --git a/src/main/OverloadMain.c b/src/main/OverloadMain.c
index b2eafc10..93947882 100644
--- a/src/main/OverloadMain.c
+++ b/src/main/OverloadMain.c
@@ -18,6 +18,8 @@
 
 static char *rcsid="$Header$";
 
+CCTK_FILEVERSION(main_OverloadMain_c)
+
 /* Define the prototypes for the dummy functions. */
 #define OVERLOADABLE(name) OVERLOADABLE_DUMMYPROTOTYPE(name)
 
diff --git a/src/main/Parameters.c b/src/main/Parameters.c
index 74a9cd83..92ac7774 100644
--- a/src/main/Parameters.c
+++ b/src/main/Parameters.c
@@ -15,19 +15,25 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "cctk.h"
+#include "cctk_Flesh.h"
 
 #include "SKBinTree.h"
 
 #include "cctk_ActiveThorns.h"
 
 #include "ParameterBindings.h"
+#include "cctk_Parameters.h"
+#include "cctk_WarnLevel.h"
+#include "cctk_Misc.h"
+
 #include "cctk_Parameter.h"
 
 #include "cctk_GNU.h"
 
 static char *rcsid="$Header$";
 
+CCTK_FILEVERSION(main_Parameters_c)
+
 /********************************************************************
  *********************     Local Data Types   ***********************
  ********************************************************************/
@@ -675,7 +681,7 @@ char *CCTK_ParameterValString (const char *param_name,
       break;
 
     default:
-      CCTK_VWarn (3, __LINE__, __FILE__, CCTK_THORNSTRING,
+      CCTK_VWarn (3, __LINE__, __FILE__, "Cactus",
                   "Unknown type %d for parameter '%s::%s'",
                   param_type, thorn, param_name);
       retval = NULL;
diff --git a/src/main/ProcessCommandLine.c b/src/main/ProcessCommandLine.c
index 6da26f87..7ed8a131 100644
--- a/src/main/ProcessCommandLine.c
+++ b/src/main/ProcessCommandLine.c
@@ -15,6 +15,8 @@
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_ProcessCommandLine_c)
+
 static int argc;
 
 static char **argv;
diff --git a/src/main/ProcessEnvironment.c b/src/main/ProcessEnvironment.c
index acfed99e..b6b8793b 100644
--- a/src/main/ProcessEnvironment.c
+++ b/src/main/ProcessEnvironment.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "cctk.h"
+#include "cctk_Flesh.h"
 
 #ifdef MPI
 #include "mpi.h"
@@ -35,6 +35,8 @@
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_ProcessEnvironment_c)
+
 #ifdef MPI
 char MPI_Active = 0;
 #endif
diff --git a/src/main/ProcessParameterDatabase.c b/src/main/ProcessParameterDatabase.c
index a7489d3b..6eef75e4 100644
--- a/src/main/ProcessParameterDatabase.c
+++ b/src/main/ProcessParameterDatabase.c
@@ -15,6 +15,8 @@
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_ProcessParameterDatabase_c)
+
 int ParseFile(FILE *ifp, 
               int (*set_function)(const char *, const char *));
 
diff --git a/src/main/RecordImplementation.c b/src/main/RecordImplementation.c
index 600b4371..4a4c2883 100644
--- a/src/main/RecordImplementation.c
+++ b/src/main/RecordImplementation.c
@@ -15,6 +15,8 @@
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_RecordImplementation_c)
+
 typedef struct 
 {
   int n_thorns;
diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c
index 7848f27b..3dede194 100644
--- a/src/main/ScheduleInterface.c
+++ b/src/main/ScheduleInterface.c
@@ -8,8 +8,6 @@
    @version $Header$
  @@*/
 
-static char *rcsid = "$Header$";
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -35,6 +33,11 @@ static char *rcsid = "$Header$";
 
 #include "CactusTimers.h"
 
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_ScheduleImplementation_c)
+
+
 /********************************************************************
  *********************     Local Data Types   ***********************
  ********************************************************************/
diff --git a/src/main/SetParams.c b/src/main/SetParams.c
index a0c92eda..2ab5011d 100644
--- a/src/main/SetParams.c
+++ b/src/main/SetParams.c
@@ -18,6 +18,7 @@
 #include "cctk_ActiveThorns.h"
 #include "cctk_WarnLevel.h"
 #include "cctk_Misc.h"
+#include "cctk_Flesh.h"
 
 #include "ParameterBindings.h"
 
@@ -31,7 +32,9 @@ int CCTK_ParameterSet(
    const char *value
    );
        
-static char *rcsid = "$Id$";
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_SetParams_c)
 
  /*@@
    @routine    CCTKi_SetParameter
diff --git a/src/main/SetupCache.c b/src/main/SetupCache.c
index 7b503d3c..0d061b88 100644
--- a/src/main/SetupCache.c
+++ b/src/main/SetupCache.c
@@ -7,14 +7,17 @@
    @enddesc 
  @@*/
 
-static char *rcsid = "$Header$";
-
 #include <stdlib.h>
 
 #include "cctk_Config.h"
+#include "cctk_Flesh.h"
 #include "cctki_Cache.h"
 #include "cctk_Parameters.h"
 
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_SetupCache_c)
+
 /********************************************************************
  *********************   CCTK Local Routines   **********************
  ********************************************************************/
diff --git a/src/main/ShutdownCactus.c b/src/main/ShutdownCactus.c
index 6bdcd385..d7dc69fa 100644
--- a/src/main/ShutdownCactus.c
+++ b/src/main/ShutdownCactus.c
@@ -15,8 +15,9 @@
 #include "cctk_Schedule.h"
 #include "cctk_Parameters.h"
 
-static char *rcsid = "$Id$";
+static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_ShutdownCactus_c)
 
  /*@@
    @routine    CCTKi_ShutdownCactus
diff --git a/src/main/Stagger.c b/src/main/Stagger.c
index d4f6f5c9..5e45e8df 100644
--- a/src/main/Stagger.c
+++ b/src/main/Stagger.c
@@ -18,9 +18,11 @@
 #include "cctk_FortranString.h"
 #include "cctk_WarnLevel.h"
 #include "cctki_Stagger.h"
+#include "cctk_Flesh.h"
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_Stagger_c)
 
 /********************************************************************
  *********************     Local Data   *****************************
diff --git a/src/main/Startup.c b/src/main/Startup.c
index 2cddd3fa..a7900de7 100644
--- a/src/main/Startup.c
+++ b/src/main/Startup.c
@@ -7,6 +7,12 @@
    @enddesc 
  @@*/
 
+#include "cctk_Flesh.h"
+
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_Startup_c)
+
 int CactusStartup(void)
 {
   
diff --git a/src/main/Subsystems.c b/src/main/Subsystems.c
index 9c225632..ac7134c6 100644
--- a/src/main/Subsystems.c
+++ b/src/main/Subsystems.c
@@ -7,10 +7,11 @@
    @enddesc 
  @@*/
 
-static char *rcsid = "$Header$";
-
 #include "cctk_Flesh.h"
 
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(main_Subsystems_c)
 
  /*@@
    @routine    CCTKi_InitialiseSubsystemDefaults
diff --git a/src/main/WarnLevel.c b/src/main/WarnLevel.c
index 6b30b468..9a211749 100644
--- a/src/main/WarnLevel.c
+++ b/src/main/WarnLevel.c
@@ -22,11 +22,14 @@
 #include "cctk_FortranString.h"
 #include "cctk_Parameters.h"
 #include "cctk_Comm.h"
+#include "cctk_Flesh.h"
 
 int CactusDefaultMyProc(void *GH);
 
 static char *rcsid = "$Header$";
 
+CCTK_FILEVERSION(main_WarnLevel_c)
+
 /* Store the number of parameter errors */
 
 static int param_errors = 0;
diff --git a/src/main/flesh.cc b/src/main/flesh.cc
index 8565cd10..ccb57206 100644
--- a/src/main/flesh.cc
+++ b/src/main/flesh.cc
@@ -11,7 +11,7 @@
 #include "cctk_Flesh.h"
 #include "CactusMainFunctions.h"
 
-static char *rcsid = "$Id$";
+static char *rcsid = "$Header$";
 
 CCTK_FILEVERSION(main_flesh_cc)
 
diff --git a/src/main/rfrInterface.c b/src/main/rfrInterface.c
index 00b2ce96..20db90f5 100644
--- a/src/main/rfrInterface.c
+++ b/src/main/rfrInterface.c
@@ -21,10 +21,11 @@
 #include "rfrInterface.h"
 #include "cctk_Schedule.h"
 #include "cctki_GHExtensions.h"
+#include "cctki_Schedule.h"
 
 static char *rcsid = "$Header$";
 
-#include "cctki_Schedule.h"
+CCTK_FILEVERSION(main_rfrInterface_c)
 
 #define SCHEDULE(x) case CCTK_ ## x : CCTK_ScheduleTraverse("CCTK_" #x, data, NULL); break