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@8221 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2012-06-04 14:30:00 +00:00
parent 0f339a9ae7
commit 6105d3ea20
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/USER-OMP/fix_gravity_omp.cpp
View File

@ -23,13 +23,17 @@
#include "atom.h"
#include "update.h"
#include "domain.h"
#include "input.h"
#include "modify.h"
#include "respa.h"
#include "variable.h"
#include "error.h"
using namespace LAMMPS_NS;
using namespace FixConst;
enum{CHUTE,SPHERICAL,GRADIENT,VECTOR};
enum{CONSTANT,EQUAL};
/* ---------------------------------------------------------------------- */
@ -40,26 +44,20 @@ FixGravityOMP::FixGravityOMP(LAMMPS *lmp, int narg, char **arg) :
void FixGravityOMP::post_force(int vflag)
{
// update direction of gravity vector if gradient style
// update gravity due to variables
if (style == GRADIENT) {
if (domain->dimension == 3) {
double phi_current = degree2rad *
(phi + (update->ntimestep - time_origin)*dt*phigrad*360.0);
double theta_current = degree2rad *
(theta + (update->ntimestep - time_origin)*dt*thetagrad*360.0);
xgrav = sin(theta_current) * cos(phi_current);
ygrav = sin(theta_current) * sin(phi_current);
zgrav = cos(theta_current);
} else {
double theta_current = degree2rad *
(theta + (update->ntimestep - time_origin)*dt*thetagrad*360.0);
xgrav = sin(theta_current);
ygrav = cos(theta_current);
}
xacc = magnitude*xgrav;
yacc = magnitude*ygrav;
zacc = magnitude*zgrav;
if (varflag != CONSTANT) {
modify->clearstep_compute();
if (mstyle == EQUAL) magnitude = input->variable->compute_equal(mvar);
if (vstyle == EQUAL) magnitude = input->variable->compute_equal(vvar);
if (pstyle == EQUAL) magnitude = input->variable->compute_equal(pvar);
if (tstyle == EQUAL) magnitude = input->variable->compute_equal(tvar);
if (xstyle == EQUAL) magnitude = input->variable->compute_equal(xvar);
if (ystyle == EQUAL) magnitude = input->variable->compute_equal(yvar);
if (zstyle == EQUAL) magnitude = input->variable->compute_equal(zvar);
modify->addstep_compute(update->ntimestep + 1);
set_acceleration();
}
const double * const * const x = atom->x;
@ -73,7 +71,7 @@ void FixGravityOMP::post_force(int vflag)
const double yacc_thr = yacc;
const double zacc_thr = zacc;
double massone;
int i;
eflag = 0;
double grav = 0.0;