diff --git a/src/USER-INTEL/improper_cvff_intel.cpp b/src/USER-INTEL/improper_cvff_intel.cpp index 6c0735a755..0fb02420b9 100644 --- a/src/USER-INTEL/improper_cvff_intel.cpp +++ b/src/USER-INTEL/improper_cvff_intel.cpp @@ -364,10 +364,8 @@ void ImproperCvffIntel::eval(const int vflag, /* ---------------------------------------------------------------------- */ -void ImproperCvffIntel::init() +void ImproperCvffIntel::init_style() { - ImproperCvff::init(); - int ifix = modify->find_fix("package_intel"); if (ifix < 0) error->all(FLERR, diff --git a/src/USER-INTEL/improper_cvff_intel.h b/src/USER-INTEL/improper_cvff_intel.h index 154bb5bd18..95ccd8f9d2 100644 --- a/src/USER-INTEL/improper_cvff_intel.h +++ b/src/USER-INTEL/improper_cvff_intel.h @@ -35,7 +35,7 @@ class ImproperCvffIntel : public ImproperCvff { ImproperCvffIntel(class LAMMPS *); virtual ~ImproperCvffIntel(); virtual void compute(int, int); - virtual void init(); + virtual void init_style(); protected: FixIntel *fix; diff --git a/src/USER-INTEL/improper_harmonic_intel.cpp b/src/USER-INTEL/improper_harmonic_intel.cpp index 7693793f02..071ff548ea 100644 --- a/src/USER-INTEL/improper_harmonic_intel.cpp +++ b/src/USER-INTEL/improper_harmonic_intel.cpp @@ -325,10 +325,8 @@ void ImproperHarmonicIntel::eval(const int vflag, /* ---------------------------------------------------------------------- */ -void ImproperHarmonicIntel::init() +void ImproperHarmonicIntel::init_style() { - ImproperHarmonic::init(); - int ifix = modify->find_fix("package_intel"); if (ifix < 0) error->all(FLERR, diff --git a/src/USER-INTEL/improper_harmonic_intel.h b/src/USER-INTEL/improper_harmonic_intel.h index d5b0e4ee0f..4e38383863 100644 --- a/src/USER-INTEL/improper_harmonic_intel.h +++ b/src/USER-INTEL/improper_harmonic_intel.h @@ -35,7 +35,7 @@ class ImproperHarmonicIntel : public ImproperHarmonic { ImproperHarmonicIntel(class LAMMPS *); virtual ~ImproperHarmonicIntel(); virtual void compute(int, int); - virtual void init(); + virtual void init_style(); protected: FixIntel *fix; diff --git a/src/improper.cpp b/src/improper.cpp index 3b5453de59..0b75ea3a22 100644 --- a/src/improper.cpp +++ b/src/improper.cpp @@ -68,6 +68,8 @@ void Improper::init() error->all(FLERR,"Improper coeffs are not set"); for (int i = 1; i <= atom->nimpropertypes; i++) if (setflag[i] == 0) error->all(FLERR,"All improper coeffs are not set"); + + init_style(); } /* ---------------------------------------------------------------------- diff --git a/src/improper.h b/src/improper.h index 5e0b525b6d..e029233ae9 100644 --- a/src/improper.h +++ b/src/improper.h @@ -40,6 +40,7 @@ class Improper : protected Pointers { Improper(class LAMMPS *); virtual ~Improper(); virtual void init(); + virtual void init_style() {} virtual void compute(int, int) = 0; virtual void settings(int, char **) {} virtual void coeff(int, char **) = 0; diff --git a/src/improper_hybrid.cpp b/src/improper_hybrid.cpp index ebb6c1a7fb..d819365b74 100644 --- a/src/improper_hybrid.cpp +++ b/src/improper_hybrid.cpp @@ -158,10 +158,10 @@ void ImproperHybrid::allocate() /* ---------------------------------------------------------------------- */ -void ImproperHybrid::init() +void ImproperHybrid::init_style() { for (int i = 0; i < nstyles; i++) - styles[i]->init(); + styles[i]->init_style(); } diff --git a/src/improper_hybrid.h b/src/improper_hybrid.h index 1f0bf7438b..dbba347cf9 100644 --- a/src/improper_hybrid.h +++ b/src/improper_hybrid.h @@ -33,7 +33,7 @@ class ImproperHybrid : public Improper { ImproperHybrid(class LAMMPS *); ~ImproperHybrid(); - void init(); + void init_style(); void compute(int, int); void settings(int, char **); void coeff(int, char **);