Merge pull request #2003 from stanmoore1/dpd_error

Remove unnecessary error check in USER-DPD fix rx
This commit is contained in:
Axel Kohlmeyer 2020-04-16 16:49:29 -04:00 committed by GitHub
commit 0766350838
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 6 deletions

1
.github/CODEOWNERS vendored
View File

@ -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

View File

@ -31,7 +31,6 @@
#include "neigh_request.h"
#include "math_special.h"
#include "pair_dpd_fdt_energy.h"
#include "utils.h"
#include <vector> // std::vector<>
#include <algorithm> // std::max
@ -256,10 +255,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++)