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

This commit is contained in:
sjplimp
2007-07-06 13:50:30 +00:00
parent 1815449dce
commit 1865f7444c

View File

@ -18,6 +18,7 @@
#include "fix_gravity.h" #include "fix_gravity.h"
#include "atom.h" #include "atom.h"
#include "update.h" #include "update.h"
#include "domain.h"
#include "error.h" #include "error.h"
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
@ -80,14 +81,27 @@ void FixGravity::init()
dt = update->dt; dt = update->dt;
if (granular) { if (granular) {
xgrav = sin(degree2rad * theta) * cos(degree2rad * phi); if (domain->dimension == 3) {
ygrav = sin(degree2rad * theta) * sin(degree2rad * phi); xgrav = sin(degree2rad * theta) * cos(degree2rad * phi);
zgrav = cos(degree2rad * theta); ygrav = sin(degree2rad * theta) * sin(degree2rad * phi);
zgrav = cos(degree2rad * theta);
} else {
xgrav = sin(degree2rad * theta);
ygrav = cos(degree2rad * theta);
zgrav = 0.0;
}
} else { } else {
double length = sqrt(xdir*xdir + ydir*ydir + zdir*zdir); if (domain->dimension == 3) {
xgrav = magnitude * xdir/length; double length = sqrt(xdir*xdir + ydir*ydir + zdir*zdir);
ygrav = magnitude * ydir/length; xgrav = magnitude * xdir/length;
zgrav = magnitude * zdir/length; ygrav = magnitude * ydir/length;
zgrav = magnitude * zdir/length;
} else {
double length = sqrt(xdir*xdir + ydir*ydir);
xgrav = magnitude * xdir/length;
ygrav = magnitude * ydir/length;
zgrav = 0.0;
}
} }
} }