Merge branch 'develop' into consolidate-sphere-omega-flag
# Conflicts: # src/compute_temp_sphere.cpp
This commit is contained in:
@ -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
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user