tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove redundant code: all struct members are initialized to defaults in the constructor

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-09-16 07:45:33 -04:00
parent 5411075cc6
commit 75f2eb604d
1 changed files with 0 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/variable.cpp
View File

@ -1294,8 +1294,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = atof(number);
newtree->first = newtree->second = nullptr;
newtree->extra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = atof(number);
@ -1386,8 +1384,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value1;
@ -1415,8 +1411,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value1;
@ -1447,8 +1441,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value1;
@ -1479,9 +1471,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
newtree->array = compute->vector;
newtree->nvector = compute->size_vector;
newtree->nstride = 1;
newtree->selfalloc = 0;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
// c_ID[i] = vector from global array, lowercase or uppercase
@ -1511,9 +1500,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
newtree->array = &compute->array[0][index1-1];
newtree->nvector = compute->size_array_rows;
newtree->nstride = compute->size_array_cols;
newtree->selfalloc = 0;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
// c_ID[i] = scalar from per-atom vector
@ -1583,9 +1569,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
newtree->type = ATOMARRAY;
newtree->array = compute->vector_atom;
newtree->nstride = 1;
newtree->selfalloc = 0;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
// c_ID[i] = vector from per-atom array
@ -1615,12 +1598,7 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
newtree->type = ATOMARRAY;
if (compute->array_atom)
newtree->array = &compute->array_atom[0][index1-1];
else
newtree->array = nullptr;
newtree->nstride = compute->size_peratom_cols;
newtree->selfalloc = 0;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else if (nbracket == 1 && compute->local_flag) {
@ -1683,8 +1661,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value1;
@ -1705,8 +1681,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value1;
@ -1730,8 +1704,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value1;
@ -1764,8 +1736,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
newtree->nvector = nvec;
newtree->nstride = 1;
newtree->selfalloc = 1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
// f_ID[i] = vector from global array, lowercase or uppercase
@ -1797,8 +1767,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
newtree->nvector = nvec;
newtree->nstride = 1;
newtree->selfalloc = 1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
// f_ID[i] = scalar from per-atom vector
@ -1853,9 +1821,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
newtree->type = ATOMARRAY;
newtree->array = fix->vector_atom;
newtree->nstride = 1;
newtree->selfalloc = 0;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
// f_ID[i] = vector from per-atom array
@ -1878,12 +1843,7 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
newtree->type = ATOMARRAY;
if (fix->array_atom)
newtree->array = &fix->array_atom[0][index1-1];
else
newtree->array = nullptr;
newtree->nstride = fix->size_peratom_cols;
newtree->selfalloc = 0;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else print_var_error(FLERR,"Mismatched fix in variable formula",ivar);
@ -1926,8 +1886,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value1;
@ -1945,8 +1903,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = atof(var);
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = atof(var);
@ -1981,9 +1937,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
newtree->type = ATOMARRAY;
newtree->array = reader[ivar]->fixstore->vstore;
newtree->nstride = 1;
newtree->selfalloc = 0;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
// v_name = vector from vector-style variable
@ -2006,9 +1959,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
newtree->array = vec;
newtree->nvector = nvec;
newtree->nstride = 1;
newtree->selfalloc = 0;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
// v_name[N] = scalar from atom-style variable
@ -2047,8 +1997,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = vec[m-1];
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = vec[m-1];
@ -2119,8 +2067,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value1;
@ -2141,8 +2087,6 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value1;
}
@ -2221,12 +2165,9 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
newtree->type = opprevious;
if ((opprevious == UNARY) || (opprevious == NOT)) {
newtree->first = treestack[--ntreestack];
newtree->second = nullptr;
newtree->nextra = 0;
} else {
newtree->second = treestack[--ntreestack];
newtree->first = treestack[--ntreestack];
newtree->nextra = 0;
}
treestack[ntreestack++] = newtree;
@ -3403,8 +3344,6 @@ int Variable::math_function(char *word, char *contents, Tree **tree,
if (tree) {
newtree = new Tree();
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
Tree *argtree = nullptr;
evaluate(args[0],&argtree,ivar);
newtree->first = argtree;
@ -4027,8 +3966,6 @@ int Variable::group_function(char *word, char *contents, Tree **tree,
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value;
@ -4318,8 +4255,6 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value;
@ -4339,8 +4274,6 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
Tree *newtree = new Tree();
newtree->type = GMASK;
newtree->ivalue1 = group->bitmask[igroup];
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else if (strcmp(word,"rmask") == 0) {
@ -4356,8 +4289,6 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
Tree *newtree = new Tree();
newtree->type = RMASK;
newtree->ivalue1 = iregion;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else if (strcmp(word,"grmask") == 0) {
@ -4377,8 +4308,6 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
newtree->type = GRMASK;
newtree->ivalue1 = group->bitmask[igroup];
newtree->ivalue2 = iregion;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
// special function for file-style or atomfile-style variables
@ -4407,8 +4336,6 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value;
@ -4433,8 +4360,6 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
newtree->array = result;
newtree->nstride = 1;
newtree->selfalloc = 1;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else print_var_error(FLERR,"Invalid variable style in "
@ -4454,8 +4379,6 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value;
@ -4473,8 +4396,6 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value;
@ -4492,8 +4413,6 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value;
@ -4512,8 +4431,6 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value;
}
@ -4597,8 +4514,6 @@ void Variable::peratom2global(int flag, char *word,
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = value;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = value;
}
@ -4646,9 +4561,6 @@ void Variable::atom_vector(char *word, Tree **tree,
Tree *newtree = new Tree();
newtree->type = ATOMARRAY;
newtree->nstride = 3;
newtree->selfalloc = 0;
newtree->first = newtree->second = nullptr;
newtree->nextra = 0;
treestack[ntreestack++] = newtree;
if (strcmp(word,"id") == 0) {