Merge branch 'develop' into consolidate-sphere-omega-flag

# Conflicts:
#	src/compute_temp_sphere.cpp
This commit is contained in:
Axel Kohlmeyer
2024-01-25 17:57:53 -05:00
532 changed files with 1949 additions and 1906 deletions

View File

@ -23,7 +23,7 @@
using namespace LAMMPS_NS;
#define INERTIA 0.4 // moment of inertia prefactor for sphere
static constexpr double INERTIA = 0.4; // moment of inertia prefactor for sphere
/* ---------------------------------------------------------------------- */