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

@ -26,7 +26,7 @@ WeakEquationChargeDiffusion::~WeakEquationChargeDiffusion(void)
//---------------------------------------------------------------------
void WeakEquationChargeDiffusion::M_integrand(
const FIELD_MATS &fields,
const Material * material,
const Material * /* material */,
DENS_MAT & capacity ) const
{
FIELD_MATS::const_iterator rhoField = fields.find(CHARGE_DENSITY);