ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10735 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2013-09-09 15:48:50 +00:00
parent 41c15f902f
commit 12f381d605
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/fix.h
View File

@ -175,6 +175,9 @@ class Fix : protected Pointers {
virtual void write_data_section_keyword(int, FILE *) {} virtual void write_data_section_keyword(int, FILE *) {}
virtual void write_data_section(int, FILE *, int, double **, int) {} virtual void write_data_section(int, FILE *, int, double **, int) {}
virtual void zero_momentum() {}
virtual void zero_rotation() {}
virtual int modify_param(int, char **) {return 0;} virtual int modify_param(int, char **) {return 0;}
virtual void *extract(const char *, int &) {return NULL;} virtual void *extract(const char *, int &) {return NULL;}

14
src/velocity.cpp
View File

@ -27,8 +27,6 @@
#include "force.h" #include "force.h"
#include "modify.h" #include "modify.h"
#include "fix.h" #include "fix.h"
#include "fix_rigid.h"
#include "fix_rigid_small.h"
#include "compute.h" #include "compute.h"
#include "compute_temp.h" #include "compute_temp.h"
#include "random_park.h" #include "random_park.h"
@ -634,10 +632,10 @@ void Velocity::zero(int narg, char **arg)
else { else {
if (strcmp(modify->fix[rfix]->style,"rigid/small") == 0) { if (strcmp(modify->fix[rfix]->style,"rigid/small") == 0) {
lmp->init(); lmp->init();
((FixRigidSmall *) modify->fix[rfix])->setup_pre_neighbor(); modify->fix[rfix]->setup_pre_neighbor();
((FixRigidSmall *) modify->fix[rfix])->zero_momentum(); modify->fix[rfix]->zero_momentum();
} else if (strstr(modify->fix[rfix]->style,"rigid")) { } else if (strstr(modify->fix[rfix]->style,"rigid")) {
((FixRigid *) modify->fix[rfix])->zero_momentum(); modify->fix[rfix]->zero_momentum();
} else error->all(FLERR,"Velocity rigid used with non-rigid fix-ID"); } else error->all(FLERR,"Velocity rigid used with non-rigid fix-ID");
} }
@ -646,10 +644,10 @@ void Velocity::zero(int narg, char **arg)
else { else {
if (strcmp(modify->fix[rfix]->style,"rigid/small") == 0) { if (strcmp(modify->fix[rfix]->style,"rigid/small") == 0) {
lmp->init(); lmp->init();
((FixRigidSmall *) modify->fix[rfix])->setup_pre_neighbor(); modify->fix[rfix]->setup_pre_neighbor();
((FixRigidSmall *) modify->fix[rfix])->zero_rotation(); modify->fix[rfix]->zero_rotation();
} else if (strstr(modify->fix[rfix]->style,"rigid")) { } else if (strstr(modify->fix[rfix]->style,"rigid")) {
((FixRigid *) modify->fix[rfix])->zero_rotation(); modify->fix[rfix]->zero_rotation();
} else error->all(FLERR,"Velocity rigid used with non-rigid fix-ID"); } else error->all(FLERR,"Velocity rigid used with non-rigid fix-ID");
} }