From 5b47b0b09811320fd7283d252f3ea80f58e13b3a Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Fri, 18 Oct 2019 07:14:35 -0400
Subject: [PATCH] formatting and reduce compiler warnings

---
 src/GRANULAR/fix_wall_gran.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/GRANULAR/fix_wall_gran.cpp b/src/GRANULAR/fix_wall_gran.cpp
index a6e67e06ff..c8eec53a1d 100644
--- a/src/GRANULAR/fix_wall_gran.cpp
+++ b/src/GRANULAR/fix_wall_gran.cpp
@@ -1143,8 +1143,7 @@ void FixWallGran::granular(double rsq, double dx, double dy, double dz,
     a2 = a*a;
     knfac = normal_coeffs[0]*a;
     Fne = knfac*a2/Reff - TWOPI*a2*sqrt(4*coh*E/(M_PI*a));
-  }
-  else{
+  } else {
     knfac = E; //Hooke
     a = sqrt(dR);
     Fne = knfac*delta;
@@ -1158,16 +1157,13 @@ void FixWallGran::granular(double rsq, double dx, double dy, double dz,
 
   if (damping_model == VELOCITY) {
     damp_normal = 1;
-  }
-  else if (damping_model == MASS_VELOCITY) {
+  } else if (damping_model == MASS_VELOCITY) {
     damp_normal = meff;
-  }
-  else if (damping_model == VISCOELASTIC) {
+  } else if (damping_model == VISCOELASTIC) {
     damp_normal = a*meff;
-  }
-  else if (damping_model == TSUJI) {
+  } else if (damping_model == TSUJI) {
     damp_normal = sqrt(meff*knfac);
-  }
+  } else damp_normal = 0.0;
 
   damp_normal_prefactor = normal_coeffs[1]*damp_normal;
   Fdamp = -damp_normal_prefactor*vnnr;