Merge branch 'release-4-6' into release-5-0

[alexxy/gromacs.git] / src / gromacs / mdlib / ns.c

diff --git a/src/gromacs/mdlib/ns.c b/src/gromacs/mdlib/ns.c
index 6558e2be9cfe51e3347fb4c7b8f180169c34144f..5208983deccab7cc9b8e44c25ab7ba293a59f4cb 100644 (file)
--- a/src/gromacs/mdlib/ns.c
+++ b/src/gromacs/mdlib/ns.c
@@ -291,7 +291,10 @@ void init_neighbor_list(FILE *log, t_forcerec *fr, int homenr)
             )
         {
             fr->solvent_opt = esolNO;
-            fprintf(log, "Note: The available nonbonded kernels do not support water optimization - disabling.\n");
+            if (log != NULL)
+            {
+                fprintf(log, "Note: The available nonbonded kernels do not support water optimization - disabling.\n");
+            }
         }
 
         if (fr->efep != efepNO)