Apply override to Minimize classes
This commit is contained in:
@ -29,7 +29,7 @@ class Min : protected Pointers {
|
|||||||
int searchflag; // 0 if damped dynamics, 1 if sub-cycles on local search
|
int searchflag; // 0 if damped dynamics, 1 if sub-cycles on local search
|
||||||
|
|
||||||
Min(class LAMMPS *);
|
Min(class LAMMPS *);
|
||||||
virtual ~Min();
|
~Min() override;
|
||||||
virtual void init();
|
virtual void init();
|
||||||
virtual void setup(int flag = 1);
|
virtual void setup(int flag = 1);
|
||||||
virtual void setup_minimal(int);
|
virtual void setup_minimal(int);
|
||||||
|
|||||||
@ -27,7 +27,7 @@ namespace LAMMPS_NS {
|
|||||||
class MinCG : public MinLineSearch {
|
class MinCG : public MinLineSearch {
|
||||||
public:
|
public:
|
||||||
MinCG(class LAMMPS *);
|
MinCG(class LAMMPS *);
|
||||||
int iterate(int);
|
int iterate(int) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace LAMMPS_NS
|
} // namespace LAMMPS_NS
|
||||||
|
|||||||
@ -27,11 +27,11 @@ namespace LAMMPS_NS {
|
|||||||
class MinFire : public Min {
|
class MinFire : public Min {
|
||||||
public:
|
public:
|
||||||
MinFire(class LAMMPS *);
|
MinFire(class LAMMPS *);
|
||||||
~MinFire() {}
|
~MinFire() override = default;
|
||||||
void init();
|
void init() override;
|
||||||
void setup_style();
|
void setup_style() override;
|
||||||
void reset_vectors();
|
void reset_vectors() override;
|
||||||
int iterate(int);
|
int iterate(int) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
double dt, dtmax, dtmin;
|
double dt, dtmax, dtmin;
|
||||||
|
|||||||
@ -27,11 +27,11 @@ namespace LAMMPS_NS {
|
|||||||
class MinFireOld : public Min {
|
class MinFireOld : public Min {
|
||||||
public:
|
public:
|
||||||
MinFireOld(class LAMMPS *);
|
MinFireOld(class LAMMPS *);
|
||||||
~MinFireOld() {}
|
~MinFireOld() override = default;
|
||||||
void init();
|
void init() override;
|
||||||
void setup_style();
|
void setup_style() override;
|
||||||
void reset_vectors();
|
void reset_vectors() override;
|
||||||
int iterate(int);
|
int iterate(int) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
double dt, dtmax;
|
double dt, dtmax;
|
||||||
|
|||||||
@ -27,11 +27,11 @@ namespace LAMMPS_NS {
|
|||||||
class MinHFTN : public Min {
|
class MinHFTN : public Min {
|
||||||
public:
|
public:
|
||||||
MinHFTN(LAMMPS *);
|
MinHFTN(LAMMPS *);
|
||||||
~MinHFTN();
|
~MinHFTN() override;
|
||||||
void init();
|
void init() override;
|
||||||
void setup_style();
|
void setup_style() override;
|
||||||
void reset_vectors();
|
void reset_vectors() override;
|
||||||
int iterate(int);
|
int iterate(int) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
//---- THE ALGORITHM NEEDS TO STORE THIS MANY ATOM-BASED VECTORS,
|
//---- THE ALGORITHM NEEDS TO STORE THIS MANY ATOM-BASED VECTORS,
|
||||||
|
|||||||
@ -21,10 +21,10 @@ namespace LAMMPS_NS {
|
|||||||
class MinLineSearch : public Min {
|
class MinLineSearch : public Min {
|
||||||
public:
|
public:
|
||||||
MinLineSearch(class LAMMPS *);
|
MinLineSearch(class LAMMPS *);
|
||||||
~MinLineSearch();
|
~MinLineSearch() override;
|
||||||
void init();
|
void init() override;
|
||||||
void setup_style();
|
void setup_style() override;
|
||||||
void reset_vectors();
|
void reset_vectors() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// vectors needed by linesearch minimizers
|
// vectors needed by linesearch minimizers
|
||||||
|
|||||||
@ -27,11 +27,11 @@ namespace LAMMPS_NS {
|
|||||||
class MinQuickMin : public Min {
|
class MinQuickMin : public Min {
|
||||||
public:
|
public:
|
||||||
MinQuickMin(class LAMMPS *);
|
MinQuickMin(class LAMMPS *);
|
||||||
~MinQuickMin() {}
|
~MinQuickMin() override = default;
|
||||||
void init();
|
void init() override;
|
||||||
void setup_style();
|
void setup_style() override;
|
||||||
void reset_vectors();
|
void reset_vectors() override;
|
||||||
int iterate(int);
|
int iterate(int) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
double dt;
|
double dt;
|
||||||
|
|||||||
@ -27,7 +27,7 @@ namespace LAMMPS_NS {
|
|||||||
class MinSD : public MinLineSearch {
|
class MinSD : public MinLineSearch {
|
||||||
public:
|
public:
|
||||||
MinSD(class LAMMPS *);
|
MinSD(class LAMMPS *);
|
||||||
int iterate(int);
|
int iterate(int) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace LAMMPS_NS
|
} // namespace LAMMPS_NS
|
||||||
|
|||||||
Reference in New Issue
Block a user