Unverified Commit 7b8498fa authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1825 from akohlmey/next_patch_version 

Step version string for next patch release
parents 18a0cd3e 514271c9

doc/lammps.1

+1 −1
Original line number Diff line number Diff line 
.TH LAMMPS "20 November 2019" "2019-11-20"

.TH LAMMPS "9 January 2020" "2020-01-09"

.SH NAME

.B LAMMPS

\- Molecular Dynamics Simulator.

lib/gpu/lal_lj_tip4p_long.cpp

+5 −5
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ void LJTIP4PLongT::loop(const bool _eflag, const bool _vflag) { 




template <class numtyp, class acctyp>

void LJTIP4PLongT::copy_relations_data(int n, int* tag, int *map_array,

void LJTIP4PLongT::copy_relations_data(int n, tagint *tag, int *map_array,

                      int map_size, int *sametag, int max_same, int ago) {

  int nall = n;

  const int hn_sz = n*4; // matrix size = col size * col number

lib/gpu/lal_lj_tip4p_long.cu

+9 −9
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
//

//    begin                :

//    email                : thevsevak@gmail.com

// ***************************************************************************/

// ***************************************************************************



#ifdef NV_KERNEL

lib/gpu/lal_lj_tip4p_long.h

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public: 
  double host_memory_usage() const;



  /// Copy data from LAMMPS_NS

  void copy_relations_data(int n,int* tag, int *map_array, int map_size,

  void copy_relations_data(int n, tagint* tag, int *map_array, int map_size,

                           int *sametag, int max_same, int ago);



  /// Reimplement BaseCharge pair loop with host neighboring

lib/gpu/lal_lj_tip4p_long_ext.cpp

+3 −3
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ double ljtip4p_long_gpu_bytes() { 
  return LJTIP4PLMF.host_memory_usage();

}



void ljtip4p_long_copy_molecule_data(int n, int* tag,

void ljtip4p_long_copy_molecule_data(int n, tagint* tag,

                                     int *map_array, int map_size,

                                     int *sametag, int max_same, int ago) {

  LJTIP4PLMF.copy_relations_data(n, tag, map_array, map_size, sametag, max_same, ago);

CRA Git | Maintained and supported by SUSTech CRA and CCSE