git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10449 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
@ -49,6 +49,9 @@ void MinFire::init()
|
||||
Min::init();
|
||||
|
||||
dt = update->dt;
|
||||
dtmax = TMAX * dt;
|
||||
alpha = ALPHA0;
|
||||
last_negative = update->ntimestep;
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
@ -87,9 +90,6 @@ int MinFire::iterate(int maxiter)
|
||||
int flag,flagall;
|
||||
|
||||
alpha_final = 0.0;
|
||||
double alpha = ALPHA0;
|
||||
double dtmax = TMAX * dt;
|
||||
bigint last_negative = update->ntimestep;
|
||||
|
||||
for (int iter = 0; iter < maxiter; iter++) {
|
||||
ntimestep = ++update->ntimestep;
|
||||
|
||||
@ -34,7 +34,9 @@ class MinFire : public Min {
|
||||
int iterate(int);
|
||||
|
||||
private:
|
||||
double dt;
|
||||
double dt,dtmax;
|
||||
double alpha;
|
||||
bigint last_negative;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -46,6 +46,7 @@ void MinQuickMin::init()
|
||||
Min::init();
|
||||
|
||||
dt = update->dt;
|
||||
last_negative = update->ntimestep;
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
@ -85,7 +86,6 @@ int MinQuickMin::iterate(int maxiter)
|
||||
int flag,flagall;
|
||||
|
||||
alpha_final = 0.0;
|
||||
bigint last_negative = update->ntimestep;
|
||||
|
||||
for (int iter = 0; iter < maxiter; iter++) {
|
||||
ntimestep = ++update->ntimestep;
|
||||
|
||||
@ -35,6 +35,7 @@ class MinQuickMin : public Min {
|
||||
|
||||
private:
|
||||
double dt;
|
||||
bigint last_negative;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user