Merge branch 'master' into fire

This commit is contained in:
Steve Plimpton
2020-01-14 08:53:40 -07:00
416 changed files with 45887 additions and 13900 deletions

View File

@ -39,9 +39,9 @@ class Min : protected Pointers {
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();
double fnorm_max();
virtual double fnorm_sqr();
virtual double fnorm_inf();
virtual double fnorm_max();
enum{TWO,MAX,INF};