diff --git a/examples/voronoi/in.voronoi.data b/examples/voronoi/in.voronoi.data index da00b44e09..e5d925c498 100644 --- a/examples/voronoi/in.voronoi.data +++ b/examples/voronoi/in.voronoi.data @@ -63,9 +63,7 @@ undump dlocal # TEST 2: # -# This compute voronoi generates -# local and global quantities, but -# not per-atom quantities +# This compute voronoi generates peratom and local and global quantities compute v2 all voronoi/atom neighbors yes edge_histo 6 @@ -83,6 +81,3 @@ thermo_style custom c_sumarea c_v2[3] c_v2[4] c_v2[5] c_v2[6] c_v2[7] thermo 1 run 0 - - - diff --git a/src/compute_reduce.cpp b/src/compute_reduce.cpp index 24fdc4a991..5983445517 100644 --- a/src/compute_reduce.cpp +++ b/src/compute_reduce.cpp @@ -31,8 +31,6 @@ using namespace LAMMPS_NS; -enum{UNDECIDED,PERATOM,LOCAL}; // same as in ComputeReduceRegion - #define BIG 1.0e20 //---------------------------------------------------------------- @@ -232,6 +230,7 @@ ComputeReduce::ComputeReduce(LAMMPS *lmp, int narg, char **arg) : error->all(FLERR,"Compute {} inputs must be all peratom or all local"); input_mode = LOCAL; } + iarg += 2; } else error->all(FLERR, "Unknown compute {} keyword: {}", style, arg[iarg]); } diff --git a/src/compute_reduce.h b/src/compute_reduce.h index f8b652e00c..64322bc6ac 100644 --- a/src/compute_reduce.h +++ b/src/compute_reduce.h @@ -27,7 +27,7 @@ namespace LAMMPS_NS { class ComputeReduce : public Compute { public: enum { SUM, SUMSQ, SUMABS, MINN, MAXX, AVE, AVESQ, AVEABS, MINABS, MAXABS }; - enum { PERATOM, LOCAL }; + enum { UNDECIDED, PERATOM, LOCAL }; ComputeReduce(class LAMMPS *, int, char **); ~ComputeReduce() override; diff --git a/src/compute_reduce_region.cpp b/src/compute_reduce_region.cpp index 15280af544..bd850e902c 100644 --- a/src/compute_reduce_region.cpp +++ b/src/compute_reduce_region.cpp @@ -26,8 +26,6 @@ using namespace LAMMPS_NS; -enum{UNDECIDED,PERATOM,LOCAL}; // same as in ComputeReduce - static constexpr double BIG = 1.0e20; /* ---------------------------------------------------------------------- */