whitespace fixes

doc/src/fix_wall_gran.rst

@@ -96,8 +96,8 @@ Specifically, delta = radius - r = overlap of particle with wall, m_eff
 = mass of particle, and the effective radius of contact = RiRj/Ri+Rj is
 set to the radius of the particle.
 
-The parameters *Kn*\ , *Kt*\ , *gamma_n*, *gamma_t*, *xmu*, *dampflag*, 
+The parameters *Kn*\ , *Kt*\ , *gamma_n*, *gamma_t*, *xmu*, *dampflag*,
-and the optional keyword *limit_damping* 
+and the optional keyword *limit_damping*
 have the same meaning and units as those specified with the
 :doc:`pair_style gran/\* <pair_gran>` commands.  This means a NULL can be
 used for either *Kt* or *gamma_t* as described on that page.  If a

doc/src/fix_wall_gran_region.rst

@@ -181,8 +181,8 @@ radius - r = overlap of particle with wall, m_eff = mass of particle,
 and the effective radius of contact is just the radius of the
 particle.
 
-The parameters *Kn*\ , *Kt*\ , *gamma_n*, *gamma_t*, *xmu*, *dampflag*, 
+The parameters *Kn*\ , *Kt*\ , *gamma_n*, *gamma_t*, *xmu*, *dampflag*,
-and the optional keyword *limit_damping* 
+and the optional keyword *limit_damping*
 have the same meaning and units as those specified with the
 :doc:`pair_style gran/\* <pair_gran>` commands.  This means a NULL can be
 used for either *Kt* or *gamma_t* as described on that page.  If a

doc/src/pair_gran.rst

@@ -217,11 +217,11 @@ potential is used as a sub-style of :doc:`pair_style hybrid <pair_hybrid>`, then
 pair_coeff command to determine which atoms interact via a granular
 potential.
 
-If two particles are moving away from each other while in contact, there 
+If two particles are moving away from each other while in contact, there
-is a possibility that the particles could experience an effective attractive 
+is a possibility that the particles could experience an effective attractive
-force due to damping. If the *limit_damping* keyword is used, this option 
+force due to damping. If the *limit_damping* keyword is used, this option
 will zero out the normal component of the force if there is an effective
-attractive force. 
+attractive force.
 
 ----------
 

doc/src/pair_granular.rst

@@ -623,9 +623,9 @@ Finally, the twisting torque on each particle is given by:
 
 ----------
 
-If two particles are moving away from each other while in contact, there 
+If two particles are moving away from each other while in contact, there
-is a possibility that the particles could experience an effective attractive 
+is a possibility that the particles could experience an effective attractive
-force due to damping. If the optional *limit_damping* keyword is used, this option 
+force due to damping. If the optional *limit_damping* keyword is used, this option
 will zero out the normal component of the force if there is an effective
 attractive force. This keyword cannot be used with the JKR or DMT models.
 
@@ -665,9 +665,9 @@ then LAMMPS will use that cutoff for the specified atom type
 combination, and automatically set pairwise cutoffs for the remaining
 atom types.
 
-If two particles are moving away from each other while in contact, there 
+If two particles are moving away from each other while in contact, there
-is a possibility that the particles could experience an effective attractive 
+is a possibility that the particles could experience an effective attractive
-force due to damping. If the *limit_damping* keyword is used, this option 
+force due to damping. If the *limit_damping* keyword is used, this option
 will zero out the normal component of the force if there is an effective
 attractive force. This keyword cannot be used with the JKR or DMT models.
 

src/GRANULAR/fix_wall_gran.cpp

@@ -119,12 +119,12 @@ FixWallGran::FixWallGran(LAMMPS *lmp, int narg, char **arg) :
       kt /= force->nktv2p;
     }
     iarg = 10;
-    
+
     if (strcmp(arg[iarg],"limit_damping") == 0) {
       limit_damping = 1;
-      iarg += 1;    
+      iarg += 1;
     }
-    
+
   } else {
     iarg = 4;
     damping_model = VISCOELASTIC;
@@ -310,7 +310,7 @@ FixWallGran::FixWallGran(LAMMPS *lmp, int narg, char **arg) :
         break;
       } else if (strcmp(arg[iarg],"limit_damping") == 0) {
         limit_damping = 1;
-        iarg += 1;        
+        iarg += 1;
       } else {
         error->all(FLERR, "Illegal fix wall/gran command");
       }
