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

simplify deprecated styles

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-06-03 22:13:24 -04:00
parent c0fb794848
commit ef190962b8
10 changed files with 115 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/angle_deprecated.cpp
View File

@ -16,7 +16,7 @@
------------------------------------------------------------------------- */
#include "angle_deprecated.h"
#include <cstring>
#include <string>
#include "angle_hybrid.h"
#include "comm.h"
#include "force.h"
@ -25,21 +25,11 @@
using namespace LAMMPS_NS;
static void writemsg(LAMMPS *lmp, const char *msg, int abend=1)
{
if (lmp->comm->me == 0) {
if (lmp->screen) fputs(msg,lmp->screen);
if (lmp->logfile) fputs(msg,lmp->logfile);
}
if (abend)
lmp->error->all(FLERR,"This angle style is no longer available");
}
/* ---------------------------------------------------------------------- */
void AngleDeprecated::settings(int, char **)
{
const char *my_style = force->angle_style;
std::string my_style = force->angle_style;
// hybrid substyles are created in AngleHybrid::settings(), so when this is
// called, our style was just added at the end of the list of substyles
@ -49,10 +39,13 @@ void AngleDeprecated::settings(int, char **)
my_style = hybrid->keywords[hybrid->nstyles];
}
if (strcmp(my_style,"DEPRECATED") == 0) {
writemsg(lmp,"\nAngle style 'DEPRECATED' is a dummy style\n\n",0);
if (my_style == "DEPRECATED") {
if (lmp->comm->me == 0)
utils::logmesg(lmp,"\nAngle style 'DEPRECATED' is a dummy style\n\n");
return;
}
lmp->error->all(FLERR,"This angle style is no longer available");
}