jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct minor issues, so LAMMPS compiles again

This commit is contained in:
Axel Kohlmeyer 2018-05-03 23:04:07 -04:00
parent 844858d3a7
commit 6886dcb2e4
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/RIGID/fix_rigid_small.cpp
View File

@ -790,7 +790,7 @@ void FixRigidSmall::initial_integrate(int vflag)
which are added in when a new fcm/torque are calculated 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; 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() void FixRigidSmall::compute_forces_and_torques()

2
src/USER-OMP/fix_rigid_nh_omp.cpp
View File

@ -237,7 +237,7 @@ void FixRigidNHOMP::initial_integrate(int vflag)
void FixRigidNHOMP::compute_forces_and_torques() void FixRigidNHOMP::compute_forces_and_torques()
{ {
int ibody int ibody;
double * const * _noalias const x = atom->x; double * const * _noalias const x = atom->x;
const dbl3_t * _noalias const f = (dbl3_t *) atom->f[0]; const dbl3_t * _noalias const f = (dbl3_t *) atom->f[0];