Merge branch release-2016

[alexxy/gromacs.git] / src / gromacs / gmxlib / nrnb.cpp

diff --git a/src/gromacs/gmxlib/nrnb.cpp b/src/gromacs/gmxlib/nrnb.cpp
index 93d3333ff647ec904880ab0c798d567bd27df45b..4bc3f67230888a05c9d20651976d2411cd33997d 100644 (file)
--- a/src/gromacs/gmxlib/nrnb.cpp
+++ b/src/gromacs/gmxlib/nrnb.cpp
@@ -336,19 +336,19 @@ void print_flop(FILE *out, t_nrnb *nrnb, double *nbfs, double *mflop)
     *nbfs = 0.0;
     for (i = 0; (i < eNR_NBKERNEL_ALLVSALLGB); i++)
     {
-        if (std::strstr(nbdata[i].name, "W3-W3") != NULL)
+        if (std::strstr(nbdata[i].name, "W3-W3") != nullptr)
         {
             *nbfs += 9e-6*nrnb->n[i];
         }
-        else if (std::strstr(nbdata[i].name, "W3") != NULL)
+        else if (std::strstr(nbdata[i].name, "W3") != nullptr)
         {
             *nbfs += 3e-6*nrnb->n[i];
         }
-        else if (std::strstr(nbdata[i].name, "W4-W4") != NULL)
+        else if (std::strstr(nbdata[i].name, "W4-W4") != nullptr)
         {
             *nbfs += 10e-6*nrnb->n[i];
         }
-        else if (std::strstr(nbdata[i].name, "W4") != NULL)
+        else if (std::strstr(nbdata[i].name, "W4") != nullptr)
         {
             *nbfs += 4e-6*nrnb->n[i];
         }
@@ -416,7 +416,7 @@ void print_flop(FILE *out, t_nrnb *nrnb, double *nbfs, double *mflop)
             *mflop += mni*flop;
             frac    = 100.0*mni*flop/tflop;
             tfrac  += frac;
-            if (out != NULL)
+            if (out != nullptr)
             {
                 fprintf(out, " %-32s %16.6f %15.3f  %6.1f\n",
                         nbdata[i].name, mni, mni*flop, frac);
@@ -465,7 +465,7 @@ void print_perf(FILE *out, double time_per_thread, double time_per_node,
             mflop         = mflop/time_per_node;
             wallclocktime = nsteps*delta_t;
 
-            if (getenv("GMX_DETAILED_PERF_STATS") == NULL)
+            if (getenv("GMX_DETAILED_PERF_STATS") == nullptr)
             {
                 fprintf(out, "%12s %12s %12s\n",
                         "", "(ns/day)", "(hour/ns)");
@@ -484,7 +484,7 @@ void print_perf(FILE *out, double time_per_thread, double time_per_node,
         }
         else
         {
-            if (getenv("GMX_DETAILED_PERF_STATS") == NULL)
+            if (getenv("GMX_DETAILED_PERF_STATS") == nullptr)
             {
                 fprintf(out, "%12s %14s\n",
                         "", "(steps/hour)");