add /omp aliases to hybrid pair styles for consistency and added tests

without the aliases, the introspection check lead to skipping suitable tests

doc/src/Commands_pair.rst

@@ -25,10 +25,10 @@ OPT.
 
    * :doc:`none <pair_none>`
    * :doc:`zero <pair_zero>`
-   * :doc:`hybrid (k) <pair_hybrid>`
-   * :doc:`hybrid/molecular <pair_hybrid>`
-   * :doc:`hybrid/overlay (k) <pair_hybrid>`
-   * :doc:`hybrid/scaled <pair_hybrid>`
+   * :doc:`hybrid (ko) <pair_hybrid>`
+   * :doc:`hybrid/molecular (o) <pair_hybrid>`
+   * :doc:`hybrid/overlay (ko) <pair_hybrid>`
+   * :doc:`hybrid/scaled (o) <pair_hybrid>`
    * :doc:`kim <pair_kim>`
    * :doc:`list <pair_list>`
    * :doc:`tracker <pair_tracker>`

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
 """"""
 

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;                           \

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
 

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
 

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
 

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