From ca64c461ff03801bce2c5184bae79ca17509db71 Mon Sep 17 00:00:00 2001 From: Stan Moore Date: Thu, 16 Apr 2020 08:19:50 -0600 Subject: [PATCH 1/3] Remove unnecessary error check in USER-DPD fix rx --- src/USER-DPD/fix_rx.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/USER-DPD/fix_rx.cpp b/src/USER-DPD/fix_rx.cpp index 46fb17cbfd..6367b32e9d 100644 --- a/src/USER-DPD/fix_rx.cpp +++ b/src/USER-DPD/fix_rx.cpp @@ -256,10 +256,6 @@ void FixRX::post_constructor() int nUniqueSpecies = 0; bool match; - for (int i = 0; i < modify->nfix; i++) - if (utils::strmatch(modify->fix[i]->style,"^property/atom") == 0) - error->all(FLERR,"fix rx cannot be combined with fix property/atom"); - char **tmpspecies = new char*[maxspecies]; int tmpmaxstrlen = 0; for(int jj=0; jj < maxspecies; jj++) From 19ac94e9a38d9625a352cb30616221022076544a Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 16 Apr 2020 13:15:41 -0400 Subject: [PATCH 2/3] remove @timmattox as a code owner of USER-DPD --- .github/CODEOWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a2ab1d4407..d44b3dfb4d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -22,7 +22,6 @@ src/SPIN/* @julient31 src/USER-CGDNA/* @ohenrich src/USER-CGSDK/* @akohlmey src/USER-COLVARS/* @giacomofiorin -src/USER-DPD/* @timattox src/USER-INTEL/* @wmbrownintel src/USER-MANIFOLD/* @Pakketeretet2 src/USER-MEAMC/* @martok From b3c7c1f93cba39c12edbaea132c63e29bc20e77e Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 16 Apr 2020 15:13:21 -0400 Subject: [PATCH 3/3] utils.h is not used anymore --- src/USER-DPD/fix_rx.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/USER-DPD/fix_rx.cpp b/src/USER-DPD/fix_rx.cpp index 6367b32e9d..3d870cc902 100644 --- a/src/USER-DPD/fix_rx.cpp +++ b/src/USER-DPD/fix_rx.cpp @@ -31,7 +31,6 @@ #include "neigh_request.h" #include "math_special.h" #include "pair_dpd_fdt_energy.h" -#include "utils.h" #include // std::vector<> #include // std::max