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

Removed a deprecated option #5196

Merged
merged 2 commits into from
Jul 8, 2023
Merged

Removed a deprecated option #5196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e85755b
Removed a deprecated option
poulamiiroy Jul 7, 2023
38061db
Removed a deprecated option
poulamiiroy Jul 7, 2023
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
6 changes: 2 additions & 4 deletions source/material_model/melt_global.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,9 @@ namespace aspect
&& this->get_timestep_number() > 0 && !this->get_parameters().use_operator_splitting)
{
// Prepare the field function
#if DEAL_II_VERSION_GTE(9,4,0)

Functions::FEFieldFunction<dim, LinearAlgebra::BlockVector>
#else
Functions::FEFieldFunction<dim, DoFHandler<dim>, LinearAlgebra::BlockVector>
#endif

fe_value(this->get_dof_handler(), this->get_old_solution(), this->get_mapping());

const unsigned int porosity_idx = this->introspection().compositional_index_for_name("porosity");
Expand Down
7 changes: 2 additions & 5 deletions source/particle/property/elastic_stress.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,10 @@ namespace aspect
{
material_inputs.position[0] = particle->get_location();

#if DEAL_II_VERSION_GTE(9,4,0)

material_inputs.current_cell = typename DoFHandler<dim>::active_cell_iterator(*particle->get_surrounding_cell(),
&(this->get_dof_handler()));
#else
material_inputs.current_cell = typename DoFHandler<dim>::active_cell_iterator(*particle->get_surrounding_cell(this->get_triangulation()),
&(this->get_dof_handler()));
#endif

material_inputs.temperature[0] = solution[this->introspection().component_indices.temperature];

material_inputs.pressure[0] = solution[this->introspection().component_indices.pressure];
Expand Down