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
13b6196b
Commit
13b6196b
authored
8 years ago
by
Stan Moore
Browse files
Options
Downloads
Patches
Plain Diff
Fixing Kokkos compile error
parent
baf55c90
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/KOKKOS/neighbor_kokkos.cpp
+9
-17
9 additions, 17 deletions
src/KOKKOS/neighbor_kokkos.cpp
with
9 additions
and
17 deletions
src/KOKKOS/neighbor_kokkos.cpp
+
9
−
17
View file @
13b6196b
;
/* ----------------------------------------------------------------------
/* ----------------------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
http://lammps.sandia.gov, Sandia National Laboratories
http://lammps.sandia.gov, Sandia National Laboratories
Steve Plimpton, sjplimp@sandia.gov
Steve Plimpton, sjplimp@sandia.gov
...
@@ -21,6 +21,11 @@
...
@@ -21,6 +21,11 @@
#include
"atom_masks.h"
#include
"atom_masks.h"
#include
"error.h"
#include
"error.h"
#include
"kokkos.h"
#include
"kokkos.h"
#include
"force.h"
#include
"bond.h"
#include
"angle.h"
#include
"dihedral.h"
#include
"improper.h"
#include
"style_nbin.h"
#include
"style_nbin.h"
#include
"style_nstencil.h"
#include
"style_nstencil.h"
#include
"style_npair.h"
#include
"style_npair.h"
...
@@ -74,19 +79,6 @@ void NeighborKokkos::init()
...
@@ -74,19 +79,6 @@ void NeighborKokkos::init()
atomKK
=
(
AtomKokkos
*
)
atom
;
atomKK
=
(
AtomKokkos
*
)
atom
;
Neighbor
::
init
();
Neighbor
::
init
();
// 1st time allocation of xhold
// 1st time allocation of xhold
if
(
dist_check
)
if
(
dist_check
)
...
@@ -371,8 +363,8 @@ void NeighborKokkos::init_topology() {
...
@@ -371,8 +363,8 @@ void NeighborKokkos::init_topology() {
normally built with pair lists, but USER-CUDA separates them
normally built with pair lists, but USER-CUDA separates them
------------------------------------------------------------------------- */
------------------------------------------------------------------------- */
void
NeighborKokkos
::
build_topology
_kokkos
()
{
void
NeighborKokkos
::
build_topology
()
{
if
(
nlist_
device
)
{
if
(
device
_flag
)
{
neighbond_device
.
build_topology_kk
();
neighbond_device
.
build_topology_kk
();
k_bondlist
=
neighbond_device
.
k_bondlist
;
k_bondlist
=
neighbond_device
.
k_bondlist
;
...
@@ -419,4 +411,4 @@ void NeighborKokkos::build_topology_kokkos() {
...
@@ -419,4 +411,4 @@ void NeighborKokkos::build_topology_kokkos() {
k_dihedrallist
.
modify
<
LMPHostType
>
();
k_dihedrallist
.
modify
<
LMPHostType
>
();
k_improperlist
.
modify
<
LMPHostType
>
();
k_improperlist
.
modify
<
LMPHostType
>
();
}
}
}
}
\ No newline at end of file
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