ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use memory class for memory allocation consistently

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-12-03 04:33:00 -05:00
parent c0cab665e4
commit 47edf5effa
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/MDI/mdi_plugin.cpp
View File

@ -20,6 +20,7 @@
#include "error.h"
#include "input.h"
#include "memory.h"
#include "modify.h"
#include <cstdlib>
@ -67,12 +68,12 @@ MDIPlugin::MDIPlugin(LAMMPS *_lmp, int narg, char **arg) : Pointers(_lmp)
// do variable substitution in multiple word extra_arg
int ncopy = strlen(extra_arg) + 1;
char *copy = (char *) malloc(ncopy);
char *copy = (char *) memory->smalloc(ncopy,"mdi_plugin:copy");
strncpy(copy, extra_arg, ncopy);
char *work = (char *) malloc(ncopy);
char *work = (char *) memory->smalloc(ncopy,"mdi_plugin:work");
int nwork = ncopy;
input->substitute(copy, work, ncopy, nwork, 0);
free(work);
memory->sfree(work);
extra_arg = copy;
iarg += 2;
@ -83,12 +84,12 @@ MDIPlugin::MDIPlugin(LAMMPS *_lmp, int narg, char **arg) : Pointers(_lmp)
// do variable substitution in multiple word lammps_command
int ncopy = strlen(lammps_command) + 1;
char *copy = (char *) malloc(ncopy);
strncpy(copy, extra_arg, ncopy);
char *work = (char *) malloc(ncopy);
char *copy = (char *) memory->smalloc(ncopy,"mdi_plugin:work");
strncpy(copy, lammps_command, ncopy);
char *work = (char *) memory->smalloc(ncopy,"mdi_plugin:work");
int nwork = ncopy;
input->substitute(copy, work, ncopy, nwork, 0);
free(work);
memory->sfree(work);
lammps_command = copy;
iarg += 2;
@ -128,8 +129,8 @@ MDIPlugin::MDIPlugin(LAMMPS *_lmp, int narg, char **arg) : Pointers(_lmp)
MDI_Launch_plugin(plugin_name, plugin_args, &world, plugin_wrapper, (void *) this);
delete[] plugin_args;
delete[] extra_arg;
delete[] lammps_command;
memory->sfree(extra_arg);
memory->sfree(lammps_command);
}
/* ----------------------------------------------------------------------