Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement material constructor #1597

Merged
merged 1 commit into from May 13, 2017
Merged

Implement material constructor #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 12 additions & 25 deletions source/simulator/helper_functions.cc
View file
Open in desktop
Expand Up @@ -443,6 +443,13 @@ namespace aspect
typename DoFHandler<dim>::active_cell_iterator
cell = dof_handler.begin_active(),
endc = dof_handler.end();


MaterialModel::MaterialModelInputs<dim> in(n_q_points,
introspection.n_compositional_fields);
MaterialModel::MaterialModelOutputs<dim> out(n_q_points,
introspection.n_compositional_fields);

for (; cell!=endc; ++cell)
if (cell->is_locally_owned())
{
Expand Down Expand Up @@ -472,34 +479,14 @@ namespace aspect

if (parameters.use_conduction_timestep)
{
MaterialModel::MaterialModelInputs<dim> in(n_q_points, introspection.n_compositional_fields);
MaterialModel::MaterialModelOutputs<dim> out(n_q_points, introspection.n_compositional_fields);

in.strain_rate.resize(0); // we do not need the viscosity
in.position = fe_values.get_quadrature_points();
in.cell = &cell;

fe_values[introspection.extractors.pressure].get_function_values (solution,
in.pressure);
fe_values[introspection.extractors.temperature].get_function_values (solution,
in.temperature);
fe_values[introspection.extractors.pressure].get_function_gradients (solution,
in.pressure_gradient);

for (unsigned int c=0; c<introspection.n_compositional_fields; ++c)
fe_values[introspection.extractors.compositional_fields[c]].get_function_values (solution,
composition_values[c]);

for (unsigned int q=0; q<fe_values.n_quadrature_points; ++q)
{
for (unsigned int c=0; c<introspection.n_compositional_fields; ++c)
in.composition[q][c] = composition_values[c][q];

in.velocity[q] = velocity_values[q];
}
in.reinit(fe_values,
&cell,
introspection,
solution);

material_model->evaluate(in, out);


// Evaluate thermal diffusivity at each quadrature point and
// calculate the corresponding conduction timestep, if applicable
for (unsigned int q=0; q<n_q_points; ++q)
Expand Down
27 changes: 11 additions & 16 deletions source/simulator/lateral_averaging.cc
View file
Open in desktop
Expand Up @@ -60,6 +60,12 @@ namespace aspect
cell = this->get_dof_handler().begin_active(),
endc = this->get_dof_handler().end();


MaterialModel::MaterialModelInputs<dim> in(n_q_points,
this->n_compositional_fields());
MaterialModel::MaterialModelOutputs<dim> out(n_q_points,
this->n_compositional_fields());

fctr.setup(quadrature_formula.size());

for (; cell!=endc; ++cell)
Expand All @@ -70,27 +76,16 @@ namespace aspect
{

// get the density at each quadrature point if necessary
MaterialModel::MaterialModelInputs<dim> in(fe_values,
&cell,
this->introspection(),
this->get_solution());
MaterialModel::MaterialModelOutputs<dim> out(n_q_points,
this->n_compositional_fields());
in.reinit(fe_values,
&cell,
this->introspection(),
this->get_solution());

this->get_material_model().evaluate(in, out);
fctr(in, out, fe_values, this->get_solution(), output_values);

}
else
{
MaterialModel::MaterialModelInputs<dim> in(n_q_points,
this->n_compositional_fields());
MaterialModel::MaterialModelOutputs<dim> out(n_q_points,
this->n_compositional_fields());

fctr(in, out, fe_values, this->get_solution(), output_values);
}

fctr(in, out, fe_values, this->get_solution(), output_values);

for (unsigned int q = 0; q < n_q_points; ++q)
{
Expand Down
13 changes: 8 additions & 5 deletions source/simulator/melt.cc
View file
Open in desktop
Expand Up @@ -940,6 +940,7 @@ namespace aspect

MaterialModel::MaterialModelInputs<dim> in(quadrature.size(), this->n_compositional_fields());
MaterialModel::MaterialModelOutputs<dim> out(quadrature.size(), this->n_compositional_fields());

create_material_model_outputs(out);

typename DoFHandler<dim>::active_cell_iterator cell = this->get_dof_handler().begin_active(),
Expand All @@ -959,11 +960,13 @@ namespace aspect

fe_values[this->introspection().variable("fluid pressure").extractor_scalar()].get_function_gradients (
solution, grad_p_f_values);
this->compute_material_model_input_values (solution,
fe_values,
cell,
true,
in);


in.reinit(fe_values,
&cell,
this->introspection(),
this->get_solution());


this->get_material_model().evaluate(in, out);

Expand Down