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

@ -816,7 +816,7 @@ void Material::inv_effective_mass(
};
//---------------------------------------------------------------------
void Material::heat_flux(
const FIELD_MATS & fields,
const FIELD_MATS & /* fields */,
const GRAD_FIELD_MATS & gradFields,
DENS_MAT_VEC & flux) const
{
@ -865,7 +865,7 @@ bool Material::electron_drag_power(
//---------------------------------------------------------------------
bool Material::electron_recombination(
const FIELD_MATS &fields,
const GRAD_FIELD_MATS &gradFields,
const GRAD_FIELD_MATS & /* gradFields */,
DENS_MAT & recombination) const
{
// 1/tau (n - n0)
@ -937,7 +937,7 @@ void Material::electron_flux(
}
//---------------------------------------------------------------------
void Material::electric_field(
const FIELD_MATS &fields,
const FIELD_MATS & /* fields */,
const GRAD_FIELD_MATS &gradFields,
DENS_MAT_VEC &flux) const
{
@ -950,7 +950,7 @@ void Material::electric_field(
}
//---------------------------------------------------------------------
void Material::electric_displacement(
const FIELD_MATS &fields,
const FIELD_MATS & /* fields */,
const GRAD_FIELD_MATS &gradFields,
DENS_MAT_VEC &flux) const
{