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

Avoid static int in lammps_last_thermo

Browse Source
This commit is contained in:
Richard Berger
2023-06-09 00:06:00 -06:00
parent 54286ce4dd
commit ecf7c24e87
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/library.cpp
View File

@ -794,7 +794,7 @@ argument string.
- yes
* - type
- data type of thermo output column; see :cpp:enum:`_LMP_DATATYPE_CONST`
- pointer to static int
- pointer to int
- yes
* - data
- actual field data for column
@ -815,7 +815,6 @@ void *lammps_last_thermo(void *handle, const char *what, int index)
Thermo *th = lmp->output->thermo;
if (!th) return nullptr;
const int nfield = *th->get_nfield();
static int datatype;
BEGIN_CAPTURE
{
@ -833,17 +832,7 @@ void *lammps_last_thermo(void *handle, const char *what, int index)
} else if (strcmp(what, "type") == 0) {
if ((index < 0) || (index >= nfield)) return nullptr;
const auto &field = th->get_fields()[index];
if (field.type == multitype::INT) {
datatype = LAMMPS_INT;
val = (void *) &datatype;
} else if (field.type == multitype::BIGINT) {
datatype = LAMMPS_INT64;
val = (void *) &datatype;
} else if (field.type == multitype::DOUBLE) {
datatype = LAMMPS_DOUBLE;
val = (void *) &datatype;
}
val = (void *) &field.type;
} else if (strcmp(what, "data") == 0) {
if ((index < 0) || (index >= nfield)) return nullptr;
const auto &field = th->get_fields()[index];

3
src/lmptype.h
View File

@ -276,7 +276,8 @@ union ubuf {
\endverbatim
*/
struct multitype {
enum { NONE, DOUBLE, INT, BIGINT };
// same values as LAMMPS_INT, LAMMPS_DOUBLE, and LAMMPS_INT64 in library.h
enum { NONE = -1, INT = 0, DOUBLE = 2, BIGINT = 4 };
int type;
union {