From 6886dcb2e480d58da96b694c44a8742f4d1971ff Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Thu, 3 May 2018 23:04:07 -0400
Subject: [PATCH] correct minor issues, so LAMMPS compiles again
---
src/RIGID/fix_rigid_small.cpp | 11 ++++++++++-
src/USER-OMP/fix_rigid_nh_omp.cpp | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/RIGID/fix_rigid_small.cpp b/src/RIGID/fix_rigid_small.cpp
index 5533098318..680ae876b1 100644
--- a/src/RIGID/fix_rigid_small.cpp
+++ b/src/RIGID/fix_rigid_small.cpp
@@ -790,7 +790,7 @@ void FixRigidSmall::initial_integrate(int vflag)
which are added in when a new fcm/torque are calculated
------------------------------------------------------------------------- */
-void FixRigidSmall::apply_langevin_thermostat(int vflag)
+void FixRigidSmall::apply_langevin_thermostat()
{
double gamma1,gamma2;
@@ -865,6 +865,15 @@ void FixRigidSmall::enforce2d()
}
}
+/* ---------------------------------------------------------------------- */
+
+void FixRigidSmall::post_force(int vflag)
+{
+ if (langflag) apply_langevin_thermostat();
+ if (earlyflag) compute_forces_and_torques();
+}
+
+
/* ---------------------------------------------------------------------- */
void FixRigidSmall::compute_forces_and_torques()
diff --git a/src/USER-OMP/fix_rigid_nh_omp.cpp b/src/USER-OMP/fix_rigid_nh_omp.cpp
index 0bc05c4085..53d0134741 100644
--- a/src/USER-OMP/fix_rigid_nh_omp.cpp
+++ b/src/USER-OMP/fix_rigid_nh_omp.cpp
@@ -237,7 +237,7 @@ void FixRigidNHOMP::initial_integrate(int vflag)
void FixRigidNHOMP::compute_forces_and_torques()
{
- int ibody
+ int ibody;
double * const * _noalias const x = atom->x;
const dbl3_t * _noalias const f = (dbl3_t *) atom->f[0];
--
GitLab