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

Merge branch 'master' of https://github.com/lammps/lammps into lammps-master2

Browse Source
This commit is contained in:
Jacob Gissinger
2021-08-20 10:53:04 -04:00
parent bf223a92b1 3404920e98
commit 2a06484511
4453 changed files with 106551 additions and 73942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/input.cpp
View File

@ -164,9 +164,9 @@ Input::~Input()
memory->sfree(line);
memory->sfree(copy);
memory->sfree(work);
if (labelstr) delete [] labelstr;
if (labelstr) delete[] labelstr;
memory->sfree(arg);
delete [] infiles;
delete[] infiles;
delete variable;
delete command_map;
@ -935,9 +935,9 @@ void Input::ifthenelse()
for (int i = 0; i < ncommands; i++) {
one(commands[i]);
delete [] commands[i];
delete[] commands[i];
}
delete [] commands;
delete[] commands;
return;
}
@ -990,9 +990,9 @@ void Input::ifthenelse()
for (int i = 0; i < ncommands; i++) {
one(commands[i]);
delete [] commands[i];
delete[] commands[i];
}
delete [] commands;
delete[] commands;
return;
}
@ -1053,7 +1053,7 @@ void Input::jump()
if (narg == 2) {
label_active = 1;
if (labelstr) delete [] labelstr;
if (labelstr) delete[] labelstr;
labelstr = utils::strdup(arg[1]);
}
}
@ -1235,7 +1235,7 @@ void Input::shell()
if (me == 0 && err != 0) {
char *message = shell_failed_message("cd",err);
error->warning(FLERR,message);
delete [] message;
delete[] message;
}
} else if (strcmp(arg[0],"mkdir") == 0) {
@ -1250,7 +1250,7 @@ void Input::shell()
if (rv < 0) {
char *message = shell_failed_message("mkdir",errno);
error->warning(FLERR,message);
delete [] message;
delete[] message;
}
}
@ -1261,7 +1261,7 @@ void Input::shell()
if (me == 0 && err != 0) {
char *message = shell_failed_message("mv",err);
error->warning(FLERR,message);
delete [] message;
delete[] message;
}
} else if (strcmp(arg[0],"rm") == 0) {
@ -1271,7 +1271,7 @@ void Input::shell()
if (unlink(arg[i]) < 0) {
char *message = shell_failed_message("rm",errno);
error->warning(FLERR,message);
delete [] message;
delete[] message;
}
}
@ -1282,7 +1282,7 @@ void Input::shell()
if (rmdir(arg[i]) < 0) {
char *message = shell_failed_message("rmdir",errno);
error->warning(FLERR,message);
delete [] message;
delete[] message;
}
}
@ -1309,7 +1309,7 @@ void Input::shell()
if (me == 0 && err != 0) {
char *message = shell_failed_message("putenv",err);
error->warning(FLERR,message);
delete [] message;
delete[] message;
}
}
@ -1754,7 +1754,7 @@ void Input::package()
} else if (strcmp(arg[0],"omp") == 0) {
if (!modify->check_package("OMP"))
error->all(FLERR,
"Package omp command without USER-OMP package installed");
"Package omp command without OPENMP package installed");
std::string fixcmd = "package_omp all OMP";
for (int i = 1; i < narg; i++) fixcmd += std::string(" ") + arg[i];
@ -1763,7 +1763,7 @@ void Input::package()
} else if (strcmp(arg[0],"intel") == 0) {
if (!modify->check_package("INTEL"))
error->all(FLERR,
"Package intel command without USER-INTEL package installed");
"Package intel command without INTEL package installed");
std::string fixcmd = "package_intel all INTEL";
for (int i = 1; i < narg; i++) fixcmd += std::string(" ") + arg[i];
@ -1941,8 +1941,8 @@ void Input::suffix()
} else {
lmp->suffix_enable = 1;
delete [] lmp->suffix;
delete [] lmp->suffix2;
delete[] lmp->suffix;
delete[] lmp->suffix2;
lmp->suffix = lmp->suffix2 = nullptr;
if (strcmp(arg[0],"hybrid") == 0) {