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

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

This commit is contained in:
sjplimp 2012-10-02 22:46:17 +00:00
parent 1adc4fee98
commit 53b3866b3d
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/USER-OMP/pair_buck_coul_omp.cpp
View File

@ -13,7 +13,7 @@
------------------------------------------------------------------------- */
#include "math.h"
#include "pair_buck_coul_omp.h"
#include "pair_buck_disp_coul_long_omp.h"
#include "atom.h"
#include "comm.h"
#include "math_vector.h"
@ -34,8 +34,8 @@ using namespace LAMMPS_NS;
/* ---------------------------------------------------------------------- */
PairBuckCoulOMP::PairBuckCoulOMP(LAMMPS *lmp) :
PairBuckCoul(lmp), ThrOMP(lmp, THR_PAIR)
PairBuckDispCoulLongOMP::PairBuckDispCoulLongOMP(LAMMPS *lmp) :
PairBuckDispCoulLong(lmp), ThrOMP(lmp, THR_PAIR)
{
suffix_flag |= Suffix::OMP;
respa_enable = 0;
@ -44,7 +44,7 @@ PairBuckCoulOMP::PairBuckCoulOMP(LAMMPS *lmp) :
/* ---------------------------------------------------------------------- */
void PairBuckCoulOMP::compute(int eflag, int vflag)
void PairBuckDispCoulLongOMP::compute(int eflag, int vflag)
{
if (eflag || vflag) {
ev_setup(eflag,vflag);
@ -84,7 +84,7 @@ void PairBuckCoulOMP::compute(int eflag, int vflag)
/* ---------------------------------------------------------------------- */
template <int EVFLAG, int EFLAG, int NEWTON_PAIR>
void PairBuckCoulOMP::eval(int iifrom, int iito, ThrData * const thr)
void PairBuckDispCoulLongOMP::eval(int iifrom, int iito, ThrData * const thr)
{
double evdwl,ecoul,fpair;
evdwl = ecoul = 0.0;
@ -220,10 +220,10 @@ void PairBuckCoulOMP::eval(int iifrom, int iito, ThrData * const thr)
/* ---------------------------------------------------------------------- */
double PairBuckCoulOMP::memory_usage()
double PairBuckDispCoulLongOMP::memory_usage()
{
double bytes = memory_usage_thr();
bytes += PairBuckCoul::memory_usage();
bytes += PairBuckDispCoulLong::memory_usage();
return bytes;
}

12
src/USER-OMP/pair_buck_coul_omp.h
View File

@ -17,22 +17,22 @@
#ifdef PAIR_CLASS
PairStyle(buck/coul/omp,PairBuckCoulOMP)
PairStyle(buck/disp/coul/long/omp,PairBuckDispCoulLongOMP)
#else
#ifndef LMP_PAIR_BUCK_COUL_OMP_H
#define LMP_PAIR_BUCK_COUL_OMP_H
#ifndef LMP_PAIR_BUCK_DISP_COUL_LONG_OMP_H
#define LMP_PAIR_BUCK_DISP_COUL_LONG_OMP_H
#include "pair_buck_coul.h"
#include "pair_buck_disp_coul_long.h"
#include "thr_omp.h"
namespace LAMMPS_NS {
class PairBuckCoulOMP : public PairBuckCoul, public ThrOMP {
class PairBuckDispCoulLongOMP : public PairBuckDispCoulLong, public ThrOMP {
public:
PairBuckCoulOMP(class LAMMPS *);
PairBuckDispCoulLongOMP(class LAMMPS *);
virtual void compute(int, int);
virtual double memory_usage();

14
src/USER-OMP/pair_lj_coul_omp.cpp
View File

@ -13,7 +13,7 @@
------------------------------------------------------------------------- */
#include "math.h"
#include "pair_lj_coul_omp.h"
#include "pair_lj_disp_coul_long_omp.h"
#include "atom.h"
#include "comm.h"
#include "math_vector.h"
@ -34,8 +34,8 @@ using namespace LAMMPS_NS;
/* ---------------------------------------------------------------------- */
PairLJCoulOMP::PairLJCoulOMP(LAMMPS *lmp) :
PairLJCoul(lmp), ThrOMP(lmp, THR_PAIR)
PairLJDispCoulLongOMP::PairLJDispCoulLongOMP(LAMMPS *lmp) :
PairLJDispCoulLong(lmp), ThrOMP(lmp, THR_PAIR)
{
suffix_flag |= Suffix::OMP;
respa_enable = 0;
@ -44,7 +44,7 @@ PairLJCoulOMP::PairLJCoulOMP(LAMMPS *lmp) :
/* ---------------------------------------------------------------------- */
void PairLJCoulOMP::compute(int eflag, int vflag)
void PairLJDispCoulLongOMP::compute(int eflag, int vflag)
{
if (eflag || vflag) {
ev_setup(eflag,vflag);
@ -84,7 +84,7 @@ void PairLJCoulOMP::compute(int eflag, int vflag)
/* ---------------------------------------------------------------------- */
template <int EVFLAG, int EFLAG, int NEWTON_PAIR>
void PairLJCoulOMP::eval(int iifrom, int iito, ThrData * const thr)
void PairLJDispCoulLongOMP::eval(int iifrom, int iito, ThrData * const thr)
{
double evdwl,ecoul,fpair;
evdwl = ecoul = 0.0;
@ -224,10 +224,10 @@ void PairLJCoulOMP::eval(int iifrom, int iito, ThrData * const thr)
/* ---------------------------------------------------------------------- */
double PairLJCoulOMP::memory_usage()
double PairLJDispCoulLongOMP::memory_usage()
{
double bytes = memory_usage_thr();
bytes += PairLJCoul::memory_usage();
bytes += PairLJDispCoulLong::memory_usage();
return bytes;
}

12
src/USER-OMP/pair_lj_coul_omp.h
View File

@ -17,22 +17,22 @@
#ifdef PAIR_CLASS
PairStyle(lj/coul/omp,PairLJCoulOMP)
PairStyle(lj/disp/coul/long/omp,PairLJDispCoulLongOMP)
#else
#ifndef LMP_PAIR_LJ_COUL_OMP_H
#define LMP_PAIR_LJ_COUL_OMP_H
#ifndef LMP_PAIR_LJ_DISP_COUL_LONG_OMP_H
#define LMP_PAIR_LJ_DISP_COUL_LONG_OMP_H
#include "pair_lj_coul.h"
#include "pair_lj_disp_coul_long.h"
#include "thr_omp.h"
namespace LAMMPS_NS {
class PairLJCoulOMP : public PairLJCoul, public ThrOMP {
class PairLJDispCoulLongOMP : public PairLJDispCoulLong, public ThrOMP {
public:
PairLJCoulOMP(class LAMMPS *);
PairLJDispCoulLongOMP(class LAMMPS *);
virtual void compute(int, int);
virtual double memory_usage();