From fe10d8c87b007f9879be72fcda8cc66f3ed02908 Mon Sep 17 00:00:00 2001 From: athomps Date: Wed, 20 Jan 2016 17:29:40 +0000 Subject: [PATCH] Removed flangevin==NULL check git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14462 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/fix_langevin.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/fix_langevin.cpp b/src/fix_langevin.cpp index c71ffbc3fd..cf3161e8a8 100644 --- a/src/fix_langevin.cpp +++ b/src/fix_langevin.cpp @@ -145,9 +145,6 @@ FixLangevin::FixLangevin(LAMMPS *lmp, int narg, char **arg) : id_temp = NULL; temperature = NULL; - // flangevin is unallocated until first call to setup() - // compute_scalar checks for this and returns 0.0 if flangevin is NULL - energy = 0.0; flangevin = NULL; franprev = NULL; @@ -827,7 +824,7 @@ int FixLangevin::modify_param(int narg, char **arg) double FixLangevin::compute_scalar() { - if (!tallyflag || flangevin == NULL) return 0.0; + if (!tallyflag) return 0.0; // capture the very first energy transfer to thermal reservoir