diff --git a/doc/src/Commands_pair.rst b/doc/src/Commands_pair.rst index 0629afbf08..4ad6cc8f23 100644 --- a/doc/src/Commands_pair.rst +++ b/doc/src/Commands_pair.rst @@ -25,10 +25,10 @@ OPT. * :doc:`none ` * :doc:`zero ` - * :doc:`hybrid (k) ` - * :doc:`hybrid/molecular ` - * :doc:`hybrid/overlay (k) ` - * :doc:`hybrid/scaled ` + * :doc:`hybrid (ko) ` + * :doc:`hybrid/molecular (o) ` + * :doc:`hybrid/overlay (ko) ` + * :doc:`hybrid/scaled (o) ` * :doc:`kim ` * :doc:`list ` * :doc:`tracker ` diff --git a/doc/src/pair_hybrid.rst b/doc/src/pair_hybrid.rst index 4108aa6154..634717f8a8 100644 --- a/doc/src/pair_hybrid.rst +++ b/doc/src/pair_hybrid.rst @@ -1,26 +1,34 @@ .. index:: pair_style hybrid .. index:: pair_style hybrid/kk +.. index:: pair_style hybrid/omp .. index:: pair_style hybrid/molecular +.. index:: pair_style hybrid/molecular/omp .. index:: pair_style hybrid/overlay +.. index:: pair_style hybrid/overlay/omp .. index:: pair_style hybrid/overlay/kk .. index:: pair_style hybrid/scaled +.. index:: pair_style hybrid/scaled/omp pair_style hybrid command ========================= -Accelerator Variants: *hybrid/kk* +Accelerator Variants: *hybrid/kk*, *hybrid/omp* pair_style hybrid/molecular command =================================== +Accelerator Variant: *hybrid/molecular/omp* + pair_style hybrid/overlay command ================================= -Accelerator Variants: *hybrid/overlay/kk* +Accelerator Variants: *hybrid/overlay/kk*, *hybrid/overlay/omp* pair_style hybrid/scaled command ================================== +Accelerator Variant: *hybrid/scaled/omp* + Syntax """""" diff --git a/src/OPENMP/fix_omp.cpp b/src/OPENMP/fix_omp.cpp index 58051d5fa0..59f0e9d534 100644 --- a/src/OPENMP/fix_omp.cpp +++ b/src/OPENMP/fix_omp.cpp @@ -231,7 +231,11 @@ void FixOMP::init() if ( (strcmp(force->name ## _style,"hybrid") == 0) || \ (strcmp(force->name ## _style,"hybrid/overlay") == 0) || \ (strcmp(force->name ## _style,"hybrid/scaled") == 0) || \ - (strcmp(force->name ## _style,"hybrid/molecular") == 0) ) \ + (strcmp(force->name ## _style,"hybrid/molecular") == 0) || \ + (strcmp(force->name ## _style,"hybrid/omp") == 0) || \ + (strcmp(force->name ## _style,"hybrid/overlay/omp") == 0) || \ + (strcmp(force->name ## _style,"hybrid/scaled/omp") == 0) || \ + (strcmp(force->name ## _style,"hybrid/molecular/omp") == 0) ) \ check_hybrid=1; \ if (force->name->suffix_flag & Suffix::OMP) { \ last_force_name = (const char *) #name; \ diff --git a/src/pair_hybrid.h b/src/pair_hybrid.h index d3a7693f9b..b59cc82cb4 100644 --- a/src/pair_hybrid.h +++ b/src/pair_hybrid.h @@ -14,6 +14,7 @@ #ifdef PAIR_CLASS // clang-format off PairStyle(hybrid,PairHybrid); +PairStyle(hybrid/omp,PairHybrid); // clang-format on #else diff --git a/src/pair_hybrid_molecular.h b/src/pair_hybrid_molecular.h index 4493de777e..92f8bdc198 100644 --- a/src/pair_hybrid_molecular.h +++ b/src/pair_hybrid_molecular.h @@ -14,6 +14,7 @@ #ifdef PAIR_CLASS // clang-format off PairStyle(hybrid/molecular,PairHybridMolecular); +PairStyle(hybrid/molecular/omp,PairHybridMolecular); // clang-format on #else diff --git a/src/pair_hybrid_overlay.h b/src/pair_hybrid_overlay.h index ea0babbde5..f0e85b859f 100644 --- a/src/pair_hybrid_overlay.h +++ b/src/pair_hybrid_overlay.h @@ -14,6 +14,7 @@ #ifdef PAIR_CLASS // clang-format off PairStyle(hybrid/overlay,PairHybridOverlay); +PairStyle(hybrid/overlay/omp,PairHybridOverlay); // clang-format on #else diff --git a/src/pair_hybrid_scaled.h b/src/pair_hybrid_scaled.h index 64fd938822..2af5b61f8d 100644 --- a/src/pair_hybrid_scaled.h +++ b/src/pair_hybrid_scaled.h @@ -14,6 +14,7 @@ #ifdef PAIR_CLASS // clang-format off PairStyle(hybrid/scaled,PairHybridScaled); +PairStyle(hybrid/scaled/omp,PairHybridScaled); // clang-format on #else