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

Merge pull request #2654 from akohlmey/collected-small-changes

Browse Source 
Collected small changes
This commit is contained in:
Axel Kohlmeyer
2021-03-16 19:34:54 -04:00
committed by GitHub
parent 1b5a7e2e1e 3b9d5916c9
commit 42895ac6df
113 changed files with 361 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/library.cpp
View File

@ -483,11 +483,15 @@ void lammps_commands_string(void *handle, const char *str)
{
LAMMPS *lmp = (LAMMPS *) handle;
// make copy of str so can strtok() it
// copy str and convert from CR-LF (DOS-style) to LF (Unix style) line
int n = strlen(str);
char *ptr, *copy = new char[n+1];
int n = strlen(str) + 1;
char *copy = new char[n];
strcpy(copy,str);
for (ptr = copy; *str != '\0'; ++str) {
if ((str[0] == '\r') && (str[1] == '\n')) continue;
*ptr++ = *str;
}
*ptr = '\0';
BEGIN_CAPTURE
{
@ -495,8 +499,9 @@ void lammps_commands_string(void *handle, const char *str)
lmp->error->all(FLERR,"Library error: issuing LAMMPS command during run");
}
char *ptr = copy;
for (int i=0; i < n-1; ++i) {
n = strlen(copy);
ptr = copy;
for (int i=0; i < n; ++i) {
// handle continuation character as last character in line or string
if ((copy[i] == '&') && (copy[i+1] == '\n'))