Changed CCTK_Warns t CCTK_WARN so that I can try and pass thorught the

line number and file name to the Warn message. This hass problems:

1) I really need to include cctk.h then (for some reason) in WarnLevel.h,
   but then I guess the Fortran name for CCTK_Warn is CCTK_WARN so it
   doesn't much care for me having a macro for CCTK_WARN.

2) Now I need three fortran strings to be passed into C. This works at
   the moment on Linux, but not on other machines, so you may need to
   run with warnings off for a little while.

3) Fortran doesn't get the file name, because (?) it is actually
   something from a pipe which gets preprocessed and not the file.
   I have no idea how to fix this.

I may just scrap all this, but I want to persevere a bit

Oh, there is a new parameter cctk_full_warnings (default yes for now)
which gives the old style warnings with no.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/util/Misc.c b/src/util/Misc.c
index 2c6b5874..6af6cf1d 100644
--- a/src/util/Misc.c
+++ b/src/util/Misc.c
@@ -117,17 +117,17 @@ int CCTK_Equals(const char *string1, const char *string2)
     {
       message = (char *)malloc((100+sizeof(string2))*sizeof(char));
       sprintf(message,"First string null in CCTK_Equals (2nd is %s)",string2); 
-      CCTK_Warn(0,"CCTK",message);
+      CCTK_WARN(0,message);
     }
     else if (string1 && !string2)
     { 
       message = (char *)malloc((100+sizeof(string1))*sizeof(char));
       sprintf(message,"Second string null in CCTK_Equals (1st is %s)",string1); 
-      CCTK_Warn(0,"CCTK",message);
+      CCTK_WARN(0,message);
     }     
     else
     {
-      CCTK_Warn(0,"CCTK","Both strings null in CCTK_Equals");
+      CCTK_WARN(0,"Both strings null in CCTK_Equals");
     }
   }
 
@@ -682,7 +682,7 @@ int CCTK_SetLogical(int *data, const char *value)
   }
   else
   {
-    CCTK_Warn(1,"CCTK","Logical not set in CCTK_SetLogical");
+    CCTK_WARN(1,"Logical not set in CCTK_SetLogical");
     retval = -1;
   }