@@ -530,7 +530,7 @@ void FixWallGran::init()
       roll_history_index += 1;
       twist_history_index += 1;
     }
-    
+
     if (damping_model == TSUJI) {
       double cor = normal_coeffs[1];
       normal_coeffs[1] = 1.2728-4.2783*cor+11.087*pow(cor,2)-22.348*pow(cor,3)+
@@ -1020,7 +1020,7 @@ void FixWallGran::hertz_history(double rsq, double dx, double dy, double dz,
   else polyhertz = sqrt((radius-r)*radius*rwall/(rwall+radius));
   ccel *= polyhertz;
   if (limit_damping && (ccel < 0.0)) ccel = 0.0;
-  
+
   // relative velocities
 
   vtr1 = vt1 - (dz*wr2-dy*wr3);
@@ -1305,7 +1305,7 @@ void FixWallGran::granular(double rsq, double dx, double dy, double dz,
         history[thist2] -= rsht*nz;
 
         // also rescale to preserve magnitude
-        prjmag = sqrt(history[thist0]*history[thist0] + 
+        prjmag = sqrt(history[thist0]*history[thist0] +
             history[thist1]*history[thist1] + history[thist2]*history[thist2]);
         if (prjmag > 0) scalefac = shrmag/prjmag;
         else scalefac = 0;

src/GRANULAR/pair_gran_hooke_history.cpp

@@ -370,7 +370,7 @@ void PairGranHookeHistory::settings(int narg, char **arg)
   xmu = utils::numeric(FLERR,arg[4],false,lmp);
   dampflag = utils::inumeric(FLERR,arg[5],false,lmp);
   if (dampflag == 0) gammat = 0.0;
-  
+
   limit_damping = 0;
   if (narg == 7) {
     if (strcmp(arg[6], "limit_damping") == 0) limit_damping = 1;

src/GRANULAR/pair_granular.cpp

@@ -80,7 +80,7 @@ PairGranular::PairGranular(LAMMPS *lmp) : Pair(lmp)
   onerad_frozen = nullptr;
   maxrad_dynamic = nullptr;
   maxrad_frozen = nullptr;
-   
+
   limit_damping = nullptr;
 
   history_transfer_factors = nullptr;
@@ -796,7 +796,7 @@ void PairGranular::coeff(int narg, char **arg)
   twist_model_one = TWIST_NONE;
   damping_model_one = VISCOELASTIC;
   int ld_flag = 0;
-  
+
   int iarg = 2;
   while (iarg < narg) {
     if (strcmp(arg[iarg], "hooke") == 0) {
@@ -971,7 +971,7 @@ void PairGranular::coeff(int narg, char **arg)
       cutoff_one = utils::numeric(FLERR,arg[iarg+1],false,lmp);
       iarg += 2;
     } else if (strcmp(arg[iarg], "limit_damping") == 0) {
-      ld_flag = 1;        
+      ld_flag = 1;
       iarg += 1;
     } else error->all(FLERR, "Illegal pair_coeff command");
   }
@@ -1047,7 +1047,7 @@ void PairGranular::coeff(int narg, char **arg)
     }
   }
 
-  
+
   if (count == 0) error->all(FLERR,"Incorrect args for pair coefficients");
 }
 
@@ -1320,7 +1320,7 @@ void PairGranular::write_restart(FILE *fp)
         fwrite(&tangential_model[i][j],sizeof(int),1,fp);
         fwrite(&roll_model[i][j],sizeof(int),1,fp);
         fwrite(&twist_model[i][j],sizeof(int),1,fp);
-        fwrite(&limit_damping[i][j],sizeof(int),1,fp);        
+        fwrite(&limit_damping[i][j],sizeof(int),1,fp);
         fwrite(normal_coeffs[i][j],sizeof(double),4,fp);
         fwrite(tangential_coeffs[i][j],sizeof(double),3,fp);
         fwrite(roll_coeffs[i][j],sizeof(double),3,fp);