Fixed bad logging output

MintonGroup · Sep 20, 2021 · 5331785 · 5331785
1 parent 3fb9f93
commit 5331785
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/kick/kick.f90 b/src/kick/kick.f90
@@ -53,14 +53,22 @@ module subroutine kick_getacch_int_pl(self, param)
             call itimer%adapt(param, self, self%nplpl)
             write(schar,'(I1)') itimer%stage
             write(nstr,*) self%nplpl
-            write(cstr,*) itimer%count_finish_step
+            write(cstr,*) itimer%count_finish_step - itimer%count_start_step
             select case(itimer%stage)
             case(1)
                write(mstr,*) itimer%stage1_metric
             case(2)
                write(mstr,*) itimer%stage2_metric
             end select
-            call io_log_one_message(INTERACTION_TIMER_LOG_OUT, trim(adjustl(lstyle)) // " " // trim(adjustl(cstr)) // " " // trim(adjustl(nstr)) // " " // trim(adjustl(mstr)))
+            call io_log_one_message(INTERACTION_TIMER_LOG_OUT, adjustl(lstyle) // " " // trim(adjustl(cstr)) // " " // trim(adjustl(nstr)) // " " // trim(adjustl(mstr)))
+            if (itimer%stage == 2) then
+               if (param%lflatten_interactions) then
+                  write(lstyle,*) "FLAT      "
+               else
+                  write(lstyle,*) "TRIANGULAR"
+               end if 
+               call io_log_one_message(INTERACTION_TIMER_LOG_OUT, "The fastest loop method tested is " // trim(adjustl(lstyle)))
+            end if
          end if
       end if
 

diff --git a/src/symba/symba_kick.f90 b/src/symba/symba_kick.f90
@@ -59,15 +59,17 @@ module subroutine symba_kick_getacch_int_pl(self, param)
             case(1)
                write(mstr,*) itimer%stage1_metric
             case(2)
+               write(mstr,*) itimer%stage2_metric
+            end select
+            call io_log_one_message(INTERACTION_TIMER_LOG_OUT, adjustl(lstyle) // " " // trim(adjustl(cstr)) // " " // trim(adjustl(nstr)) // " " // trim(adjustl(mstr)))
+            if (itimer%stage == 2) then
                if (param%lflatten_interactions) then
                   write(lstyle,*) "FLAT      "
                else
                   write(lstyle,*) "TRIANGULAR"
                end if 
-               write(mstr,*) itimer%stage2_metric
                call io_log_one_message(INTERACTION_TIMER_LOG_OUT, "The fastest loop method tested is " // trim(adjustl(lstyle)))
-            end select
-            call io_log_one_message(INTERACTION_TIMER_LOG_OUT, adjustl(lstyle) // " " // trim(adjustl(cstr)) // " " // trim(adjustl(nstr)) // " " // trim(adjustl(mstr)))
+            end if
          end if
       end if