Merge pull request #536 from akohlmey/fix-nvcc-openmp-conflicts (326a8a12) · Commits · multiscale / lammps · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

lammps
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

326a8a12

Commit 326a8a12 authored 7 years ago by sjplimp Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #536 from akohlmey/fix-nvcc-openmp-conflicts

Implement workaround for NVCC incompatibilities with OpenMP directives

parents b5300724 164cedf3

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/USER-OMP/pair_comb_omp.cpp 3 additions, 3 deletions

src/USER-OMP/pair_comb_omp.cpp
src/USER-OMP/reaxc_torsion_angles_omp.cpp 7 additions, 1 deletion

src/USER-OMP/reaxc_torsion_angles_omp.cpp
src/USER-OMP/reaxc_valence_angles_omp.cpp 12 additions, 3 deletions

src/USER-OMP/reaxc_valence_angles_omp.cpp

with 22 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment