Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
1db6e419
"wrappers/python/vscode:/vscode.git/clone" did not exist on "612fc60bd957316ea620e0744d65c66062d18fea"
Unverified
Commit
1db6e419
authored
Aug 22, 2019
by
Chengwen Liu
Committed by
GitHub
Aug 22, 2019
Browse files
Added the W-H combining rule for AMOEBA+ VdW
parent
b71e92d9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
plugins/amoeba/openmmapi/src/AmoebaVdwForceImpl.cpp
plugins/amoeba/openmmapi/src/AmoebaVdwForceImpl.cpp
+9
-1
No files found.
plugins/amoeba/openmmapi/src/AmoebaVdwForceImpl.cpp
View file @
1db6e419
...
...
@@ -188,7 +188,8 @@ double AmoebaVdwForceImpl::calcDispersionCorrection(const System& system, const
// ARITHMETIC = 1
// GEOMETRIC = 2
// HARMONIC = 3
// HHG = 4
// W-H = 4
// HHG = 5
if
(
epsilonCombiningRule
==
"ARITHMETIC"
)
{
epsilon
=
0.5
f
*
(
iEpsilon
+
jEpsilon
);
}
else
if
(
epsilonCombiningRule
==
"GEOMETRIC"
)
{
...
...
@@ -199,6 +200,13 @@ double AmoebaVdwForceImpl::calcDispersionCorrection(const System& system, const
}
else
{
epsilon
=
0.0
;
}
}
else
if
(
epsilonCombiningRule
==
"W-H"
)
{
double
iSigma3
=
iSigma
*
iSigma
*
iSigma
;
double
jSigma3
=
jSigma
*
jSigma
*
jSigma
;
double
iSigma6
=
iSigma3
*
iSigma3
;
double
jSigma6
=
jSigma3
*
jSigma3
;
double
eps_s
=
std
::
sqrt
(
iEpsilon
*
jEpsilon
);
epsilon
=
(
eps_s
==
0.0
?
0.0
:
2.0
f
*
eps_s
*
iSigma3
*
jSigma3
/
(
iSigma6
+
jSigma6
));
}
else
{
double
epsilonS
=
std
::
sqrt
(
iEpsilon
)
+
std
::
sqrt
(
jEpsilon
);
if
(
epsilonS
!=
0.0
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment