ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/status_module.F90
(Generate patch)

Comparing trunk/OOPSE/libmdtools/status_module.F90 (file contents):
Revision 648 by chuckv, Wed Jul 23 22:13:59 2003 UTC vs.
Revision 1239 by gezelter, Fri Jun 4 14:59:27 2004 UTC

# Line 2 | Line 2 | module status
2    implicit none
3    PRIVATE
4  
5 + #define __FORTRAN90
6 + #include "simError.h"
7  
6  integer, parameter :: statusMsgSize = 1000
8    character(len=1), parameter :: nullchar = char(0)
9 < interface
10 <   subroutine c_info(cMessage)
11 <     character(len=*),intent(in) :: cMessage
11 <   end subroutine c_info
9 >  character(len=1), parameter :: newline = char(10)
10 >  character(len=1), parameter :: tab = char(9)
11 >  INTEGER, PARAMETER:: statusMsgSize = MAX_SIM_ERROR_MSG_LENGTH
12  
13 < end interface
14 < interface
15 <   subroutine c_warning(cMessage)
16 <     character(len=*), intent(in) :: cMessage
17 <   end subroutine c_warning
13 > !!$interface
14 > !!$  
15 > !!$   subroutine c_simError(painCave)
16 > !!$     type(errorStruct), pointer :: painCave
17 > !!$   end subroutine c_simError
18 > !!$
19 > !!$end interface
20  
19 end interface
20 interface
21   subroutine c_error(cMessage)
22     character(len=*),intent(in) :: cMessage
23   end subroutine c_error
24 end interface
25
21   public :: handleInfo
22   public :: handleError
23   public :: handleWarning
24   public :: statusMsgSize
25 + public :: nullchar
26 + public :: newline
27 + public :: tab
28  
29   contains
30  
31 <
32 <  subroutine handleInfo(myRoutine,myMessage)
33 <    character(len=*), intent(inout) :: myRoutine
36 <    character(len=*), intent(inout) :: myMessage
37 <    character(len=len_trim(myRoutine) + len_trim(myMessage) + 10) :: cMessage
31 >  subroutine handleInfo(myRoutine, myMessage)
32 >    character(len=*), intent(in) :: myRoutine
33 >    character(len=*), intent(in) :: myMessage
34    
35 +    painCave%errMsg = "Location: " // trim(myRoutine) // newline // &
36 +         tab // trim(myMessage) // newline // nullchar
37  
38 <    cMessage = cMessage//"ROUTINE:"//trim(myRoutine)//trim(myMessage)//nullchar
38 >    painCave%severity = OOPSE_INFO
39 >    painCave%isFatal = .false.
40  
41 <    call c_info(cMessage)
41 >    call c_simError(painCave)
42    end subroutine handleInfo
43  
44  
45 <  subroutine handleError(myRoutine,myMessage)
45 >  subroutine handleError(myRoutine, myMessage)
46      character(len=*), intent(in) :: myRoutine
47      character(len=*), intent(in) :: myMessage
49    character(len=len_trim(myRoutine) + len_trim(myMessage) + 10) :: cMessage
48  
49 <    cMessage = cMessage//"ROUTINE:"//trim(myRoutine)//trim(myMessage)//nullchar
49 >    painCave%errMsg = "Location: " // trim(myRoutine) // newline // &
50 >         tab // trim(myMessage) // newline // nullchar
51  
52 <    call c_error(cMessage)
52 >    painCave%severity = OOPSE_ERROR
53 >    painCave%isFatal = .true.
54 >
55 >    call c_simError(painCave)
56 >    
57    end subroutine handleError
58  
59 <
57 <
58 <
59 <
60 <  subroutine handleWarning(myRoutine,myMessage)
59 >  subroutine handleWarning(myRoutine, myMessage)
60      character(len=*), intent(in) :: myRoutine
61      character(len=*), intent(in) :: myMessage
63    character(len=len_trim(myRoutine) + len_trim(myMessage) + 22) :: cMessage
62  
63 <    cMessage = cMessage//"WARNING FROM ROUTINE: "//trim(myRoutine)//trim(myMessage)//nullchar
63 >    painCave%errMsg = "Location: " // trim(myRoutine) // newline // &
64 >         tab // trim(myMessage) // newline // nullchar
65  
66 <    call c_warning(cMessage)
67 <  end subroutine handleWarning
66 >    painCave%severity = OOPSE_WARNING
67 >    painCave%isFatal = .false.
68  
69 +    call c_simError(painCave)
70  
71 <
72 <
73 <
74 <
75 <
76 <
77 <
78 <
71 >  end subroutine handleWarning
72 >  
73   end module status

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines