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 @@ WeakEquationDiffusion::~WeakEquationDiffusion(void)
//---------------------------------------------------------------------
void WeakEquationDiffusion::M_integrand(
const FIELD_MATS &fields,
const Material * material,
const Material * /* material */,
DENS_MAT & capacity ) const
{
FIELD_MATS::const_iterator rhoField = fields.find(SPECIES_CONCENTRATION);
@ -38,10 +38,10 @@ void WeakEquationDiffusion::M_integrand(
// compute flux
//--------------------------------------------------------------
void WeakEquationDiffusion::B_integrand(
const FIELD_MATS &fields,
const GRAD_FIELD_MATS &grad_fields,
const Material * material,
DENS_MAT_VEC &flux) const
const FIELD_MATS & /* fields */,
const GRAD_FIELD_MATS & /* grad_fields */,
const Material * /* material */,
DENS_MAT_VEC & /* flux */) const
{
// material->diffusion_flux(fields, grad_fields, flux[SPECIES_CONCENTRATION]);
}