Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lammps
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
multiscale
lammps
Commits
44285f81
Commit
44285f81
authored
7 years ago
by
Axel Kohlmeyer
Browse files
Options
Downloads
Patches
Plain Diff
more cleanup and respa code removal
parent
98bcf51a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/pair_lj_cut_coul_wolf.cpp
+3
-8
3 additions, 8 deletions
src/pair_lj_cut_coul_wolf.cpp
src/pair_lj_cut_coul_wolf.h
+0
-1
0 additions, 1 deletion
src/pair_lj_cut_coul_wolf.h
with
3 additions
and
9 deletions
src/pair_lj_cut_coul_wolf.cpp
+
3
−
8
View file @
44285f81
...
@@ -29,7 +29,6 @@
...
@@ -29,7 +29,6 @@
#include
"update.h"
#include
"update.h"
#include
"integrate.h"
#include
"integrate.h"
#include
"math_const.h"
#include
"math_const.h"
#include
"math_special.h"
#include
"memory.h"
#include
"memory.h"
#include
"error.h"
#include
"error.h"
...
@@ -95,8 +94,8 @@ void PairLJCutCoulWolf::compute(int eflag, int vflag)
...
@@ -95,8 +94,8 @@ void PairLJCutCoulWolf::compute(int eflag, int vflag)
e_self
=
v_sh
=
0.0
;
e_self
=
v_sh
=
0.0
;
e_shift
=
erfc
(
alf
*
cut_coul
)
/
cut_coul
;
e_shift
=
erfc
(
alf
*
cut_coul
)
/
cut_coul
;
f_shift
=
-
(
e_shift
+
2.0
*
alf
/
MY_PIS
*
exp
(
-
alf
*
alf
*
cut_coul
*
cut_coul
))
/
f_shift
=
-
(
e_shift
+
2.0
*
alf
/
MY_PIS
cut_coul
;
*
exp
(
-
alf
*
alf
*
cut_coul
*
cut_coul
))
/
cut_coul
;
inum
=
list
->
inum
;
inum
=
list
->
inum
;
ilist
=
list
->
ilist
;
ilist
=
list
->
ilist
;
...
@@ -167,6 +166,7 @@ void PairLJCutCoulWolf::compute(int eflag, int vflag)
...
@@ -167,6 +166,7 @@ void PairLJCutCoulWolf::compute(int eflag, int vflag)
offset
[
itype
][
jtype
];
offset
[
itype
][
jtype
];
evdwl
*=
factor_lj
;
evdwl
*=
factor_lj
;
}
else
evdwl
=
0.0
;
}
else
evdwl
=
0.0
;
if
(
rsq
<
cut_coulsq
)
{
if
(
rsq
<
cut_coulsq
)
{
ecoul
=
v_sh
;
ecoul
=
v_sh
;
if
(
factor_coul
<
1.0
)
ecoul
-=
(
1.0
-
factor_coul
)
*
prefactor
;
if
(
factor_coul
<
1.0
)
ecoul
-=
(
1.0
-
factor_coul
)
*
prefactor
;
...
@@ -311,11 +311,6 @@ double PairLJCutCoulWolf::init_one(int i, int j)
...
@@ -311,11 +311,6 @@ double PairLJCutCoulWolf::init_one(int i, int j)
lj4
[
j
][
i
]
=
lj4
[
i
][
j
];
lj4
[
j
][
i
]
=
lj4
[
i
][
j
];
offset
[
j
][
i
]
=
offset
[
i
][
j
];
offset
[
j
][
i
]
=
offset
[
i
][
j
];
// check interior rRESPA cutoff
if
(
cut_respa
&&
cut_lj
[
i
][
j
]
<
cut_respa
[
3
])
error
->
all
(
FLERR
,
"Pair cutoff < Respa interior cutoff"
);
// compute I,J contribution to long-range tail correction
// compute I,J contribution to long-range tail correction
// count total # of atoms of type I and J via Allreduce
// count total # of atoms of type I and J via Allreduce
...
...
This diff is collapsed.
Click to expand it.
src/pair_lj_cut_coul_wolf.h
+
0
−
1
View file @
44285f81
...
@@ -45,7 +45,6 @@ class PairLJCutCoulWolf : public Pair {
...
@@ -45,7 +45,6 @@ class PairLJCutCoulWolf : public Pair {
double
**
cut_lj
,
**
cut_ljsq
;
double
**
cut_lj
,
**
cut_ljsq
;
double
**
epsilon
,
**
sigma
;
double
**
epsilon
,
**
sigma
;
double
**
lj1
,
**
lj2
,
**
lj3
,
**
lj4
,
**
offset
;
double
**
lj1
,
**
lj2
,
**
lj3
,
**
lj4
,
**
offset
;
double
*
cut_respa
;
double
cut_coul
,
cut_coulsq
,
alf
;
double
cut_coul
,
cut_coulsq
,
alf
;
virtual
void
allocate
();
virtual
void
allocate
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment