Merge branch 'develop' into collected-small-changes

2022-02-07 19:59:10 -05:00
parent 2445f85dde b75c306543
commit b01716472b
30 changed files with 597 additions and 1733 deletions
--- a/unittest/force-styles/tests/kspace-pppm_ad.yaml
+++ b/unittest/force-styles/tests/kspace-pppm_ad.yaml
@ -2,7 +2,7 @@
 lammps_version: 10 Feb 2021
 date_generated: Fri Feb 26 23:09:29 2021
 epsilon: 7.5e-14
-skip_tests: gpu
+skip_tests: gpu kokkos_omp
 prerequisites: ! |
  atom full
  pair coul/long
--- a/unittest/force-styles/tests/manybody-pair-tersoff_mod_shift.yaml
+++ b/unittest/force-styles/tests/manybody-pair-tersoff_mod_shift.yaml
@ -2,7 +2,7 @@
 lammps_version: 10 Feb 2021
 date_generated: Fri Feb 26 23:09:20 2021
 epsilon: 5e-11
-skip_tests: gpu intel
+skip_tests: gpu intel kokkos_omp
 prerequisites: ! |
  pair tersoff/mod
 pre_commands: ! |
--- a/unittest/force-styles/tests/manybody-pair-tersoff_shift.yaml
+++ b/unittest/force-styles/tests/manybody-pair-tersoff_shift.yaml
@ -2,7 +2,7 @@
 lammps_version: 10 Feb 2021
 date_generated: Fri Feb 26 23:09:20 2021
 epsilon: 5e-13
-skip_tests: gpu intel
+skip_tests: gpu intel kokkos_omp
 prerequisites: ! |
  pair tersoff
 pre_commands: ! |
--- a/unittest/force-styles/tests/manybody-pair-tersoff_zbl_shift.yaml
+++ b/unittest/force-styles/tests/manybody-pair-tersoff_zbl_shift.yaml
@ -2,7 +2,7 @@
 lammps_version: 10 Feb 2021
 date_generated: Fri Feb 26 23:09:21 2021
 epsilon: 5e-11
-skip_tests: gpu intel
+skip_tests: gpu intel kokkos_omp
 prerequisites: ! |
  pair tersoff/zbl
 pre_commands: ! |
--- a/unittest/force-styles/tests/mol-pair-coul_dsf.yaml
+++ b/unittest/force-styles/tests/mol-pair-coul_dsf.yaml
@ -2,6 +2,7 @@
 lammps_version: 10 Feb 2021
 date_generated: Fri Feb 26 23:08:42 2021
 epsilon: 1e-12
+skip_tests: kokkos_omp
 prerequisites: ! |
  atom full
  pair coul/dsf
--- a/unittest/force-styles/tests/mol-pair-hybrid-overlay.yaml
+++ b/unittest/force-styles/tests/mol-pair-hybrid-overlay.yaml
@ -1,6 +1,7 @@
 ---
 lammps_version: 8 Apr 2021
 date_generated: Mon Apr 19 08:49:07 2021
+skip_tests: kokkos_omp
 epsilon: 5e-13
 prerequisites: ! |
  atom full
--- a/unittest/force-styles/tests/mol-pair-hybrid-scaled.yaml
+++ b/unittest/force-styles/tests/mol-pair-hybrid-scaled.yaml
@ -2,7 +2,7 @@
 lammps_version: 8 Apr 2021
 date_generated: Mon Apr 19 08:49:07 2021
 epsilon: 5e-14
-skip_tests: gpu intel omp
+skip_tests: gpu intel omp kokkos_omp
 prerequisites: ! |
  atom full
  pair lj/cut
--- a/unittest/force-styles/tests/mol-pair-hybrid_multiple.yaml
+++ b/unittest/force-styles/tests/mol-pair-hybrid_multiple.yaml
@ -2,7 +2,7 @@
 lammps_version: 8 Apr 2021
 date_generated: Mon Apr 19 08:49:08 2021
 epsilon: 5e-14
-skip_tests: gpu
+skip_tests: gpu kokkos_omp
 prerequisites: ! |
  atom full
  pair lj/cut
--- a/unittest/force-styles/tests/mol-pair-lj_cut_coul_dsf.yaml
+++ b/unittest/force-styles/tests/mol-pair-lj_cut_coul_dsf.yaml
@ -1,6 +1,7 @@
 ---
 lammps_version: 10 Feb 2021
 date_generated: Fri Feb 26 23:08:48 2021
+skip_tests: kokkos_omp
 epsilon: 8e-14
 prerequisites: ! |
  atom full
--- a/unittest/force-styles/tests/mol-pair-table.yaml
+++ b/unittest/force-styles/tests/mol-pair-table.yaml
@ -2,6 +2,7 @@
 lammps_version: 10 Feb 2021
 tags: slow
 date_generated: Fri Feb 26 23:08:56 2021
+skip_tests: kokkos_omp
 epsilon: 5e-14
 prerequisites: ! |
  atom full
--- a/unittest/force-styles/tests/mol-pair-zbl.yaml
+++ b/unittest/force-styles/tests/mol-pair-zbl.yaml
@ -2,6 +2,7 @@
 lammps_version: 10 Feb 2021
 date_generated: Fri Feb 26 23:08:57 2021
 epsilon: 1e-12
+skip_tests: kokkos_omp
 prerequisites: ! |
  atom full
  pair zbl