|
|
aa6c6169a8
|
Merge branch 'master' into prepare-clang-format
# Conflicts:
# src/KOKKOS/nbin_kokkos.h
# src/KOKKOS/nbin_ssa_kokkos.h
# src/MOLECULE/bond_fene_expand.h
# src/USER-DPD/nbin_ssa.h
# src/USER-DPD/nstencil_half_bin_2d_ssa.h
# src/USER-DPD/nstencil_half_bin_3d_ssa.h
# src/USER-INTEL/nbin_intel.h
# src/USER-MISC/fix_propel_self.cpp
# src/USER-OMP/npair_full_multi_old_omp.h
# src/USER-OMP/npair_half_multi_old_newton_omp.h
# src/USER-OMP/npair_half_size_multi_newtoff_omp.h
# src/USER-OMP/npair_halffull_newtoff_omp.h
# src/USER-OMP/npair_halffull_newton_omp.h
# src/USER-OMP/npair_skip_omp.h
# src/main.cpp
# src/nbin_standard.h
# src/npair_full_multi_old.h
# src/npair_halffull_newtoff.h
# src/npair_halffull_newton.h
# src/npair_skip.h
# src/npair_skip_respa.h
# src/npair_skip_size.h
# src/npair_skip_size_off2on.h
# src/npair_skip_size_off2on_oneside.h
# src/nstencil_full_bin_2d.h
# src/nstencil_full_bin_3d.h
# src/nstencil_full_ghost_bin_2d.h
# src/nstencil_full_ghost_bin_3d.h
# src/nstencil_full_multi_2d.h
# src/nstencil_full_multi_3d.h
# src/nstencil_full_multi_old_2d.h
# src/nstencil_full_multi_old_3d.h
# src/nstencil_half_bin_2d_newtoff.cpp
# src/nstencil_half_bin_3d_newtoff.cpp
# src/nstencil_half_bin_3d_newton_tri.h
# src/nstencil_half_ghost_bin_2d_newtoff.cpp
# src/nstencil_half_ghost_bin_2d_newtoff.h
# src/nstencil_half_ghost_bin_3d_newtoff.cpp
# src/nstencil_half_ghost_bin_3d_newtoff.h
# src/nstencil_half_multi_2d.h
# src/nstencil_half_multi_2d_newtoff.h
# src/nstencil_half_multi_2d_newton_tri.h
# src/nstencil_half_multi_2d_tri.h
# src/nstencil_half_multi_3d_newtoff.h
# src/nstencil_half_multi_3d_newton_tri.h
|
2021-05-14 15:24:02 -04:00 |
|
