merged in current master

This commit is contained in:
Steve Plimpton
2020-01-13 10:34:31 -07:00
parent bf20d72fc3
commit e8d11931ec
2720 changed files with 221313 additions and 28584 deletions

View File

@ -165,7 +165,7 @@ namespace ATC {
// Constructor
//--------------------------------------------------------
SmallMoleculeSet::SmallMoleculeSet(ATC_Method * atc, int groupBit,
PerAtomQuantity<int> * bondList, PerAtomQuantity<int> * numBond) :
PerAtomQuantity<int> * bondList, PerAtomQuantity<int> * /* numBond */) :
MoleculeSet(atc,groupBit),
bondList_(bondList)
{