From 681ad88f08d16a009d39583fb724a7e8d97decea Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Fri, 5 Aug 2022 02:57:38 -0400 Subject: [PATCH] rename fix STORE_LOCAL to STORE/LOCAL for consistency --- doc/src/bond_bpm_rotational.rst | 3 +-- src/BPM/bond_bpm.cpp | 10 +++++----- src/MISC/pair_tracker.cpp | 2 +- src/fix_store_local.cpp | 6 +++--- src/fix_store_local.h | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/doc/src/bond_bpm_rotational.rst b/doc/src/bond_bpm_rotational.rst index b13d27dfbe..ae4fc3da64 100644 --- a/doc/src/bond_bpm_rotational.rst +++ b/doc/src/bond_bpm_rotational.rst @@ -38,8 +38,7 @@ Examples 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_style bpm/rotational myfix 1000 time id1 id2 - fix myfix all store/local 1000 3 + bond_style bpm/rotational store/local myfix 1000 time id1 id2 dump 1 all local 1000 dump.broken f_myfix[1] f_myfix[2] f_myfix[3] dump_modify 1 write_header no diff --git a/src/BPM/bond_bpm.cpp b/src/BPM/bond_bpm.cpp index b019815cfa..67c1992912 100644 --- a/src/BPM/bond_bpm.cpp +++ b/src/BPM/bond_bpm.cpp @@ -84,9 +84,9 @@ void BondBPM::init_style() { if (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 (strcmp(ifix->style, "STORE_LOCAL") != 0) - error->all(FLERR, "Incorrect fix style matched, not store/local"); + if (!ifix) error->all(FLERR, "Cannot find fix STORE/LOCAL id {}",id_fix_store_local); + if (strcmp(ifix->style, "STORE/LOCAL") != 0) + error->all(FLERR, "Incorrect fix style matched, not STORE/LOCAL: {}",ifix->style); fix_store_local = dynamic_cast(ifix); fix_store_local->nvalues = nvalues; } @@ -141,7 +141,7 @@ void BondBPM::init_style() global settings All args before store/local command are saved for potential args 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 ------------------------------------------------------------------------- */ @@ -202,7 +202,7 @@ void BondBPM::settings(int narg, char **arg) auto ifix = modify->get_fix_by_id(id_fix_store_local); if (!ifix) 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(ifix); // Use property/atom to save reference positions as it can transfer to ghost atoms diff --git a/src/MISC/pair_tracker.cpp b/src/MISC/pair_tracker.cpp index df49811a10..e24e8f3265 100644 --- a/src/MISC/pair_tracker.cpp +++ b/src/MISC/pair_tracker.cpp @@ -300,7 +300,7 @@ void PairTracker::settings(int narg, char **arg) fix_store_local = dynamic_cast(modify->get_fix_by_id(id_fix_store_local)); if (!fix_store_local) fix_store_local = dynamic_cast(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))); } /* ---------------------------------------------------------------------- diff --git a/src/fix_store_local.cpp b/src/fix_store_local.cpp index a61e8b58b0..a3a6906325 100644 --- a/src/fix_store_local.cpp +++ b/src/fix_store_local.cpp @@ -29,16 +29,16 @@ using namespace FixConst; FixStoreLocal::FixStoreLocal(LAMMPS *lmp, int narg, char **arg) : 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; 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; 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) size_local_cols = 0; else diff --git a/src/fix_store_local.h b/src/fix_store_local.h index 6ff867f645..33b4b5a802 100644 --- a/src/fix_store_local.h +++ b/src/fix_store_local.h @@ -13,7 +13,7 @@ #ifdef FIX_CLASS // clang-format off -FixStyle(STORE_LOCAL,FixStoreLocal); +FixStyle(STORE/LOCAL,FixStoreLocal); // clang-format on #else