Commit d33a3080 authored by Dan S. Bolintineanu's avatar Dan S. Bolintineanu
Browse files

Minor code clean up in pair_granular.cpp

parent 14d3d09d
Loading
Loading
Loading
Loading
+5 −7
Original line number Diff line number Diff line
@@ -735,24 +735,22 @@ void PairGranular::coeff(int narg, char **arg)
      normal_coeffs_one[1] = force->numeric(FLERR,arg[iarg+2]); // damping
      iarg += 3;
    } else if (strcmp(arg[iarg], "hertz") == 0) {
      int num_coeffs = 2;
      if (iarg + num_coeffs >= narg)
      if (iarg + 2 >= narg)
        error->all(FLERR,"Illegal pair_coeff command, "
                   "not enough parameters provided for Hertz option");
      normal_model_one = HERTZ;
      normal_coeffs_one[0] = force->numeric(FLERR,arg[iarg+1]); // kn
      normal_coeffs_one[1] = force->numeric(FLERR,arg[iarg+2]); // damping
      iarg += num_coeffs+1;
      iarg += 3;
    } else if (strcmp(arg[iarg], "hertz/material") == 0) {
      int num_coeffs = 3;
      if (iarg + num_coeffs >= narg)
      if (iarg + 3 >= narg)
        error->all(FLERR,"Illegal pair_coeff command, "
                   "not enough parameters provided for Hertz/material option");
      normal_model_one = HERTZ_MATERIAL;
      normal_coeffs_one[0] = force->numeric(FLERR,arg[iarg+1]); // E
      normal_coeffs_one[1] = force->numeric(FLERR,arg[iarg+2]); // damping
      normal_coeffs_one[2] = force->numeric(FLERR,arg[iarg+3]); // Poisson's ratio
      iarg += num_coeffs+1;
      iarg += 4;
    } else if (strcmp(arg[iarg], "dmt") == 0) {
      if (iarg + 4 >= narg)
        error->all(FLERR,"Illegal pair_coeff command, "