From 5ecbb8bd0130881b97370e24f7a48ef2daf5b77d Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Fri, 1 Mar 2019 09:46:13 -0500
Subject: [PATCH] fix int vs. bigint issue and add NULL file pointer check to
 dynamical_matrix

---
 src/USER-PHONON/dynamical_matrix.cpp | 5 +++--
 src/USER-PHONON/dynamical_matrix.h   | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/USER-PHONON/dynamical_matrix.cpp b/src/USER-PHONON/dynamical_matrix.cpp
index cef59b3a63..372f4e4e31 100644
--- a/src/USER-PHONON/dynamical_matrix.cpp
+++ b/src/USER-PHONON/dynamical_matrix.cpp
@@ -316,9 +316,10 @@ void DynamicalMatrix::calculateMatrix()
 
 void DynamicalMatrix::writeMatrix(double **dynmat)
 {
-    if (me != 0)
-        return;
+    if (me != 0 || fp == NULL) return;
+
     // print file comment lines
+
     if (!binaryflag && fp) {
         clearerr(fp);
         for (int i = 0; i < 3; i++) {
diff --git a/src/USER-PHONON/dynamical_matrix.h b/src/USER-PHONON/dynamical_matrix.h
index 187968c8f7..56de814e97 100644
--- a/src/USER-PHONON/dynamical_matrix.h
+++ b/src/USER-PHONON/dynamical_matrix.h
@@ -54,10 +54,10 @@ namespace LAMMPS_NS {
         double conv_mass;
         double del;
         int igroup,groupbit;
-        int gcount;  // number of atoms in group
+        bigint gcount;             // number of atoms in group
+        bigint dynlen;             // rank of dynamical matrix
         int scaleflag;
         int me;
-        bigint dynlen;
         int *groupmap;
 
         int compressed;            // 1 if dump file is written compressed, 0 no
@@ -71,4 +71,4 @@ namespace LAMMPS_NS {
 
 
 #endif //LMP_DYNAMICAL_MATRIX_H
-#endif
\ No newline at end of file
+#endif