Merge branch 'master' into improve-include-consistency

2019-07-26 17:24:32 -04:00
parent ce9c5e41a8 35cee904d7
commit 9477df4244
31 changed files with 456 additions and 101 deletions
--- a/src/angle.h
+++ b/src/angle.h
@ -45,6 +45,8 @@ class Angle : protected Pointers {
  virtual double equilibrium_angle(int) = 0;
  virtual void write_restart(FILE *) = 0;
  virtual void read_restart(FILE *) = 0;
+  virtual void write_restart_settings(FILE *) {};
+  virtual void read_restart_settings(FILE *) {};
  virtual void write_data(FILE *) {}
  virtual double single(int, int, int, int) = 0;
  virtual double memory_usage();