ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1825 from akohlmey/next_patch_version

Browse Source 
Step version string for next patch release
This commit is contained in:
Axel Kohlmeyer
2020-01-08 18:09:05 -05:00
committed by GitHub
parent 18a0cd3ead 514271c984
commit 7b8498fab6
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/lammps.1
View File

@ -1,4 +1,4 @@
.TH LAMMPS "20 November 2019" "2019-11-20" .TH LAMMPS "9 January 2020" "2020-01-09"
.SH NAME .SH NAME
.B LAMMPS .B LAMMPS
\- Molecular Dynamics Simulator. \- Molecular Dynamics Simulator.

2
lib/gpu/lal_lj_tip4p_long.cpp
View File

@ -229,7 +229,7 @@ void LJTIP4PLongT::loop(const bool _eflag, const bool _vflag) {
template <class numtyp, class acctyp> 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 map_size, int *sametag, int max_same, int ago) {
int nall = n; int nall = n;
const int hn_sz = n*4; // matrix size = col size * col number const int hn_sz = n*4; // matrix size = col size * col number

2
lib/gpu/lal_lj_tip4p_long.cu
View File

@ -11,7 +11,7 @@
// //
// begin : // begin :
// email : thevsevak@gmail.com // email : thevsevak@gmail.com
// ***************************************************************************/ // ***************************************************************************
#ifdef NV_KERNEL #ifdef NV_KERNEL

2
lib/gpu/lal_lj_tip4p_long.h
View File

@ -61,7 +61,7 @@ public:
double host_memory_usage() const; double host_memory_usage() const;
/// Copy data from LAMMPS_NS /// 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); int *sametag, int max_same, int ago);
/// Reimplement BaseCharge pair loop with host neighboring /// Reimplement BaseCharge pair loop with host neighboring

2
lib/gpu/lal_lj_tip4p_long_ext.cpp
View File

@ -138,7 +138,7 @@ double ljtip4p_long_gpu_bytes() {
return LJTIP4PLMF.host_memory_usage(); 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 *map_array, int map_size,
int *sametag, int max_same, int ago) { int *sametag, int max_same, int ago) {
LJTIP4PLMF.copy_relations_data(n, tag, map_array, map_size, sametag, max_same, ago); LJTIP4PLMF.copy_relations_data(n, tag, map_array, map_size, sametag, max_same, ago);

2
src/GPU/pair_lj_cut_tip4p_long_gpu.cpp
View File

@ -80,7 +80,7 @@ void ljtip4p_long_gpu_compute(const int ago, const int inum, const int nall,
bool &success, double *host_q, const int nlocal, bool &success, double *host_q, const int nlocal,
double *boxlo, double *prd); double *boxlo, double *prd);
double ljtip4p_long_gpu_bytes(); double ljtip4p_long_gpu_bytes();
void ljtip4p_long_copy_molecule_data(int, int* , int *, void ljtip4p_long_copy_molecule_data(int, tagint *, int *,
int, int *, int, int); int, int *, int, int);
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

2
src/version.h
View File

@ -1 +1 @@
#define LAMMPS_VERSION "20 Nov 2019" #define LAMMPS_VERSION "09 Jan 2020"