Skip to content

Commit

Permalink
Deployed new logger wrappers in toolbox
Browse files Browse the repository at this point in the history
  • Loading branch information
@Simkern
Simkern committed Feb 3, 2025
1 parent 6312300 commit 0894d9f
Show file tree
Hide file tree
Showing 15 changed files with 305 additions and 305 deletions.
36 changes: 18 additions & 18 deletions src/AbstractLinops.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,11 +483,11 @@ subroutine reset_counter(self, trans, procedure, counter, reset_timer, soft_rese
if ( count_old /= 0 .or. counter_ /= 0) then
if (trans) then
write(msg,'(A,I0,A,I0,A)') 'Total number of rmatvecs: ', count_old, '. Resetting counter to ', counter_, '.'
call logger%log_message(msg, module=this_module, procedure='reset_counter('//trim(procedure)//')')
call log_message(msg, module=this_module, procedure='reset_counter('//trim(procedure)//')')
self%rmatvec_counter = counter_
else
write(msg,'(A,I0,A,I0,A)') 'Total number of matvecs: ', count_old, '. Resetting counter to ', counter_, '.'
call logger%log_message(msg, module=this_module, procedure='reset_counter('//trim(procedure)//')')
call log_message(msg, module=this_module, procedure='reset_counter('//trim(procedure)//')')
self%matvec_counter = counter_
end if
end if
Expand Down Expand Up @@ -554,12 +554,12 @@ subroutine apply_matvec_rsp(self, vec_in, vec_out)
character(len=128) :: msg
self%matvec_counter = self%matvec_counter + 1
write(msg,'(I0,1X,A)') self%matvec_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='matvec')
call log_debug(msg, module=this_module, procedure='matvec')
call self%matvec_timer%start()
call self%matvec(vec_in, vec_out)
call self%matvec_timer%stop()
write(msg,'(I0,1X,A)') self%matvec_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='matvec')
call log_debug(msg, module=this_module, procedure='matvec')
return
end subroutine apply_matvec_rsp

Expand All @@ -571,12 +571,12 @@ subroutine apply_rmatvec_rsp(self, vec_in, vec_out)
character(len=128) :: msg
self%rmatvec_counter = self%rmatvec_counter + 1
write(msg,'(I0,1X,A)') self%rmatvec_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='rmatvec')
call log_debug(msg, module=this_module, procedure='rmatvec')
call self%rmatvec_timer%start()
call self%rmatvec(vec_in, vec_out)
call self%rmatvec_timer%stop()
write(msg,'(I0,1X,A)') self%rmatvec_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='rmatvec')
call log_debug(msg, module=this_module, procedure='rmatvec')
return
end subroutine apply_rmatvec_rsp
subroutine apply_matvec_rdp(self, vec_in, vec_out)
Expand All @@ -587,12 +587,12 @@ subroutine apply_matvec_rdp(self, vec_in, vec_out)
character(len=128) :: msg
self%matvec_counter = self%matvec_counter + 1
write(msg,'(I0,1X,A)') self%matvec_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='matvec')
call log_debug(msg, module=this_module, procedure='matvec')
call self%matvec_timer%start()
call self%matvec(vec_in, vec_out)
call self%matvec_timer%stop()
write(msg,'(I0,1X,A)') self%matvec_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='matvec')
call log_debug(msg, module=this_module, procedure='matvec')
return
end subroutine apply_matvec_rdp

Expand All @@ -604,12 +604,12 @@ subroutine apply_rmatvec_rdp(self, vec_in, vec_out)
character(len=128) :: msg
self%rmatvec_counter = self%rmatvec_counter + 1
write(msg,'(I0,1X,A)') self%rmatvec_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='rmatvec')
call log_debug(msg, module=this_module, procedure='rmatvec')
call self%rmatvec_timer%start()
call self%rmatvec(vec_in, vec_out)
call self%rmatvec_timer%stop()
write(msg,'(I0,1X,A)') self%rmatvec_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='rmatvec')
call log_debug(msg, module=this_module, procedure='rmatvec')
return
end subroutine apply_rmatvec_rdp
subroutine apply_matvec_csp(self, vec_in, vec_out)
Expand All @@ -620,12 +620,12 @@ subroutine apply_matvec_csp(self, vec_in, vec_out)
character(len=128) :: msg
self%matvec_counter = self%matvec_counter + 1
write(msg,'(I0,1X,A)') self%matvec_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='matvec')
call log_debug(msg, module=this_module, procedure='matvec')
call self%matvec_timer%start()
call self%matvec(vec_in, vec_out)
call self%matvec_timer%stop()
write(msg,'(I0,1X,A)') self%matvec_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='matvec')
call log_debug(msg, module=this_module, procedure='matvec')
return
end subroutine apply_matvec_csp

