From 8728a8ddae67b49e915632920b7e1ae60b8c5f90 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 15 Jun 2017 15:16:50 -0400 Subject: [PATCH] restore heuristics for checking against integrators that broke after PR #499 was merged --- src/USER-DPD/fix_shardlow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/USER-DPD/fix_shardlow.cpp b/src/USER-DPD/fix_shardlow.cpp index e85d1e9c8e..6b367d0f7f 100644 --- a/src/USER-DPD/fix_shardlow.cpp +++ b/src/USER-DPD/fix_shardlow.cpp @@ -184,12 +184,12 @@ void FixShardlow::setup(int vflag) bool fixShardlow = false; for (int i = 0; i < modify->nfix; i++) - if (strcmp(modify->fix[i]->style,"nvt") == 0 || strcmp(modify->fix[i]->style,"npt") == 0) + if (strncmp(modify->fix[i]->style,"nvt",3) == 0 || strncmp(modify->fix[i]->style,"npt",3) == 0) error->all(FLERR,"Cannot use constant temperature integration routines with DPD."); for (int i = 0; i < modify->nfix; i++){ if (strcmp(modify->fix[i]->style,"shardlow") == 0) fixShardlow = true; - if (strcmp(modify->fix[i]->style,"nve") == 0 || (strcmp(modify->fix[i]->style,"nph") == 0)){ + if (strncmp(modify->fix[i]->style,"nve",3) == 0 || (strncmp(modify->fix[i]->style,"nph",3) == 0)){ if(fixShardlow) break; else error->all(FLERR,"The deterministic integrator must follow fix shardlow in the input file."); }