Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
soap-plus-plus
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
nomad-lab
soap-plus-plus
Commits
a8478c0b
Commit
a8478c0b
authored
9 years ago
by
Carl Poelking
Browse files
Options
Downloads
Patches
Plain Diff
Three-body terms.
parent
5970e00a
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
test/test_forcefield/simspace.py
+48
-1
48 additions, 1 deletion
test/test_forcefield/simspace.py
test/test_kernelpot/kernel.py
+20
-1
20 additions, 1 deletion
test/test_kernelpot/kernel.py
with
68 additions
and
2 deletions
test/test_forcefield/simspace.py
+
48
−
1
View file @
a8478c0b
...
@@ -31,7 +31,7 @@ class SimSpaceNode(object):
...
@@ -31,7 +31,7 @@ class SimSpaceNode(object):
self
.
potentials_self
=
[]
self
.
potentials_self
=
[]
return
return
def
size
(
self
):
def
size
(
self
):
return
self
.
IX
.
shape
[
0
]
return
self
.
IX
.
shape
[
0
]
# <- Number of environments stored
def
reset
(
self
):
def
reset
(
self
):
self
.
IX
=
None
self
.
IX
=
None
self
.
dimX
=
None
self
.
dimX
=
None
...
@@ -168,6 +168,53 @@ class SimSpaceTopology(object):
...
@@ -168,6 +168,53 @@ class SimSpaceTopology(object):
np
.
savetxt
(
'
%s.energy.txt
'
%
prefix
,
E
)
np
.
savetxt
(
'
%s.energy.txt
'
%
prefix
,
E
)
return
return
class
SimSpaceThreePotential
(
object
):
def
__init__
(
self
,
A
,
B
,
C
,
options
):
self
.
A
=
A
# <- target (see force calculation)
self
.
B
=
B
self
.
C
=
C
self
.
alpha
=
np
.
array
([
float
(
options
.
get
(
'
kernel.alpha
'
))])
# INTERACTION FUNCTION
self
.
kernelfct
=
KernelFunctionFactory
[
options
.
get
(
'
kernel.type
'
)](
options
)
# Spectrum adaptor
self
.
adaptor
=
KernelAdaptorFactory
[
options
.
get
(
'
kernel.adaptor
'
)](
options
)
return
def
computeEnergy
(
self
,
return_prj_mat
=
False
):
energy
=
0.0
projection_matrix
=
[]
for
n
in
range
(
self
.
A
.
size
()):
X
=
self
.
A
.
IX
[
n
]
ic
=
self
.
kernelfct
.
compute
(
self
.
B
.
IX
,
self
.
C
.
IX
,
X
)
energy
+=
self
.
alpha
.
dot
(
ic
)
projection_matrix
.
append
(
ic
)
if
return_prj_mat
:
return
energy
,
projection_matrix
else
:
return
energy
def
computeForces
(
self
,
verbose
=
False
):
forces
=
[
np
.
zeros
((
3
))
for
i
in
range
(
self
.
A
.
structure
.
n_particles
)
]
for
atomic
in
self
.
A
.
getListAtomic
():
pid
=
atomic
.
getCenterId
()
nb_pids
=
atomic
.
getNeighbourPids
()
if
verbose
:
print
"
Center %d
"
%
(
pid
)
# neighbour-pid-independent kernel "prevector" (outer derivative)
X_unnorm
,
X_norm
=
self
.
A
.
getPidX
(
pid
)
dIC
=
self
.
kernelfct
.
computeDerivativeOuter
(
self
.
B
.
IX
,
self
.
C
.
IX
,
X_norm
)
alpha_dIC
=
self
.
alpha
.
dot
(
dIC
)
for
nb_pid
in
nb_pids
:
# Force on neighbour
if
verbose
:
print
"
-> Nb %d
"
%
(
nb_pid
)
dX_dx
,
dX_dy
,
dX_dz
=
self
.
A
.
getPidGradX
(
pid
,
nb_pid
)
force_x
=
-
alpha_dIC
.
dot
(
dX_dx
)
force_y
=
-
alpha_dIC
.
dot
(
dX_dy
)
force_z
=
-
alpha_dIC
.
dot
(
dX_dz
)
forces
[
nb_pid
-
1
][
0
]
+=
force_x
forces
[
nb_pid
-
1
][
1
]
+=
force_y
forces
[
nb_pid
-
1
][
2
]
+=
force_z
return
np
.
array
(
forces
)
def
computeGradients
(
self
,
verbose
=
False
):
return
-
1
*
self
.
computeForces
(
verbose
)
class
SimSpacePotential
(
object
):
class
SimSpacePotential
(
object
):
def
__init__
(
self
,
target
,
source
,
options
):
def
__init__
(
self
,
target
,
source
,
options
):
self
.
target
=
target
self
.
target
=
target
...
...
This diff is collapsed.
Click to expand it.
test/test_kernelpot/kernel.py
+
20
−
1
View file @
a8478c0b
...
@@ -202,8 +202,27 @@ class KernelFunctionDotLj(object):
...
@@ -202,8 +202,27 @@ class KernelFunctionDotLj(object):
def
computeBlockDot
(
self
,
IX
,
return_distance
=
False
):
def
computeBlockDot
(
self
,
IX
,
return_distance
=
False
):
return
self
.
kfctdot
.
computeBlock
(
IX
,
return_distance
)
return
self
.
kfctdot
.
computeBlock
(
IX
,
return_distance
)
class
KernelFunctionDot3Harm
(
object
):
def
__init__
(
self
,
options
):
self
.
kfctdot
=
KernelFunctionDot
(
options
)
def
compute
(
self
,
IX_A
,
IX_B
,
X
):
C_A
=
self
.
kfctdot
.
compute
(
IX_A
,
X
)
C_B
=
self
.
kfctdot
.
compute
(
IX_B
,
X
)
assert
False
D
=
(
1.
-
C
+
self
.
eps_cap
)
**
0.5
return
(
self
.
sigma
/
D
)
**
12
-
(
self
.
sigma
/
D
)
**
6
def
computeDerivativeOuter
(
self
,
IX_A
,
IX_B
,
X
):
assert
False
C
=
self
.
kfctdot
.
compute
(
IX
,
X
)
D
=
(
1.
-
C
+
self
.
eps_cap
)
**
0.5
IC
=
self
.
kfctdot
.
computeDerivativeOuter
(
IX
,
X
)
return
(
-
6.
*
self
.
sigma
**
12
*
(
1.
/
D
)
**
7
+
3.
*
self
.
sigma
**
6
*
(
1.
/
D
)
**
4
)
*
IC
KernelAdaptorFactory
=
{
'
generic
'
:
KernelAdaptorGeneric
,
'
global-generic
'
:
KernelAdaptorGlobalGeneric
}
KernelAdaptorFactory
=
{
'
generic
'
:
KernelAdaptorGeneric
,
'
global-generic
'
:
KernelAdaptorGlobalGeneric
}
KernelFunctionFactory
=
{
'
dot
'
:
KernelFunctionDot
,
'
dot-harmonic
'
:
KernelFunctionDotHarmonic
,
'
dot-lj
'
:
KernelFunctionDotLj
}
KernelFunctionFactory
=
{
'
dot
'
:
KernelFunctionDot
,
'
dot-harmonic
'
:
KernelFunctionDotHarmonic
,
'
dot-lj
'
:
KernelFunctionDotLj
}
class
KernelPotential
(
object
):
class
KernelPotential
(
object
):
def
__init__
(
self
,
options
):
def
__init__
(
self
,
options
):
...
...
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