Merge branch 'master' into parse-logical-keyword

2021-09-20 20:41:48 -04:00
parent 6e8091470c 8d8c710982
commit 6adac6b637
414 changed files with 2159 additions and 2576 deletions
--- a/src/velocity.cpp
+++ b/src/velocity.cpp
@ -17,7 +17,6 @@
 #include "atom.h"
 #include "comm.h"
 #include "compute.h"
-#include "compute_temp.h"
 #include "domain.h"
 #include "error.h"
 #include "fix.h"