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

add deprecation warning for cuboid and sphere keywords

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-04-24 16:04:05 -04:00
parent 3cd6c776e7
commit b28e650308
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/src/fix_dpd_source.rst
View File

@ -61,6 +61,11 @@ heat conduction with a source term (see Fig.12 in :ref:`(Li2014) <Li2014b>`)
or diffusion with a source term (see Fig.1 in :ref:`(Li2015) <Li2015b>`), as or diffusion with a source term (see Fig.1 in :ref:`(Li2015) <Li2015b>`), as
an analog of a periodic Poiseuille flow problem. an analog of a periodic Poiseuille flow problem.
.. deprecated:: TBD
The *sphere* and *cuboid* keywords will be removed in a future version
of LAMMPS. The same functionality and more can be achieved with a region.
If the *sphere* keyword is used, the *cx, cy, cz, radius* values define If the *sphere* keyword is used, the *cx, cy, cz, radius* values define
a spherical domain to apply the source flux to. a spherical domain to apply the source flux to.

7
src/DPD-MESO/fix_edpd_source.cpp
View File

@ -14,6 +14,7 @@
#include "fix_edpd_source.h" #include "fix_edpd_source.h"
#include "atom.h" #include "atom.h"
#include "comm.h"
#include "domain.h" #include "domain.h"
#include "error.h" #include "error.h"
#include "region.h" #include "region.h"
@ -43,6 +44,9 @@ FixEDPDSource::FixEDPDSource(LAMMPS *lmp, int narg, char **arg) :
center[2] = utils::numeric(FLERR, arg[iarg++], false, lmp); center[2] = utils::numeric(FLERR, arg[iarg++], false, lmp);
radius = utils::numeric(FLERR, arg[iarg++], false, lmp); radius = utils::numeric(FLERR, arg[iarg++], false, lmp);
value = utils::numeric(FLERR, arg[iarg++], false, lmp); value = utils::numeric(FLERR, arg[iarg++], false, lmp);
if (comm->me == 0)
error->warning(FLERR, "The sphere keyword is deprecated and will be removed in the future.");
} else if (strcmp(arg[iarg], "cuboid") == 0) { } else if (strcmp(arg[iarg], "cuboid") == 0) {
option = CUBOID; option = CUBOID;
if (narg != 11) error->all(FLERR, "Illegal fix edpd/source command (6 args for cuboid)"); if (narg != 11) error->all(FLERR, "Illegal fix edpd/source command (6 args for cuboid)");
@ -54,6 +58,9 @@ FixEDPDSource::FixEDPDSource(LAMMPS *lmp, int narg, char **arg) :
dLy = utils::numeric(FLERR, arg[iarg++], false, lmp); dLy = utils::numeric(FLERR, arg[iarg++], false, lmp);
dLz = utils::numeric(FLERR, arg[iarg++], false, lmp); dLz = utils::numeric(FLERR, arg[iarg++], false, lmp);
value = utils::numeric(FLERR, arg[iarg++], false, lmp); value = utils::numeric(FLERR, arg[iarg++], false, lmp);
if (comm->me == 0)
error->warning(FLERR, "The cuboid keyword is deprecated and will be removed in the future.");
} else if (strcmp(arg[iarg], "region") == 0) { } else if (strcmp(arg[iarg], "region") == 0) {
option = REGION; option = REGION;
if (narg != 6) error->all(FLERR, "Illegal fix edpd/source command (2 args for region)"); if (narg != 6) error->all(FLERR, "Illegal fix edpd/source command (2 args for region)");

7
src/DPD-MESO/fix_tdpd_source.cpp
View File

@ -14,6 +14,7 @@
#include "fix_tdpd_source.h" #include "fix_tdpd_source.h"
#include "atom.h" #include "atom.h"
#include "comm.h"
#include "domain.h" #include "domain.h"
#include "error.h" #include "error.h"
#include "region.h" #include "region.h"
@ -45,6 +46,9 @@ FixTDPDSource::FixTDPDSource(LAMMPS *lmp, int narg, char **arg) :
center[2] = utils::numeric(FLERR, arg[iarg++], false, lmp); center[2] = utils::numeric(FLERR, arg[iarg++], false, lmp);
radius = utils::numeric(FLERR, arg[iarg++], false, lmp); radius = utils::numeric(FLERR, arg[iarg++], false, lmp);
value = utils::numeric(FLERR, arg[iarg++], false, lmp); value = utils::numeric(FLERR, arg[iarg++], false, lmp);
if (comm->me == 0)
error->warning(FLERR, "The sphere keyword is deprecated and will be removed in the future.");
} else if (strcmp(arg[iarg], "cuboid") == 0) { } else if (strcmp(arg[iarg], "cuboid") == 0) {
option = CUBOID; option = CUBOID;
if (narg != 12) error->all(FLERR, "Illegal fix tdpd/source command (7 args for cuboid)"); if (narg != 12) error->all(FLERR, "Illegal fix tdpd/source command (7 args for cuboid)");
@ -56,6 +60,9 @@ FixTDPDSource::FixTDPDSource(LAMMPS *lmp, int narg, char **arg) :
dLy = utils::numeric(FLERR, arg[iarg++], false, lmp); dLy = utils::numeric(FLERR, arg[iarg++], false, lmp);
dLz = utils::numeric(FLERR, arg[iarg++], false, lmp); dLz = utils::numeric(FLERR, arg[iarg++], false, lmp);
value = utils::numeric(FLERR, arg[iarg++], false, lmp); value = utils::numeric(FLERR, arg[iarg++], false, lmp);
if (comm->me == 0)
error->warning(FLERR, "The cuboid keyword is deprecated and will be removed in the future.");
} else if (strcmp(arg[iarg], "region") == 0) { } else if (strcmp(arg[iarg], "region") == 0) {
option = REGION; option = REGION;
if (narg != 7) error->all(FLERR, "Illegal fix tdpd/source command (2 args for region)"); if (narg != 7) error->all(FLERR, "Illegal fix tdpd/source command (2 args for region)");