From 0a3464eb30eed3940d04e9ad005c4c403613e989 Mon Sep 17 00:00:00 2001 From: Steve Plimpton Date: Tue, 23 Aug 2016 15:27:02 -0600 Subject: [PATCH] test --- src/finish.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/finish.cpp b/src/finish.cpp index 40f54480f9..8fff3a8a54 100644 --- a/src/finish.cpp +++ b/src/finish.cpp @@ -162,10 +162,17 @@ void Finish::end(int flag) if (screen) fprintf(screen,fmt2,cpu_loop,nprocs,nthreads); if (logfile) fprintf(logfile,fmt2,cpu_loop,nprocs,nthreads); #else - const char fmt2[] = - "%.1f%% CPU use with %d MPI tasks x no OpenMP threads\n"; - if (screen) fprintf(screen,fmt2,cpu_loop,nprocs); - if (logfile) fprintf(logfile,fmt2,cpu_loop,nprocs); + if (lmp->kokkos) { + const char fmt2[] = + "%.1f%% CPU use with %d MPI tasks x %d OpenMP threads\n"; + if (screen) fprintf(screen,fmt2,cpu_loop,nprocs,lmp->kokkos->num_threads); + if (logfile) fprintf(logfile,fmt2,cpu_loop,nprocs,lmp->kokkos->num_threads); + } else { + const char fmt2[] = + "%.1f%% CPU use with %d MPI tasks x no OpenMP threads\n"; + if (screen) fprintf(screen,fmt2,cpu_loop,nprocs); + if (logfile) fprintf(logfile,fmt2,cpu_loop,nprocs); + } #endif }