mirror of https://github.com/lammps/lammps.git
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6327 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
parent
13a2f85dc3
commit
147842df01
|
@ -219,7 +219,7 @@ void PairGayBerne::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -207,7 +207,7 @@ void PairRESquared::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -126,7 +126,7 @@ void PairLJClass2::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -149,7 +149,7 @@ void PairLJClass2CoulCut::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -166,7 +166,7 @@ void PairLJClass2CoulLong::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -202,7 +202,7 @@ void PairColloid::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -277,7 +277,7 @@ void PairLubricate::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -112,7 +112,7 @@ void PairYukawaColloid::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -255,7 +255,7 @@ void PairDipoleCut::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -32,7 +32,7 @@ using namespace LAMMPS_NS;
|
||||||
|
|
||||||
PairGranHooke::PairGranHooke(LAMMPS *lmp) : PairGranHookeHistory(lmp)
|
PairGranHooke::PairGranHooke(LAMMPS *lmp) : PairGranHookeHistory(lmp)
|
||||||
{
|
{
|
||||||
no_virial_compute = 0;
|
no_virial_fdotr_compute = 0;
|
||||||
history = 0;
|
history = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -192,5 +192,5 @@ void PairGranHooke::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,7 @@ using namespace LAMMPS_NS;
|
||||||
PairGranHookeHistory::PairGranHookeHistory(LAMMPS *lmp) : Pair(lmp)
|
PairGranHookeHistory::PairGranHookeHistory(LAMMPS *lmp) : Pair(lmp)
|
||||||
{
|
{
|
||||||
single_enable = 0;
|
single_enable = 0;
|
||||||
no_virial_compute = 1;
|
no_virial_fdotr_compute = 1;
|
||||||
history = 1;
|
history = 1;
|
||||||
fix_history = NULL;
|
fix_history = NULL;
|
||||||
|
|
||||||
|
|
|
@ -174,7 +174,7 @@ void PairBornCoulLong::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -166,7 +166,7 @@ void PairBuckCoulLong::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -171,7 +171,7 @@ void PairCoulLong::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -219,7 +219,7 @@ void PairLJCharmmCoulLong::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -199,7 +199,7 @@ void PairLJCutCoulLong::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -58,7 +58,7 @@ PairLJCutCoulLongTIP4P::PairLJCutCoulLongTIP4P(LAMMPS *lmp) :
|
||||||
// TIP4P cannot compute virial as F dot r
|
// TIP4P cannot compute virial as F dot r
|
||||||
// due to find_M() finding bonded H atoms which are not near O atom
|
// due to find_M() finding bonded H atoms which are not near O atom
|
||||||
|
|
||||||
no_virial_compute = 1;
|
no_virial_fdotr_compute = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -98,7 +98,7 @@ void PairAIREBO::compute(int eflag, int vflag)
|
||||||
if (ljflag) FLJ(eflag,vflag);
|
if (ljflag) FLJ(eflag,vflag);
|
||||||
if (torflag) TORSION(eflag,vflag);
|
if (torflag) TORSION(eflag,vflag);
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -396,7 +396,7 @@ void PairComb::compute(int eflag, int vflag)
|
||||||
|
|
||||||
cuo_flag = 0;
|
cuo_flag = 0;
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -299,7 +299,7 @@ void PairEAM::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -311,7 +311,7 @@ void PairEIM::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -193,7 +193,7 @@ void PairSW::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -234,7 +234,7 @@ void PairTersoff::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -302,7 +302,7 @@ void PairMEAM::compute(int eflag, int vflag)
|
||||||
neigh_f2c(inum_half,ilist_half,numneigh_half,firstneigh_half);
|
neigh_f2c(inum_half,ilist_half,numneigh_half,firstneigh_half);
|
||||||
neigh_f2c(inum_half,ilist_half,numneigh_full,firstneigh_full);
|
neigh_f2c(inum_half,ilist_half,numneigh_full,firstneigh_full);
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -45,7 +45,7 @@ PairHbondDreidingLJ::PairHbondDreidingLJ(LAMMPS *lmp) : Pair(lmp)
|
||||||
// hbond cannot compute virial as F dot r
|
// hbond cannot compute virial as F dot r
|
||||||
// due to using map() to find bonded H atoms which are not near donor atom
|
// due to using map() to find bonded H atoms which are not near donor atom
|
||||||
|
|
||||||
no_virial_compute = 1;
|
no_virial_fdotr_compute = 1;
|
||||||
|
|
||||||
PI = 4.0*atan(1.0);
|
PI = 4.0*atan(1.0);
|
||||||
|
|
||||||
|
|
|
@ -185,7 +185,7 @@ void PairLJCharmmCoulCharmm::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -147,7 +147,7 @@ void PairLJCharmmCoulCharmmImplicit::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -341,7 +341,7 @@ void PairEAMOpt::eval()
|
||||||
free(fast_alpha); fast_alpha = 0;
|
free(fast_alpha); fast_alpha = 0;
|
||||||
free(fast_gamma); fast_gamma = 0;
|
free(fast_gamma); fast_gamma = 0;
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -328,7 +328,7 @@ void PairLJCharmmCoulLongOpt::eval()
|
||||||
|
|
||||||
free(fast_alpha); fast_alpha = 0;
|
free(fast_alpha); fast_alpha = 0;
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef EWALD_F
|
#undef EWALD_F
|
||||||
|
|
|
@ -188,7 +188,7 @@ void PairLJCutOpt::eval()
|
||||||
|
|
||||||
free(fast_alpha); fast_alpha = 0;
|
free(fast_alpha); fast_alpha = 0;
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -185,7 +185,7 @@ void PairMorseOpt::eval()
|
||||||
|
|
||||||
free(fast_alpha); fast_alpha = 0;
|
free(fast_alpha); fast_alpha = 0;
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ using namespace LAMMPS_NS;
|
||||||
PairPeriLPS::PairPeriLPS(LAMMPS *lmp) : Pair(lmp)
|
PairPeriLPS::PairPeriLPS(LAMMPS *lmp) : Pair(lmp)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 6; i++) virial[i] = 0.0;
|
for (int i = 0; i < 6; i++) virial[i] = 0.0;
|
||||||
no_virial_compute=1;
|
no_virial_fdotr_compute=1;
|
||||||
|
|
||||||
ifix_peri = -1;
|
ifix_peri = -1;
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ using namespace LAMMPS_NS;
|
||||||
PairPeriPMB::PairPeriPMB(LAMMPS *lmp) : Pair(lmp)
|
PairPeriPMB::PairPeriPMB(LAMMPS *lmp) : Pair(lmp)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 6; i++) virial[i] = 0.0;
|
for (int i = 0; i < 6; i++) virial[i] = 0.0;
|
||||||
no_virial_compute=1;
|
no_virial_fdotr_compute=1;
|
||||||
|
|
||||||
ifix_peri = -1;
|
ifix_peri = -1;
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,7 @@ PairREAX::PairREAX(LAMMPS *lmp) : Pair(lmp)
|
||||||
{
|
{
|
||||||
single_enable = 0;
|
single_enable = 0;
|
||||||
one_coeff = 1;
|
one_coeff = 1;
|
||||||
no_virial_compute = 1;
|
no_virial_fdotr_compute = 1;
|
||||||
|
|
||||||
nextra = 14;
|
nextra = 14;
|
||||||
pvector = new double[nextra];
|
pvector = new double[nextra];
|
||||||
|
|
|
@ -410,7 +410,7 @@ void PairCDEAM::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(vflag_fdotr) virial_compute();
|
if(vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -304,7 +304,7 @@ namespace LAMMPS_NS {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -550,7 +550,7 @@ void PairEffCut::compute(int eflag, int vflag)
|
||||||
|
|
||||||
}
|
}
|
||||||
if (vflag_fdotr) {
|
if (vflag_fdotr) {
|
||||||
virial_compute();
|
virial_fdotr_compute();
|
||||||
if (flexible_pressure_flag) virial_eff_compute();
|
if (flexible_pressure_flag) virial_eff_compute();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -580,7 +580,7 @@ void PairBuckCoul::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -582,7 +582,7 @@ void PairLJCoul::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -471,7 +471,7 @@ void PairReaxC::compute(int eflag, int vflag)
|
||||||
pvector[13] = data->my_en.e_pol;
|
pvector[13] = data->my_en.e_pol;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
|
|
||||||
// #if defined(LOG_PERFORMANCE)
|
// #if defined(LOG_PERFORMANCE)
|
||||||
// if( comm->me == 0 && fix_qeq != NULL ) {
|
// if( comm->me == 0 && fix_qeq != NULL ) {
|
||||||
|
|
|
@ -55,7 +55,7 @@ Pair::Pair(LAMMPS *lmp) : Pointers(lmp)
|
||||||
single_enable = 1;
|
single_enable = 1;
|
||||||
respa_enable = 0;
|
respa_enable = 0;
|
||||||
one_coeff = 0;
|
one_coeff = 0;
|
||||||
no_virial_compute = 0;
|
no_virial_fdotr_compute = 0;
|
||||||
ghostneigh = 0;
|
ghostneigh = 0;
|
||||||
|
|
||||||
nextra = 0;
|
nextra = 0;
|
||||||
|
@ -316,11 +316,11 @@ void Pair::ev_setup(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if vflag_global = 2 and pair::compute() calls virial_compute()
|
// if vflag_global = 2 and pair::compute() calls virial_fdotr_compute()
|
||||||
// compute global virial via (F dot r) instead of via pairwise summation
|
// compute global virial via (F dot r) instead of via pairwise summation
|
||||||
// unset other flags as appropriate
|
// unset other flags as appropriate
|
||||||
|
|
||||||
if (vflag_global == 2 && no_virial_compute == 0) {
|
if (vflag_global == 2 && no_virial_fdotr_compute == 0) {
|
||||||
vflag_fdotr = 1;
|
vflag_fdotr = 1;
|
||||||
vflag_global = 0;
|
vflag_global = 0;
|
||||||
if (vflag_atom == 0) vflag_either = 0;
|
if (vflag_atom == 0) vflag_either = 0;
|
||||||
|
@ -909,7 +909,7 @@ void Pair::v_tally_tensor(int i, int j, int nlocal, int newton_pair,
|
||||||
at this point, only pairwise forces have been accumulated in atom->f
|
at this point, only pairwise forces have been accumulated in atom->f
|
||||||
------------------------------------------------------------------------- */
|
------------------------------------------------------------------------- */
|
||||||
|
|
||||||
void Pair::virial_compute()
|
void Pair::virial_fdotr_compute()
|
||||||
{
|
{
|
||||||
double **x = atom->x;
|
double **x = atom->x;
|
||||||
double **f = atom->f;
|
double **f = atom->f;
|
||||||
|
|
|
@ -38,7 +38,7 @@ class Pair : protected Pointers {
|
||||||
int single_enable; // 1 if single() routine exists
|
int single_enable; // 1 if single() routine exists
|
||||||
int respa_enable; // 1 if inner/middle/outer rRESPA routines
|
int respa_enable; // 1 if inner/middle/outer rRESPA routines
|
||||||
int one_coeff; // 1 if allows only one coeff * * call
|
int one_coeff; // 1 if allows only one coeff * * call
|
||||||
int no_virial_compute; // 1 if does not invoke virial_compute()
|
int no_virial_fdotr_compute; // 1 if does not invoke virial_fdotr_compute()
|
||||||
int ghostneigh; // 1 if pair style needs neighbors of ghosts
|
int ghostneigh; // 1 if pair style needs neighbors of ghosts
|
||||||
double **cutghost; // cutoff for each ghost pair
|
double **cutghost; // cutoff for each ghost pair
|
||||||
|
|
||||||
|
@ -146,7 +146,7 @@ class Pair : protected Pointers {
|
||||||
double *, double *, double *);
|
double *, double *, double *);
|
||||||
void v_tally_tensor(int, int, int, int,
|
void v_tally_tensor(int, int, int, int,
|
||||||
double, double, double, double, double, double);
|
double, double, double, double, double, double);
|
||||||
void virial_compute();
|
void virial_fdotr_compute();
|
||||||
|
|
||||||
inline int sbmask(int j) {
|
inline int sbmask(int j) {
|
||||||
return j >> SBBITS & 3;
|
return j >> SBBITS & 3;
|
||||||
|
|
|
@ -136,7 +136,7 @@ void PairBorn::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -128,7 +128,7 @@ void PairBuck::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -153,7 +153,7 @@ void PairBuckCoulCut::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -120,7 +120,7 @@ void PairCoulCut::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -108,7 +108,7 @@ void PairCoulDebye::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -157,7 +157,7 @@ void PairDPD::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -132,7 +132,7 @@ void PairDPDTstat::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -138,7 +138,7 @@ void PairGauss::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (eflag_global) pvector[0] = occ;
|
if (eflag_global) pvector[0] = occ;
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -64,19 +64,21 @@ PairHybrid::~PairHybrid()
|
||||||
each sub-style computes own virial[6]
|
each sub-style computes own virial[6]
|
||||||
sum sub-style virial[6] to hybrid's virial[6]
|
sum sub-style virial[6] to hybrid's virial[6]
|
||||||
for global vflag = 2:
|
for global vflag = 2:
|
||||||
call sub-style with adjusted vflag to prevent it calling virial_compute()
|
call sub-style with adjusted vflag to prevent it calling
|
||||||
hybrid calls virial_compute() on final accumulated f
|
virial_fdotr_compute()
|
||||||
|
hybrid calls virial_fdotr_compute() on final accumulated f
|
||||||
------------------------------------------------------------------------- */
|
------------------------------------------------------------------------- */
|
||||||
|
|
||||||
void PairHybrid::compute(int eflag, int vflag)
|
void PairHybrid::compute(int eflag, int vflag)
|
||||||
{
|
{
|
||||||
int i,j,m,n;
|
int i,j,m,n;
|
||||||
|
|
||||||
// if no_virial_compute is set and global component of incoming vflag = 2
|
// if no_virial_fdotr_compute is set and global component of
|
||||||
|
// incoming vflag = 2, then
|
||||||
// reset vflag as if global component were 1
|
// reset vflag as if global component were 1
|
||||||
// necessary since one or more sub-styles cannot compute virial as F dot r
|
// necessary since one or more sub-styles cannot compute virial as F dot r
|
||||||
|
|
||||||
if (no_virial_compute && vflag % 4 == 2) vflag = 1 + vflag/4 * 4;
|
if (no_virial_fdotr_compute && vflag % 4 == 2) vflag = 1 + vflag/4 * 4;
|
||||||
|
|
||||||
if (eflag || vflag) ev_setup(eflag,vflag);
|
if (eflag || vflag) ev_setup(eflag,vflag);
|
||||||
else evflag = vflag_fdotr = eflag_global = vflag_global =
|
else evflag = vflag_fdotr = eflag_global = vflag_global =
|
||||||
|
@ -84,7 +86,7 @@ void PairHybrid::compute(int eflag, int vflag)
|
||||||
|
|
||||||
// check if global component of incoming vflag = 2
|
// check if global component of incoming vflag = 2
|
||||||
// if so, reset vflag passed to substyle as if it were 0
|
// if so, reset vflag passed to substyle as if it were 0
|
||||||
// necessary so substyle will not invoke virial_compute()
|
// necessary so substyle will not invoke virial_fdotr_compute()
|
||||||
|
|
||||||
int vflag_substyle;
|
int vflag_substyle;
|
||||||
if (vflag % 4 == 2) vflag_substyle = vflag/4 * 4;
|
if (vflag % 4 == 2) vflag_substyle = vflag/4 * 4;
|
||||||
|
@ -116,7 +118,7 @@ void PairHybrid::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
@ -262,7 +264,7 @@ void PairHybrid::settings(int narg, char **arg)
|
||||||
|
|
||||||
// single_enable = 0 if any sub-style = 0
|
// single_enable = 0 if any sub-style = 0
|
||||||
// respa_enable = 1 if any sub-style is set
|
// respa_enable = 1 if any sub-style is set
|
||||||
// no_virial_compute = 1 if any sub-style is set
|
// no_virial_fdotr_compute = 1 if any sub-style is set
|
||||||
// ghostneigh = 1 if any sub-style is set
|
// ghostneigh = 1 if any sub-style is set
|
||||||
|
|
||||||
for (m = 0; m < nstyles; m++)
|
for (m = 0; m < nstyles; m++)
|
||||||
|
@ -270,7 +272,7 @@ void PairHybrid::settings(int narg, char **arg)
|
||||||
for (m = 0; m < nstyles; m++)
|
for (m = 0; m < nstyles; m++)
|
||||||
if (styles[m]->respa_enable) respa_enable = 1;
|
if (styles[m]->respa_enable) respa_enable = 1;
|
||||||
for (m = 0; m < nstyles; m++)
|
for (m = 0; m < nstyles; m++)
|
||||||
if (styles[m]->no_virial_compute) no_virial_compute = 1;
|
if (styles[m]->no_virial_fdotr_compute) no_virial_fdotr_compute = 1;
|
||||||
for (m = 0; m < nstyles; m++)
|
for (m = 0; m < nstyles; m++)
|
||||||
if (styles[m]->ghostneigh) ghostneigh = 1;
|
if (styles[m]->ghostneigh) ghostneigh = 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -138,7 +138,7 @@ void PairLJ96Cut::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -137,7 +137,7 @@ void PairLJCut::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
|
@ -147,7 +147,7 @@ void PairLJCutCoulCut::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -122,7 +122,7 @@ void PairLJCutCoulDebye::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -129,7 +129,7 @@ void PairLJExpand::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -148,7 +148,7 @@ void PairLJGromacs::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -178,7 +178,7 @@ void PairLJGromacsCoulGromacs::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -151,7 +151,7 @@ void PairLJSmooth::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -122,7 +122,7 @@ void PairMorse::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -121,7 +121,7 @@ void PairSoft::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -179,7 +179,7 @@ void PairTable::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -121,7 +121,7 @@ void PairYukawa::compute(int eflag, int vflag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vflag_fdotr) virial_compute();
|
if (vflag_fdotr) virial_fdotr_compute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
|
|
|
@ -53,7 +53,7 @@ void Verlet::init()
|
||||||
|
|
||||||
// virial_style:
|
// virial_style:
|
||||||
// 1 if computed explicitly by pair->compute via sum over pair interactions
|
// 1 if computed explicitly by pair->compute via sum over pair interactions
|
||||||
// 2 if computed implicitly by pair->virial_compute via sum over ghost atoms
|
// 2 if computed implicitly by pair->virial_fdotr_compute via sum over ghosts
|
||||||
|
|
||||||
if (force->newton_pair) virial_style = 2;
|
if (force->newton_pair) virial_style = 2;
|
||||||
else virial_style = 1;
|
else virial_style = 1;
|
||||||
|
|
Loading…
Reference in New Issue