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

@ -721,7 +721,7 @@ namespace ATC{
const SPAR_MAT &N,
const SPAR_MAT_VEC &dN,
SPAR_MAT &tangent,
const DenseMatrix<bool> *elementMask ) const
const DenseMatrix<bool> * /* elementMask */ ) const
{
int nn = nNodesUnique_;
FieldName rowField = row_col.first;
@ -1298,7 +1298,7 @@ namespace ATC{
const PhysicsModel * physicsModel,
const Array<int> & elementMaterials,
FIELDS &rhs,
bool freeOnly,
bool /* freeOnly */,
const DenseMatrix<bool> *elementMask) const
{
vector<FieldName> usedFields;
@ -2503,7 +2503,7 @@ namespace ATC{
// previously computed nodal sources
//-----------------------------------------------------------------
void FE_Engine::add_sources(const Array<bool> &fieldMask,
const double time,
const double /* time */,
const FIELDS &sources,
FIELDS &nodalSources) const
{