diff --git a/src/min_fire.cpp b/src/min_fire.cpp index c8ade7dcb2..aec66b85ae 100644 --- a/src/min_fire.cpp +++ b/src/min_fire.cpp @@ -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; diff --git a/src/min_fire.h b/src/min_fire.h index 54867d6c6b..9f1be75300 100644 --- a/src/min_fire.h +++ b/src/min_fire.h @@ -34,7 +34,9 @@ class MinFire : public Min { int iterate(int); private: - double dt; + double dt,dtmax; + double alpha; + bigint last_negative; }; } diff --git a/src/min_quickmin.cpp b/src/min_quickmin.cpp index ee6766af2f..04a33b6b23 100644 --- a/src/min_quickmin.cpp +++ b/src/min_quickmin.cpp @@ -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; diff --git a/src/min_quickmin.h b/src/min_quickmin.h index bfb2af941e..443961972a 100644 --- a/src/min_quickmin.h +++ b/src/min_quickmin.h @@ -35,6 +35,7 @@ class MinQuickMin : public Min { private: double dt; + bigint last_negative; }; }