Merge lp:~asc/fluidity/here into lp:fluidity

[Adam Candy]

A new debugging function FLHere(string) which prints out filename:linenumber followed by 'string' - much like FLExit and FLAbort. This function will not be called in release code, but is useful for debugging.

[Adam Candy (asc)]

I've had some feedback on this request, and plan to make changes shortly, when I have time - watch this space.

Unmerged revisions

3570. By Adam Candy on 2011-09-02

A new debugging function FLHere(string) which prints out filename:linenumber followed by 'string' - much like FLExit and FLAbort. This function will not be called in release code, but is useful for debugging.

=== modified file 'debug/Debug.F90'
--- debug/Debug.F90	2011-04-22 16:21:29 +0000
+++ debug/Debug.F90	2011-09-02 21:06:25 +0000
@@ -123,6 +123,20 @@
     STOP
   END SUBROUTINE FLExit_pinpoint
 
+  SUBROUTINE FLHere_pinpoint(HereStr, FromFile, LineNumber)
+
+    CHARACTER*(*) HereStr, FromFile
+    INTEGER LineNumber
+    LOGICAL UsingMPI
+    INTEGER IERR
+#ifndef NDEBUG
+    ewrite(-1,FMT='(3A,I0,2A)') "Here at: ", FromFile, ":", LineNumber, " ", HereStr
+#else
+    ewrite(-1,FMT='(2A)') "Here: ", HereStr
+#endif
+    
+  END SUBROUTINE FLHere_pinpoint
+
   subroutine write_minmax_real_array(array, array_expression)
     ! the array to print its min and max of
     real, dimension(:), intent(in):: array

=== modified file 'include/fdebug.h'
--- include/fdebug.h	2011-04-22 16:21:29 +0000
+++ include/fdebug.h	2011-09-02 21:06:25 +0000
@@ -55,6 +55,7 @@
 
 #define FLAbort(X) call FLAbort_pinpoint(X, __FILE__, __LINE__)
 #define FLExit(X) call FLExit_pinpoint(X, __FILE__, __LINE__)
+#define FLHere(X) call FLHere_pinpoint(X, __FILE__, __LINE__)
 
 ! #define FORTRAN_DISALLOWS_LONG_LINES
 #ifdef NDEBUG