Unverified Commit 5f39771f authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

use fdotf consistently and not fdotfloc.

parent 9588de08

src/min_fire.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ void MinFire::reset_vectors() 
int MinFire::iterate(int maxiter)

int MinFire::iterate(int maxiter)

{

{

  bigint ntimestep;

  bigint ntimestep;

  double vmax,vdotf,vdotfall,vdotv,vdotvall,fdotf,fdotfloc,fdotfall;

  double vmax,vdotf,vdotfall,vdotv,vdotvall,fdotf,fdotfall;

  double scale1,scale2;

  double scale1,scale2;

  double dtvone,dtv,dtf,dtfm;

  double dtvone,dtv,dtf,dtfm;

  int flag,flagall;

  int flag,flagall;

src/min_quickmin.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ void MinQuickMin::reset_vectors() 
int MinQuickMin::iterate(int maxiter)

int MinQuickMin::iterate(int maxiter)

{

{

  bigint ntimestep;

  bigint ntimestep;

  double vmax,vdotf,vdotfall,fdotf,fdotfloc,fdotfall,scale;

  double vmax,vdotf,vdotfall,fdotf,fdotfall,scale;

  double dtvone,dtv,dtf,dtfm;

  double dtvone,dtv,dtf,dtfm;

  int flag,flagall;

  int flag,flagall;

src/min_sd.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ MinSD::MinSD(LAMMPS *lmp) : MinLineSearch(lmp) {} 
int MinSD::iterate(int maxiter)

int MinSD::iterate(int maxiter)

{

{

  int i,m,n,fail,ntimestep;

  int i,m,n,fail,ntimestep;

  double fdotf,fdotfloc;

  double fdotf;

  double *fatom,*hatom;

  double *fatom,*hatom;





  // initialize working vectors

  // initialize working vectors

CRA Git | Maintained and supported by SUSTech CRA and CCSE