git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14128 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2015-10-21 18:29:37 +00:00
parent ddfb996d8e
commit 9a878cdd67
53 changed files with 289 additions and 181 deletions
--- a/src/velocity.cpp
+++ b/src/velocity.cpp
@ -364,7 +364,8 @@ void Velocity::create(double t_desired, int seed)
  //   no-bias compute calculates temp only for new thermal velocities

  double t;
-  if (bias_flag == 0) t = temperature->compute_scalar();
+  if ((bias_flag == 0) || (temperature_nobias == NULL))
+    t = temperature->compute_scalar();
  else t = temperature_nobias->compute_scalar();
  rescale(t,t_desired);