ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved merge conflict by accepting incomming changes

Browse Source
This commit is contained in:
jguenole
2019-09-19 15:59:38 +02:00
parent 11bc0601de 572235e66a
commit de78e309cf
2495 changed files with 115335 additions and 116048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/min.h
View File

@ -31,16 +31,16 @@ class Min : protected Pointers {
Min(class LAMMPS *);
virtual ~Min();
virtual void init();
void setup(int flag=1);
void setup_minimal(int);
void run(int);
virtual void setup(int flag=1);
virtual void setup_minimal(int);
virtual void run(int);
void cleanup();
int request(class Pair *, int, double);
virtual bigint memory_usage() {return 0;}
void modify_params(int, char **);
virtual int modify_param(int, char **) {return 0;}
double fnorm_sqr();
double fnorm_inf();
virtual double fnorm_sqr();
virtual double fnorm_inf();
virtual void init_style() {}
virtual void setup_style() = 0;
@ -108,10 +108,12 @@ class Min : protected Pointers {
double *extra_max; // max allowed change per iter for atom's var
class Pair **requestor; // Pair that stores/manipulates the variable
int kokkosable; // 1 if this min style supports Kokkos
int neigh_every,neigh_delay,neigh_dist_check; // neighboring params
double energy_force(int);
void force_clear();
virtual double energy_force(int);
virtual void force_clear();
double compute_force_norm_sqr();
double compute_force_norm_inf();