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 1237 by gezelter, Fri Jun 4 14:35:59 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
# Line 30 | Line 25 | contains
25  
26   contains
27  
28 <
34 <  subroutine handleInfo(myRoutine,myMessage)
28 >  subroutine handleInfo(myRoutine, myMessage)
29      character(len=*), intent(inout) :: myRoutine
30      character(len=*), intent(inout) :: myMessage
37    character(len=len_trim(myRoutine) + len_trim(myMessage) + 10) :: cMessage
31    
32 +    painCave%errMsg = "ROUTINE:" // trim(myRoutine) // newline // &
33 +         tab // trim(myMessage) // newline // nullchar
34  
35 <    cMessage = cMessage//"ROUTINE:"//trim(myRoutine)//trim(myMessage)//nullchar
35 >    painCave%severity = OOPSE_INFO
36 >    painCave%isFatal = .false.
37  
38 <    call c_info(cMessage)
38 >    call c_simError(painCave)
39    end subroutine handleInfo
40  
41  
42 <  subroutine handleError(myRoutine,myMessage)
42 >  subroutine handleError(myRoutine, myMessage)
43      character(len=*), intent(in) :: myRoutine
44      character(len=*), intent(in) :: myMessage
49    character(len=len_trim(myRoutine) + len_trim(myMessage) + 10) :: cMessage
45  
46 <    cMessage = cMessage//"ROUTINE:"//trim(myRoutine)//trim(myMessage)//nullchar
46 >    painCave%errMsg = "ROUTINE:" // trim(myRoutine) // newline // &
47 >         tab // trim(myMessage) // newline // nullchar
48  
49 <    call c_error(cMessage)
49 >    painCave%severity = OOPSE_ERROR
50 >    painCave%isFatal = .true.
51 >
52 >    call c_simError(painCave)
53 >    
54    end subroutine handleError
55  
56 <
57 <
58 <
59 <
60 <  subroutine handleWarning(myRoutine,myMessage)
56 >  subroutine handleWarning(myRoutine, myMessage)
57      character(len=*), intent(in) :: myRoutine
58      character(len=*), intent(in) :: myMessage
63    character(len=len_trim(myRoutine) + len_trim(myMessage) + 22) :: cMessage
59  
60 <    cMessage = cMessage//"WARNING FROM ROUTINE: "//trim(myRoutine)//trim(myMessage)//nullchar
60 >    painCave%errMsg = "ROUTINE:" // trim(myRoutine) // newline // &
61 >         tab // trim(myMessage) // newline // nullchar
62  
63 <    call c_warning(cMessage)
64 <  end subroutine handleWarning
63 >    painCave%severity = OOPSE_WARNING
64 >    painCave%isFatal = .false.
65  
66 +    call c_simError(painCave)
67  
68 <
69 <
73 <
74 <
75 <
76 <
77 <
78 <
68 >  end subroutine handleWarning
69 >  
70   end module status

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines