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

Fixes normal force calculation bug in fix wall granular, allows twisting to be...

Fixes normal force calculation bug in fix wall granular, allows twisting to be used without rolling in fix/wall/gran
parent e08146c3
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -1149,11 +1149,11 @@ void FixWallGran::granular(double rsq, double dx, double dy, double dz,
  else{
    knfac = E; //Hooke
    a = sqrt(dR);
    Fne = knfac*delta;
    if (normal_model != HOOKE) {
      Fne *= a;
      knfac *= a;
    }
    Fne = knfac*delta;
    if (normal_model == DMT)
      Fne -= 4*MY_PI*normal_coeffs[3]*Reff;
  }
@@ -1294,10 +1294,12 @@ void FixWallGran::granular(double rsq, double dx, double dy, double dz,
  // rolling resistance
  //****************************************

  if (roll_model != ROLL_NONE) {
  if (roll_model != ROLL_NONE || twist_model != NONE) {
    relrot1 = omega[0];
    relrot2 = omega[1];
    relrot3 = omega[2];
  }
  if (roll_model != ROLL_NONE){

    // rolling velocity, see eq. 31 of Wang et al, Particuology v 23, p 49 (2015)
    // This is different from the Marshall papers,