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

rename fix STORE_LOCAL to STORE/LOCAL for consistency

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-08-05 02:57:38 -04:00
parent a84c2ab18a
commit 681ad88f08
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/src/bond_bpm_rotational.rst
View File

@ -38,8 +38,7 @@ Examples
bond_style bpm/rotational bond_style bpm/rotational
bond_coeff 1 1.0 0.2 0.02 0.02 0.20 0.04 0.04 0.04 0.1 0.02 0.002 0.002 bond_coeff 1 1.0 0.2 0.02 0.02 0.20 0.04 0.04 0.04 0.1 0.02 0.002 0.002
bond_style bpm/rotational myfix 1000 time id1 id2 bond_style bpm/rotational store/local myfix 1000 time id1 id2
fix myfix all store/local 1000 3
dump 1 all local 1000 dump.broken f_myfix[1] f_myfix[2] f_myfix[3] dump 1 all local 1000 dump.broken f_myfix[1] f_myfix[2] f_myfix[3]
dump_modify 1 write_header no dump_modify 1 write_header no

10
src/BPM/bond_bpm.cpp
View File

@ -84,9 +84,9 @@ void BondBPM::init_style()
{ {
if (id_fix_store_local) { if (id_fix_store_local) {
auto ifix = modify->get_fix_by_id(id_fix_store_local); auto ifix = modify->get_fix_by_id(id_fix_store_local);
if (!ifix) error->all(FLERR, "Cannot find fix store/local"); if (!ifix) error->all(FLERR, "Cannot find fix STORE/LOCAL id {}",id_fix_store_local);
if (strcmp(ifix->style, "STORE_LOCAL") != 0) if (strcmp(ifix->style, "STORE/LOCAL") != 0)
error->all(FLERR, "Incorrect fix style matched, not store/local"); error->all(FLERR, "Incorrect fix style matched, not STORE/LOCAL: {}",ifix->style);
fix_store_local = dynamic_cast<FixStoreLocal *>(ifix); fix_store_local = dynamic_cast<FixStoreLocal *>(ifix);
fix_store_local->nvalues = nvalues; fix_store_local->nvalues = nvalues;
} }
@ -141,7 +141,7 @@ void BondBPM::init_style()
global settings global settings
All args before store/local command are saved for potential args All args before store/local command are saved for potential args
for specific bond BPM substyles for specific bond BPM substyles
All args after optional store/local command are variables stored All args after optional stode/local command are variables stored
in the compute store/local in the compute store/local
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
@ -202,7 +202,7 @@ void BondBPM::settings(int narg, char **arg)
auto ifix = modify->get_fix_by_id(id_fix_store_local); auto ifix = modify->get_fix_by_id(id_fix_store_local);
if (!ifix) if (!ifix)
ifix = modify->add_fix( ifix = modify->add_fix(
fmt::format("{} all STORE_LOCAL {} {}", id_fix_store_local, store_local_freq, nvalues)); fmt::format("{} all STORE/LOCAL {} {}", id_fix_store_local, store_local_freq, nvalues));
fix_store_local = dynamic_cast<FixStoreLocal *>(ifix); fix_store_local = dynamic_cast<FixStoreLocal *>(ifix);
// Use property/atom to save reference positions as it can transfer to ghost atoms // Use property/atom to save reference positions as it can transfer to ghost atoms

2
src/MISC/pair_tracker.cpp
View File

@ -300,7 +300,7 @@ void PairTracker::settings(int narg, char **arg)
fix_store_local = dynamic_cast<FixStoreLocal *>(modify->get_fix_by_id(id_fix_store_local)); fix_store_local = dynamic_cast<FixStoreLocal *>(modify->get_fix_by_id(id_fix_store_local));
if (!fix_store_local) if (!fix_store_local)
fix_store_local = dynamic_cast<FixStoreLocal *>(modify->add_fix( fix_store_local = dynamic_cast<FixStoreLocal *>(modify->add_fix(
fmt::format("{} all STORE_LOCAL {} {}", id_fix_store_local, store_local_freq, nvalues))); fmt::format("{} all STORE/LOCAL {} {}", id_fix_store_local, store_local_freq, nvalues)));
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------

6
src/fix_store_local.cpp
View File

@ -29,16 +29,16 @@ using namespace FixConst;
FixStoreLocal::FixStoreLocal(LAMMPS *lmp, int narg, char **arg) : FixStoreLocal::FixStoreLocal(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg), nvalues(0), vector(nullptr), array(nullptr) Fix(lmp, narg, arg), nvalues(0), vector(nullptr), array(nullptr)
{ {
if (narg != 5) error->all(FLERR, "Illegal fix store/local command"); if (narg != 5) error->all(FLERR, "Illegal fix STORE/LOCAL command");
local_flag = 1; local_flag = 1;
nreset = utils::inumeric(FLERR, arg[3], false, lmp); nreset = utils::inumeric(FLERR, arg[3], false, lmp);
if (nreset <= 0) error->all(FLERR, "Illegal fix store/local command"); if (nreset <= 0) error->all(FLERR, "Illegal fix STORE/LOCAL command");
local_freq = nreset; local_freq = nreset;
nvalues = utils::inumeric(FLERR, arg[4], false, lmp); nvalues = utils::inumeric(FLERR, arg[4], false, lmp);
if (nvalues <= 0) error->all(FLERR, "Illegal fix store/local command"); if (nvalues <= 0) error->all(FLERR, "Illegal fix STORE/LOCAL command");
if (nvalues == 1) if (nvalues == 1)
size_local_cols = 0; size_local_cols = 0;
else else

2
src/fix_store_local.h
View File

@ -13,7 +13,7 @@
#ifdef FIX_CLASS #ifdef FIX_CLASS
// clang-format off // clang-format off
FixStyle(STORE_LOCAL,FixStoreLocal); FixStyle(STORE/LOCAL,FixStoreLocal);
// clang-format on // clang-format on
#else #else