Commit bfacab7b authored by Jibril B. Coulibaly's avatar Jibril B. Coulibaly
Browse files

remove non-compliant comments

parent a5acf165
Loading
Loading
Loading
Loading
+8 −9
Original line number Diff line number Diff line
@@ -464,8 +464,8 @@ void PairGranular::compute(int eflag, int vflag)
            } else fs1 = fs2 = fs3 = 0.0;
          }
        } else { // classic pair gran/hooke (no history)
          fs = damp_tangential*vrel; // From documentation: F_{t,damp} = - \eta_t v_{t,rel}, no need for extra `meff`
          if (vrel != 0.0) Ft = MIN(Fscrit,fs) / vrel; // From documentation: critical force `Fscrit` used, not elastic normal force `Fne`
          fs = damp_tangential*vrel;
          if (vrel != 0.0) Ft = MIN(Fscrit,fs) / vrel;
          else Ft = 0.0;
          fs1 = -Ft*vtr1;
          fs2 = -Ft*vtr2;
@@ -635,7 +635,7 @@ void PairGranular::compute(int eflag, int vflag)
            torque[j][2] -= torroll3;
          }
        }
        if (evflag) ev_tally_xyz(i,j,nlocal,0,//Should `newton_pair` passed instead of 0 ?
        if (evflag) ev_tally_xyz(i,j,nlocal,0,
            0.0,0.0,fx,fy,fz,delx,dely,delz);
      }
    }
@@ -1475,7 +1475,6 @@ double PairGranular::single(int i, int j, int itype, int jtype,
      if (neighprev >= jnum) neighprev = 0;
      if (jlist[neighprev] == j) break;
    }
	// the `history` pointer must not be modified here in single() function. already calculated in the compute() function. If modified here it changes the pair forces that have friction/twisting/rolling and history effects !
    history = &allhistory[size_history*neighprev];
  }

@@ -1539,8 +1538,8 @@ double PairGranular::single(int i, int j, int itype, int jtype,
        fs1 *= Fscrit/fs;
        fs2 *= Fscrit/fs;
        fs3 *= Fscrit/fs;
		fs *= Fscrit/fs; // saves the correct value of `fs` to svector
      } else fs1 = fs2 = fs3 = fs = 0.0; // saves the correct of `fs` value to svector
		fs *= Fscrit/fs;
      } else fs1 = fs2 = fs3 = fs = 0.0;
    }

  // classic pair gran/hooke (no history)
@@ -1551,7 +1550,7 @@ double PairGranular::single(int i, int j, int itype, int jtype,
    fs1 = -Ft*vtr1;
    fs2 = -Ft*vtr2;
    fs3 = -Ft*vtr3;
	fs = Ft*vrel; // saves the correct value of `fs` to svector
	fs = Ft*vrel;
  }

  //****************************************
@@ -1596,8 +1595,8 @@ double PairGranular::single(int i, int j, int itype, int jtype,
        fr1 *= Frcrit/fr;
        fr2 *= Frcrit/fr;
        fr3 *= Frcrit/fr;
		fr *= Frcrit/fr; // saves the correct value of `fr` to svector
      } else fr1 = fr2 = fr3 = fr = 0.0; // saves the correct value of `fr` to svector
		fr *= Frcrit/fr;
      } else fr1 = fr2 = fr3 = fr = 0.0;
    }

  }