Replacing CCTK_WARN with CCTK_Warn

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

3 files changed, 10 insertions, 8 deletions

diff --git a/src/main/GroupsOnGH.c b/src/main/GroupsOnGH.c
index caae5cba..73a64069 100644
--- a/src/main/GroupsOnGH.c
+++ b/src/main/GroupsOnGH.c
@@ -76,7 +76,7 @@ void *CCTK_VarDataPtr(cGH *GH, int timelevel, char *fullvarname)
      retval = GH->data[index][timelevel];
   }
   else
-     CCTK_WARN(1,"Invalid index in CCTK_VarDataPtr");
+     CCTK_Warn(1,__LINE__,__FILE__,"Cactus","Invalid index in CCTK_VarDataPtr");
 
 #ifdef DEBUG_GROUPS
   CCTK_PRINTSEPARATOR
@@ -133,7 +133,8 @@ void *CCTK_VarDataPtr(cGH *GH, int timelevel, char *fullvarname)
 void *CCTK_VarDataPtrI(cGH *GH, int timelevel, int varindex)
 { 
   if (varindex < 0) 
-    CCTK_WARN(1,"WARNING: calling CCTK_VarDataPtrI with negative index! Prob. Fatal");
+    CCTK_Warn(1,__LINE__,__FILE__,"Cactus",
+	      "WARNING: calling CCTK_VarDataPtrI with negative index");
   return GH->data[varindex][timelevel];
 }
 
diff --git a/src/main/SetParams.c b/src/main/SetParams.c
index a2b0e424..a5f9ba2d 100644
--- a/src/main/SetParams.c
+++ b/src/main/SetParams.c
@@ -10,17 +10,17 @@
 #include <stdio.h>
 #include <malloc.h>
 
-#include "cctk.h"
-
 /* FIXME - remove this when ActiveThorns doesn't need it */
 #include "SKBinTree.h"
 
+#include "cctk_Types.h"
 #include "cctk_ActiveThorns.h"
-#include "ParameterBindings.h"
-
 #include "cctk_WarnLevel.h"
 #include "cctk_Misc.h"
 
+#include "ParameterBindings.h"
+
+
 int CCTKi_ReallySetParameter(const char *parameter, const char *value);
 int ParameterSet(const char *name,
                  const char *thorn,
@@ -78,7 +78,8 @@ int CCTKi_SetParameter(const char *parameter, const char *value)
     
     if(n_errors)
     {
-      CCTK_WARN(0, "Errors while activating thorns\n");
+      CCTK_Warn(0,__LINE__,__FILE__,"Cactus",
+		"Errors while activating thorns\n");
     }
   }
   else
diff --git a/src/main/rfrInterface.c b/src/main/rfrInterface.c
index 36091326..3cf215de 100644
--- a/src/main/rfrInterface.c
+++ b/src/main/rfrInterface.c
@@ -69,7 +69,7 @@ void rfrTraverse(void *rfr_top, void *data, int when)
     SCHEDULE(TERMINATE);
     SCHEDULE(CONVERGENCE);
     default :
-      CCTK_WARN(0, "Unknown scheduling point"); 
+      CCTK_Warn(0,__LINE__,__FILE__,"Cactus","Unknown scheduling point"); 
   }
 
   return;