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.

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

[WIP] use old strain-rate instead of current strain-rate to add as a reaction to strain fields of strain-dependent. #6141

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions source/material_model/rheology/strain_dependent.cc
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,32 @@ namespace aspect
ExcMessage("Invalid strain_rate in the MaterialModelInputs. This is likely because it was "
"not filled by the caller."));

const double edot_ii = std::max(std::sqrt(std::max(-second_invariant(deviator(in.strain_rate[i])), 0.)),

// Get old (previous time step) velocity gradients to compute the ol strain-rate
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Get old (previous time step) velocity gradients to compute the ol strain-rate
// Get old (previous time step) velocity gradients to compute the old strain rate

std::vector<Point<dim>> quadrature_positions(in.n_evaluation_points());
quadrature_positions[i] = this->get_mapping().transform_real_to_unit_cell(in.current_cell, in.position[i]);

std::vector<double> solution_values(this->get_fe().dofs_per_cell);
in.current_cell->get_dof_values(this->get_old_solution(),
solution_values.begin(),
solution_values.end());

// Only create the evaluator the first time we get here
if (!evaluator)
evaluator = std::make_unique<FEPointEvaluation<dim,dim>>(this->get_mapping(),
this->get_fe(),
update_gradients,
this->introspection().component_indices.velocities[0]);

// Initialize the evaluator for the old velocity gradients
evaluator->reinit(in.current_cell, quadrature_positions);
evaluator->evaluate(solution_values,
EvaluationFlags::gradients);

const SymmetricTensor<2,dim> strain_rate = symmetrize (evaluator->get_gradient(i));


const double edot_ii = std::max(std::sqrt(std::max(-second_invariant(deviator(strain_rate)), 0.)),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think to avoid future confusion we should calculate both edot_ii and old_edot_ii, and then allow the user to select via an input parameter which approach to take.

min_strain_rate);
double delta_e_ii = edot_ii*this->get_timestep();

Expand Down Expand Up @@ -664,7 +689,6 @@ namespace aspect
// as the values from the current linearization point are an extrapolation of the solution
// from the old timesteps.
// Prepare the field function and extract the old solution values at the current cell.
std::vector<Point<dim>> quadrature_positions(1,this->get_mapping().transform_real_to_unit_cell(in.current_cell, in.position[i]));

// Use a small_vector to avoid memory allocation if possible.
small_vector<double> old_solution_values(this->get_fe().dofs_per_cell);
Expand Down
Loading