Expand All @@ -637,12 +637,12 @@ subroutine apply_rmatvec_csp(self, vec_in, vec_out)
character(len=128) :: msg
self%rmatvec_counter = self%rmatvec_counter + 1
write(msg,'(I0,1X,A)') self%rmatvec_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='rmatvec')
call log_debug(msg, module=this_module, procedure='rmatvec')
call self%rmatvec_timer%start()
call self%rmatvec(vec_in, vec_out)
call self%rmatvec_timer%stop()
write(msg,'(I0,1X,A)') self%rmatvec_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='rmatvec')
call log_debug(msg, module=this_module, procedure='rmatvec')
return
end subroutine apply_rmatvec_csp
subroutine apply_matvec_cdp(self, vec_in, vec_out)
Expand All @@ -653,12 +653,12 @@ subroutine apply_matvec_cdp(self, vec_in, vec_out)
character(len=128) :: msg
self%matvec_counter = self%matvec_counter + 1
write(msg,'(I0,1X,A)') self%matvec_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='matvec')
call log_debug(msg, module=this_module, procedure='matvec')
call self%matvec_timer%start()
call self%matvec(vec_in, vec_out)
call self%matvec_timer%stop()
write(msg,'(I0,1X,A)') self%matvec_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='matvec')
call log_debug(msg, module=this_module, procedure='matvec')
return
end subroutine apply_matvec_cdp

Expand All @@ -670,12 +670,12 @@ subroutine apply_rmatvec_cdp(self, vec_in, vec_out)
character(len=128) :: msg
self%rmatvec_counter = self%rmatvec_counter + 1
write(msg,'(I0,1X,A)') self%rmatvec_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='rmatvec')
call log_debug(msg, module=this_module, procedure='rmatvec')
call self%rmatvec_timer%start()
call self%rmatvec(vec_in, vec_out)
call self%rmatvec_timer%stop()
write(msg,'(I0,1X,A)') self%rmatvec_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='rmatvec')
call log_debug(msg, module=this_module, procedure='rmatvec')
return
end subroutine apply_rmatvec_cdp

