From 9222278fb5fab0bd173f15c0ad0fbfc2e2b4bc9b Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Fri, 9 Jun 2017 11:00:16 -0400
Subject: [PATCH] match reax/c pair style variants against prefix and not full
name
---
src/USER-REAXC/compute_spec_atom.cpp | 4 +---
src/USER-REAXC/fix_reaxc_species.cpp | 5 +----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/USER-REAXC/compute_spec_atom.cpp b/src/USER-REAXC/compute_spec_atom.cpp
index 164ce87205..e913225492 100644
--- a/src/USER-REAXC/compute_spec_atom.cpp
+++ b/src/USER-REAXC/compute_spec_atom.cpp
@@ -43,9 +43,7 @@ ComputeSpecAtom::ComputeSpecAtom(LAMMPS *lmp, int narg, char **arg) :
else size_peratom_cols = nvalues;
// Initiate reaxc
- reaxc = (PairReaxC *) force->pair_match("reax/c",1);
- if (reaxc == NULL)
- reaxc = (PairReaxC *) force->pair_match("reax/c/kk",1);
+ reaxc = (PairReaxC *) force->pair_match("reax/c",0);
pack_choice = new FnPtrPack[nvalues];
diff --git a/src/USER-REAXC/fix_reaxc_species.cpp b/src/USER-REAXC/fix_reaxc_species.cpp
index 4e57dd1c4b..3614238e2b 100644
--- a/src/USER-REAXC/fix_reaxc_species.cpp
+++ b/src/USER-REAXC/fix_reaxc_species.cpp
@@ -298,10 +298,7 @@ void FixReaxCSpecies::init()
if (atom->tag_enable == 0)
error->all(FLERR,"Cannot use fix reax/c/species unless atoms have IDs");
- reaxc = (PairReaxC *) force->pair_match("reax/c",1);
- if (reaxc == NULL)
- reaxc = (PairReaxC *) force->pair_match("reax/c/kk",1);
-
+ reaxc = (PairReaxC *) force->pair_match("reax/c",0);
if (reaxc == NULL) error->all(FLERR,"Cannot use fix reax/c/species without "
"pair_style reax/c");
--
GitLab