"git@git.ecdf.ed.ac.uk:sgrannem/pycrac.git" did not exist on "b841bd7a2a596bbf783c13617093a95673a693fb"
Merge branch 'collected-small-changes' into doc-reorg-start
Resolved Conflicts: doc/src/Packages_details.txt doc/src/Python_shlib.txt doc/src/fix_manifoldforce.txt
No related branches found
No related tags found
Showing
- doc/src/Build_manual.txt 125 additions, 0 deletionsdoc/src/Build_manual.txt
- doc/src/Commands_bond.txt 1 addition, 1 deletiondoc/src/Commands_bond.txt
- doc/src/Errors_common.txt 1 addition, 1 deletiondoc/src/Errors_common.txt
- doc/src/Howto_bioFF.txt 4 additions, 0 deletionsdoc/src/Howto_bioFF.txt
- doc/src/Howto_tip4p.txt 2 additions, 2 deletionsdoc/src/Howto_tip4p.txt
- doc/src/Intro_features.txt 2 additions, 2 deletionsdoc/src/Intro_features.txt
- doc/src/Manual.txt 4 additions, 2 deletionsdoc/src/Manual.txt
- doc/src/Packages_details.txt 4 additions, 4 deletionsdoc/src/Packages_details.txt
- doc/src/Packages_standard.txt 2 additions, 2 deletionsdoc/src/Packages_standard.txt
- doc/src/Python_install.txt 1 addition, 1 deletiondoc/src/Python_install.txt
- doc/src/Tools.txt 30 additions, 30 deletionsdoc/src/Tools.txt
- doc/src/fix_manifoldforce.txt 1 addition, 1 deletiondoc/src/fix_manifoldforce.txt
- doc/src/fix_property_atom.txt 2 additions, 1 deletiondoc/src/fix_property_atom.txt
- doc/src/fix_wall_reflect.txt 2 additions, 2 deletionsdoc/src/fix_wall_reflect.txt
- doc/src/lammps.book 2 additions, 0 deletionsdoc/src/lammps.book
- lib/gpu/geryon/ocl_timer.h 29 additions, 11 deletionslib/gpu/geryon/ocl_timer.h
- lib/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp 2 additions, 1 deletionlib/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
- src/.gitignore 2 additions, 0 deletionssrc/.gitignore
- src/USER-UEF/fix_nh_uef.cpp 18 additions, 2 deletionssrc/USER-UEF/fix_nh_uef.cpp
- src/USER-UEF/uef_utils.cpp 167 additions, 84 deletionssrc/USER-UEF/uef_utils.cpp
Loading
Please register or sign in to comment