Merge branch 'master' into user-dielectric

2021-06-05 11:14:44 -04:00
parent f92bee868a d74d7cfd5f
commit 13b8c63e7a
4206 changed files with 130459 additions and 50114 deletions
--- a/src/atom.cpp
+++ b/src/atom.cpp
@ -1,6 +1,7 @@
+// clang-format off
 /* ----------------------------------------------------------------------
   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
-   https://lammps.sandia.gov/, Sandia National Laboratories
+   https://www.lammps.org/, Sandia National Laboratories
   Steve Plimpton, sjplimp@sandia.gov

   Copyright (2003) Sandia Corporation.  Under the terms of Contract
@ -34,6 +35,7 @@
 #include "library.h"

 #include <algorithm>
+#include <cmath>
 #include <cstring>

 #ifdef LMP_USER_INTEL