From b5e1bbfa6f9294d837df9f26c3296e6b19cf04fe Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 22 Mar 2023 15:02:14 -0400 Subject: [PATCH] move fix property/atom property type enumerator to class definition in header --- src/KOKKOS/fix_property_atom_kokkos.cpp | 2 -- src/fix_property_atom.cpp | 2 -- src/fix_property_atom.h | 3 ++- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/KOKKOS/fix_property_atom_kokkos.cpp b/src/KOKKOS/fix_property_atom_kokkos.cpp index 2c515510ee..6c7c7c6d37 100644 --- a/src/KOKKOS/fix_property_atom_kokkos.cpp +++ b/src/KOKKOS/fix_property_atom_kokkos.cpp @@ -24,8 +24,6 @@ using namespace LAMMPS_NS; using namespace FixConst; -enum{MOLECULE,CHARGE,RMASS,INTEGER,DOUBLE}; - /* ---------------------------------------------------------------------- */ FixPropertyAtomKokkos::FixPropertyAtomKokkos(LAMMPS *lmp, int narg, char **arg) : diff --git a/src/fix_property_atom.cpp b/src/fix_property_atom.cpp index 4b43feca74..994b4f0f19 100644 --- a/src/fix_property_atom.cpp +++ b/src/fix_property_atom.cpp @@ -25,8 +25,6 @@ using namespace LAMMPS_NS; using namespace FixConst; -enum { MOLECULE, CHARGE, RMASS, TEMPERATURE, HEATFLOW, IVEC, DVEC, IARRAY, DARRAY }; - /* ---------------------------------------------------------------------- */ FixPropertyAtom::FixPropertyAtom(LAMMPS *lmp, int narg, char **arg) : diff --git a/src/fix_property_atom.h b/src/fix_property_atom.h index 7d9f50b75e..f2f26d511b 100644 --- a/src/fix_property_atom.h +++ b/src/fix_property_atom.h @@ -27,11 +27,12 @@ namespace LAMMPS_NS { class FixPropertyAtom : public Fix { public: FixPropertyAtom(class LAMMPS *, int, char **); - ~FixPropertyAtom() override; int setmask() override; void init() override; + enum { MOLECULE, CHARGE, RMASS, TEMPERATURE, HEATFLOW, IVEC, DVEC, IARRAY, DARRAY }; + void read_data_section(char *, int, char *, tagint) override; bigint read_data_skip_lines(char *) override; void write_data_section_size(int, int &, int &) override;