use fdotf consistently and not fdotfloc.
This commit is contained in:
@ -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;
|
||||||
|
|||||||
@ -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;
|
||||||
|
|
||||||
|
|||||||
@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user