Replacing CCTK_WARN with CCTK_Warn

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

4 files changed, 14 insertions, 13 deletions

diff --git a/src/main/Complex.c b/src/main/Complex.c
index 0ea6b950..cba03c24 100644
--- a/src/main/Complex.c
+++ b/src/main/Complex.c
@@ -217,7 +217,7 @@ CCTK_COMPLEX CCTK_CmplxDiv(CCTK_COMPLEX a,CCTK_COMPLEX b)
   }
   else
   {
-    CCTK_WARN(0,"Divide by zero in CCTK_CmplxDiv");
+    CCTK_Warn(0,__LINE__,__FILE__,"Cactus","Divide by zero in CCTK_CmplxDiv");
     div_ab.Re = 0;
     div_ab.Im = 0;
   }
diff --git a/src/main/Coord.c b/src/main/Coord.c
index 9f30b8c4..0d7f9d12 100644
--- a/src/main/Coord.c
+++ b/src/main/Coord.c
@@ -141,7 +141,7 @@ int CCTK_CoordRegisterI(int dir, int index, const char*name)
     char *msg;
     msg = (char *)malloc(200*sizeof(char)+strlen(name));
     sprintf(msg,"Coordinate with name -%s- already registered",name);
-    CCTK_WARN(1,msg);
+    CCTK_Warn(1,__LINE__,__FILE__,"Cactus",msg);
     if (msg) free(msg);
     handle = -1;
   }
@@ -310,7 +310,7 @@ int CCTK_CoordIndex(const char *name)
       char *msg;
       msg = (char *)malloc( 100*sizeof(char)+strlen(name) );
       sprintf(msg,"Could not find registered coordinate %s",name);
-      CCTK_WARN(2,msg);
+      CCTK_Warn(2,__LINE__,__FILE__,"Cactus",msg);
       if (msg) free(msg);
       return ERROR_COORDNOTFOUND;
     }
@@ -347,7 +347,7 @@ int CCTK_CoordDir(const char *name)
       char *msg;
       msg = (char *)malloc( 100*sizeof(char)+strlen(name) );
       sprintf(msg,"Could not find registered coordinate %s",name);
-      CCTK_WARN(2,msg);
+      CCTK_Warn(2,__LINE__,__FILE__,"Cactus",msg);
       if (msg) free(msg);
       return ERROR_COORDNOTFOUND;
     }
@@ -516,7 +516,7 @@ int CCTKi_CoordHandle(const char *name)
       char *msg;
       msg = (char *)malloc( 100*sizeof(char)+strlen(name) );
       sprintf(msg,"Could not find registered coordinate %s",name);
-      CCTK_WARN(2,msg);
+      CCTK_Warn(2,__LINE__,__FILE__,"Cactus",msg);
       if (msg) free(msg);
       return ERROR_COORDNOTFOUND;
     }
@@ -542,7 +542,7 @@ struct Coordprops *CCTKi_CoordData(const char *name)
       char *msg;
       msg = (char *)malloc( 100*sizeof(char)+strlen(name) );
       sprintf(msg,"Could not find registered coordinate %s",name);
-      CCTK_WARN(2,msg);
+      CCTK_Warn(2,__LINE__,__FILE__,"Cactus",msg);
       if (msg) free(msg);
       return NULL;
     }
@@ -614,7 +614,7 @@ CCTK_REAL CCTK_CoordOrigin(const char *name)
       char *msg;
       msg = (char *)malloc( 100*sizeof(char)+strlen(name) );
       sprintf(msg,"Could not find registered coordinate %s",name);
-      CCTK_WARN(2,msg);
+      CCTK_Warn(2,__LINE__,__FILE__,"Cactus",msg);
       if (msg) free(msg);
       return ERROR_COORDNOTFOUND;
     }
diff --git a/src/main/Parameters.c b/src/main/Parameters.c
index 2340e071..6547d233 100644
--- a/src/main/Parameters.c
+++ b/src/main/Parameters.c
@@ -650,7 +650,7 @@ const char *ParameterWalk(int first,
 
     if (startpoint == NULL)
     {
-      CCTK_WARN (2, "ParameterWalk: Cannot walk through parameter list without "
+      CCTK_Warn(2,__LINE__,__FILE__,"Cactus", "ParameterWalk: Cannot walk through parameter list without "
                     "setting a startpoint at first");
       return NULL;
     }
diff --git a/src/main/Stagger.c b/src/main/Stagger.c
index 221ab228..5d1b93fa 100644
--- a/src/main/Stagger.c
+++ b/src/main/Stagger.c
@@ -4,10 +4,11 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "cctk.h"
+#include "cctk_Groups.h"
+#include "cctk_Types.h"
 #include "cctk_FortranString.h"
 #include "cctk_ParameterFunctions.h"
-
+#include "cctk_WarnLevel.h"
 
 static int staggered = 0;
 
@@ -62,7 +63,7 @@ int CCTK_StaggerCodeName(const char *stype) {
       default:
         info   = (char*)malloc (256*sizeof(char));
         sprintf(info,"Unknown stagger type: >%s< \n", stype);
-        CCTK_WARN(1,info);
+        CCTK_Warn(1,__LINE__,__FILE__,"Cactus",info);
         free(info);
         return(-1);
     }
@@ -117,7 +118,7 @@ int CCTK_DirStaggerCodeName(int dir, const char *stype) {
 
   sprintf(hs,"%s",stype);
 
-  if (dir>strlen(hs)) CCTK_WARN(1,"Not enough letters in stagger code");
+  if (dir>strlen(hs)) CCTK_Warn(1,__LINE__,__FILE__,"Cactus","Not enough letters in stagger code");
 
   switch (hs[dir])
     {
@@ -127,7 +128,7 @@ int CCTK_DirStaggerCodeName(int dir, const char *stype) {
     default:
         info   = (char*)malloc (256*sizeof(char));
         sprintf(info,"Unknown stagger type: >%s< \n", hs);
-        CCTK_WARN(1,info);
+        CCTK_Warn(1,__LINE__,__FILE__,"Cactus",info);
         free(info);
         return(-1);
     }