From dfe4f7a49d353a22c1c9cd56f2027e0b3a9d9ef3 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 11 Mar 2021 19:33:50 -0500 Subject: [PATCH] small tweaks and simplify --- examples/plugins/morse2plugin.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/examples/plugins/morse2plugin.cpp b/examples/plugins/morse2plugin.cpp index cfb6689cae..286aa30c35 100644 --- a/examples/plugins/morse2plugin.cpp +++ b/examples/plugins/morse2plugin.cpp @@ -1,7 +1,6 @@ #include "lammpsplugin.h" -#include "lammps.h" #include "version.h" #include @@ -21,12 +20,12 @@ static Pair *morse2ompcreator(LAMMPS *lmp) return new PairMorse2OMP(lmp); } -static lammpsplugin_t plugin; extern "C" void lammpsplugin_init(void *lmp, void *handle, void *regfunc) { - // register plain morse2 pair style + lammpsplugin_t plugin; lammpsplugin_regfunc register_plugin = (lammpsplugin_regfunc) regfunc; - memset(&plugin,0,sizeof(lammpsplugin_t)); + + // register plain morse2 pair style plugin.version = LAMMPS_VERSION; plugin.style = "pair"; plugin.name = "morse2"; @@ -34,11 +33,11 @@ extern "C" void lammpsplugin_init(void *lmp, void *handle, void *regfunc) plugin.author = "Axel Kohlmeyer (akohlmey@gmail.com)"; plugin.creator = (lammpsplugin_factory *) &morse2creator; plugin.handle = handle; - register_plugin(&plugin,lmp); + (*register_plugin)(&plugin,lmp); // also register morse2/omp pair style. only need to update changed fields plugin.name = "morse2/omp"; plugin.info = "Morse2 variant pair style for OpenMP v1.0"; plugin.creator = (lammpsplugin_factory *) &morse2ompcreator; - register_plugin(&plugin,lmp); + (*register_plugin)(&plugin,lmp); }