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

merge capture regions, so the library interface code can compiled with exceptions

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-02-23 14:20:39 +01:00
parent 523978b4c7
commit 0003bb6766
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/library.cpp
View File

@ -276,13 +276,6 @@ void lammps_commands_string(void *ptr, char *str)
{ {
LAMMPS *lmp = (LAMMPS *) ptr; LAMMPS *lmp = (LAMMPS *) ptr;
BEGIN_CAPTURE
{
if (lmp->update->whichflag != 0)
lmp->error->all(FLERR,"Library error: issuing LAMMPS command during run");
}
END_CAPTURE
// make copy of str so can strtok() it // make copy of str so can strtok() it
int n = strlen(str) + 1; int n = strlen(str) + 1;
@ -291,6 +284,11 @@ void lammps_commands_string(void *ptr, char *str)
BEGIN_CAPTURE BEGIN_CAPTURE
{ {
if (lmp->update->whichflag != 0) {
delete [] copy;
lmp->error->all(FLERR,"Library error: issuing LAMMPS command during run");
}
char *ptr = copy; char *ptr = copy;
for (int i=0; i < n-1; ++i) { for (int i=0; i < n-1; ++i) {