Expand Down
12 changes: 6 additions & 6 deletions src/AbstractLinops.fypp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ contains
if ( count_old /= 0 .or. counter_ /= 0) then
if (trans) then
write(msg,'(A,I0,A,I0,A)') 'Total number of rmatvecs: ', count_old, '. Resetting counter to ', counter_, '.'
call logger%log_message(msg, module=this_module, procedure='reset_counter('//trim(procedure)//')')
call log_message(msg, module=this_module, procedure='reset_counter('//trim(procedure)//')')
self%rmatvec_counter = counter_
else
write(msg,'(A,I0,A,I0,A)') 'Total number of matvecs: ', count_old, '. Resetting counter to ', counter_, '.'
call logger%log_message(msg, module=this_module, procedure='reset_counter('//trim(procedure)//')')
call log_message(msg, module=this_module, procedure='reset_counter('//trim(procedure)//')')
self%matvec_counter = counter_
end if
end if
Expand Down Expand Up @@ -303,12 +303,12 @@ contains
character(len=128) :: msg
self%matvec_counter = self%matvec_counter + 1
write(msg,'(I0,1X,A)') self%matvec_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='matvec')
call log_debug(msg, module=this_module, procedure='matvec')
call self%matvec_timer%start()
call self%matvec(vec_in, vec_out)
call self%matvec_timer%stop()
write(msg,'(I0,1X,A)') self%matvec_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='matvec')
call log_debug(msg, module=this_module, procedure='matvec')
return
end subroutine apply_matvec_${type[0]}$${kind}$

Expand All @@ -320,12 +320,12 @@ contains
character(len=128) :: msg
self%rmatvec_counter = self%rmatvec_counter + 1
write(msg,'(I0,1X,A)') self%rmatvec_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='rmatvec')
call log_debug(msg, module=this_module, procedure='rmatvec')
call self%rmatvec_timer%start()
call self%rmatvec(vec_in, vec_out)
call self%rmatvec_timer%stop()
write(msg,'(I0,1X,A)') self%rmatvec_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='rmatvec')
call log_debug(msg, module=this_module, procedure='rmatvec')
return
end subroutine apply_rmatvec_${type[0]}$${kind}$
#:endfor
Expand Down
18 changes: 9 additions & 9 deletions src/AbstractSystems.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ subroutine reset_eval_counter(self, procedure, counter, reset_timer, soft_reset,
reset_timer_ = optval(reset_timer, .true.)
if (count_old /= 0 .or. counter_ /= 0) then
write(msg,'(A,I0,A,I0,A)') 'Total number of evals: ', count_old, '. Resetting counter to ', counter_, '.'
call logger%log_message(msg, module=this_module, procedure='reset_eval_counter('//trim(procedure)//')')
call log_message(msg, module=this_module, procedure='reset_eval_counter('//trim(procedure)//')')
self%eval_counter = counter_
end if
if (reset_timer_) call self%reset_timer(soft_reset, clean_timer)
Expand Down Expand Up @@ -276,12 +276,12 @@ subroutine eval_rsp(self, vec_in, vec_out, atol)
character(len=128) :: msg
self%eval_counter = self%eval_counter + 1
write(msg,'(I0,1X,A)') self%eval_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='response')
call log_debug(msg, module=this_module, procedure='response')
call self%eval_timer%start()
call self%response(vec_in, vec_out, atol)
call self%eval_timer%stop()
write(msg,'(I0,1X,A)') self%eval_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='response')
call log_debug(msg, module=this_module, procedure='response')
return
end subroutine eval_rsp
subroutine eval_rdp(self, vec_in, vec_out, atol)
Expand All @@ -293,12 +293,12 @@ subroutine eval_rdp(self, vec_in, vec_out, atol)
character(len=128) :: msg
self%eval_counter = self%eval_counter + 1
write(msg,'(I0,1X,A)') self%eval_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='response')
call log_debug(msg, module=this_module, procedure='response')
call self%eval_timer%start()
call self%response(vec_in, vec_out, atol)
call self%eval_timer%stop()
write(msg,'(I0,1X,A)') self%eval_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='response')
call log_debug(msg, module=this_module, procedure='response')
return
end subroutine eval_rdp
subroutine eval_csp(self, vec_in, vec_out, atol)
Expand All @@ -310,12 +310,12 @@ subroutine eval_csp(self, vec_in, vec_out, atol)
character(len=128) :: msg
self%eval_counter = self%eval_counter + 1
write(msg,'(I0,1X,A)') self%eval_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='response')
call log_debug(msg, module=this_module, procedure='response')
call self%eval_timer%start()
call self%response(vec_in, vec_out, atol)
call self%eval_timer%stop()
write(msg,'(I0,1X,A)') self%eval_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='response')
call log_debug(msg, module=this_module, procedure='response')
return
end subroutine eval_csp
subroutine eval_cdp(self, vec_in, vec_out, atol)
Expand All @@ -327,12 +327,12 @@ subroutine eval_cdp(self, vec_in, vec_out, atol)
character(len=128) :: msg
self%eval_counter = self%eval_counter + 1
write(msg,'(I0,1X,A)') self%eval_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='response')
call log_debug(msg, module=this_module, procedure='response')
call self%eval_timer%start()
call self%response(vec_in, vec_out, atol)
call self%eval_timer%stop()
write(msg,'(I0,1X,A)') self%eval_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='response')
call log_debug(msg, module=this_module, procedure='response')
return
end subroutine eval_cdp

