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

Merge branch 'master' into symbolic-atom-constants

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-09-15 14:58:13 -04:00
parent 828ce84df5 2165f6ed38
commit 618b08dcfc
459 changed files with 11521 additions and 10514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/atom.cpp
View File

@ -2508,7 +2508,7 @@ length of the data area, and a short description.
Typically the name of the pointer variable returned
* \return pointer to the requested data cast to ``void *`` or NULL */
void *Atom::extract(char *name)
void *Atom::extract(const char *name)
{
// --------------------------------------------------------------------
// 4th customization section: customize by adding new variable name
@ -2586,9 +2586,9 @@ void *Atom::extract(char *name)
add in global to local mapping storage
------------------------------------------------------------------------- */
bigint Atom::memory_usage()
double Atom::memory_usage()
{
bigint bytes = avec->memory_usage();
double bytes = avec->memory_usage();
bytes += max_same*sizeof(int);
if (map_style == MAP_ARRAY)