changes for next patch, 2d disc options for spheres, fix external upgrade, bug fixes for fix ave/chunk for density calcs, Aidan doc page citation deconvolution

2017-03-21 08:56:37 -06:00
parent 145e682ad3
commit dcede304df
112 changed files with 912 additions and 534 deletions
--- a/src/fix_ave_chunk.h
+++ b/src/fix_ave_chunk.h
@ -49,6 +49,11 @@ class FixAveChunk : public Fix {
  class Compute *tbias;     // ptr to additional bias compute
  FILE *fp;

+  int densityflag;        // 1 if density/number or density/mass requested
+  int volflag;            // SCALAR/VECTOR for density normalization by volume
+  double chunk_volume_scalar;
+  double *chunk_volume_vec;
+
  int ave,nwindow;
  int normcount,iwindow,window_limit;