Expand Down
6 changes: 3 additions & 3 deletions src/AbstractSystems.fypp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ contains
reset_timer_ = optval(reset_timer, .true.)
if (count_old /= 0 .or. counter_ /= 0) then
write(msg,'(A,I0,A,I0,A)') 'Total number of evals: ', count_old, '. Resetting counter to ', counter_, '.'
call logger%log_message(msg, module=this_module, procedure='reset_eval_counter('//trim(procedure)//')')
call log_message(msg, module=this_module, procedure='reset_eval_counter('//trim(procedure)//')')
self%eval_counter = counter_
end if
if (reset_timer_) call self%reset_timer(soft_reset, clean_timer)
Expand Down Expand Up @@ -155,12 +155,12 @@ contains
character(len=128) :: msg
self%eval_counter = self%eval_counter + 1
write(msg,'(I0,1X,A)') self%eval_counter, 'start'
call logger%log_debug(msg, module=this_module, procedure='response')
call log_debug(msg, module=this_module, procedure='response')
call self%eval_timer%start()
call self%response(vec_in, vec_out, atol)
call self%eval_timer%stop()
write(msg,'(I0,1X,A)') self%eval_counter, 'end'
call logger%log_debug(msg, module=this_module, procedure='response')
call log_debug(msg, module=this_module, procedure='response')
return
end subroutine eval_${type[0]}$${kind}$
#:endfor
Expand Down
16 changes: 8 additions & 8 deletions src/BaseKrylov.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1707,7 +1707,7 @@ subroutine qr_no_pivoting_rsp(Q, R, info, tol)
flag = .true.
info = j
write(msg,'(A,I0,A,E15.8)') 'Colinear column detected after ', j, ' steps. beta= ', abs(beta)
call logger%log_information(msg, module=this_module, procedure='qr_no_pivoting_rsp')
call log_information(msg, module=this_module, procedure='qr_no_pivoting_rsp')
end if
R(j, j) = zero_rsp
call Q(j)%rand()
Expand Down Expand Up @@ -1772,7 +1772,7 @@ subroutine qr_with_pivoting_rsp(Q, R, perm, info, tol)
enddo
info = j
write(msg,'(A,I0,A,E15.8)') 'Breakdown after ', j, ' steps. R_ii= ', abs(Rii(idx))
call logger%log_information(msg, module=this_module, procedure='qr_with_pivoting_rsp')
call log_information(msg, module=this_module, procedure='qr_with_pivoting_rsp')
exit qr_step
endif

Expand Down Expand Up @@ -1978,7 +1978,7 @@ subroutine qr_no_pivoting_rdp(Q, R, info, tol)
flag = .true.
info = j
write(msg,'(A,I0,A,E15.8)') 'Colinear column detected after ', j, ' steps. beta= ', abs(beta)
call logger%log_information(msg, module=this_module, procedure='qr_no_pivoting_rdp')
call log_information(msg, module=this_module, procedure='qr_no_pivoting_rdp')
end if
R(j, j) = zero_rdp
call Q(j)%rand()
Expand Down Expand Up @@ -2043,7 +2043,7 @@ subroutine qr_with_pivoting_rdp(Q, R, perm, info, tol)
enddo
info = j
write(msg,'(A,I0,A,E15.8)') 'Breakdown after ', j, ' steps. R_ii= ', abs(Rii(idx))
call logger%log_information(msg, module=this_module, procedure='qr_with_pivoting_rdp')
call log_information(msg, module=this_module, procedure='qr_with_pivoting_rdp')
exit qr_step
endif

Expand Down Expand Up @@ -2250,7 +2250,7 @@ subroutine qr_no_pivoting_csp(Q, R, info, tol)
flag = .true.
info = j
write(msg,'(A,I0,A,E15.8)') 'Colinear column detected after ', j, ' steps. beta= ', abs(beta)
call logger%log_information(msg, module=this_module, procedure='qr_no_pivoting_csp')
call log_information(msg, module=this_module, procedure='qr_no_pivoting_csp')
end if
R(j, j) = zero_rsp
call Q(j)%rand()
Expand Down Expand Up @@ -2315,7 +2315,7 @@ subroutine qr_with_pivoting_csp(Q, R, perm, info, tol)
enddo
info = j
write(msg,'(A,I0,A,E15.8)') 'Breakdown after ', j, ' steps. R_ii= ', abs(Rii(idx))
call logger%log_information(msg, module=this_module, procedure='qr_with_pivoting_csp')
call log_information(msg, module=this_module, procedure='qr_with_pivoting_csp')
exit qr_step
endif

Expand Down Expand Up @@ -2523,7 +2523,7 @@ subroutine qr_no_pivoting_cdp(Q, R, info, tol)
flag = .true.
info = j
write(msg,'(A,I0,A,E15.8)') 'Colinear column detected after ', j, ' steps. beta= ', abs(beta)
call logger%log_information(msg, module=this_module, procedure='qr_no_pivoting_cdp')
call log_information(msg, module=this_module, procedure='qr_no_pivoting_cdp')
end if
R(j, j) = zero_rdp
call Q(j)%rand()
Expand Down Expand Up @@ -2588,7 +2588,7 @@ subroutine qr_with_pivoting_cdp(Q, R, perm, info, tol)
enddo
info = j
write(msg,'(A,I0,A,E15.8)') 'Breakdown after ', j, ' steps. R_ii= ', abs(Rii(idx))
call logger%log_information(msg, module=this_module, procedure='qr_with_pivoting_cdp')
call log_information(msg, module=this_module, procedure='qr_with_pivoting_cdp')
exit qr_step
endif

Expand Down
4 changes: 2 additions & 2 deletions src/BaseKrylov.fypp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ contains
flag = .true.
info = j
write(msg,'(A,I0,A,E15.8)') 'Colinear column detected after ', j, ' steps. beta= ', abs(beta)
call logger%log_information(msg, module=this_module, procedure='qr_no_pivoting_${type[0]}$${kind}$')
call log_information(msg, module=this_module, procedure='qr_no_pivoting_${type[0]}$${kind}$')
end if
R(j, j) = zero_r${kind}$
call Q(j)%rand()
Expand Down Expand Up @@ -956,7 +956,7 @@ contains
enddo
info = j
write(msg,'(A,I0,A,E15.8)') 'Breakdown after ', j, ' steps. R_ii= ', abs(Rii(idx))
call logger%log_information(msg, module=this_module, procedure='qr_with_pivoting_${type[0]}$${kind}$')
call log_information(msg, module=this_module, procedure='qr_with_pivoting_${type[0]}$${kind}$')
exit qr_step
endif

Expand Down
Loading

0 comments on commit 0894d9f

Please sign in to comment.