Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ namespace PlasticityLab {

private:
const unsigned int boundary_id;
const Number quadratic_spring_factor;
const Number reference_displacement_increment;
const Number residual_force;
const Number quadratic_spring_factor;
};

} /* namespace PlasticityLab */
Expand Down
5 changes: 2 additions & 3 deletions ALE_Finite_Strain_Plasticity/src/DoFSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@ namespace PlasticityLab {
void DoFSystem<dim, Number>::setup_dof_system (const FiniteElement<dim> &fe) {
dof_handler.distribute_dofs(fe);
locally_owned_dofs = dof_handler.locally_owned_dofs();
locally_relevant_dofs.clear();
DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs);
locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler);

nodal_constraints.reinit(locally_relevant_dofs);
nodal_constraints.reinit(locally_owned_dofs, locally_relevant_dofs);
DoFTools::make_hanging_node_constraints (dof_handler, nodal_constraints);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ namespace PlasticityLab {

template <int dim, typename Number>
std::vector<Number> ExponentialHardeningElastoplasticMaterial<dim, Number>::get_state_parameters(
const point_index_t &point_index,
const Tensor<2, dim, Number> &reference_transformation) const {
const point_index_t &,
const Tensor<2, dim, Number> &) const {
throw NotImplementedException();
}

template <int dim, typename Number>
void ExponentialHardeningElastoplasticMaterial<dim, Number>::
set_state_parameters(
const point_index_t &point_index,
const std::vector<Number> &state_parameters,
const Tensor<2, dim, Number> &reference_transformation) {
const point_index_t &,
const std::vector<Number> &,
const Tensor<2, dim, Number> &) {
throw NotImplementedException();
}

Expand All @@ -71,12 +71,12 @@ namespace PlasticityLab {


template <int dim, typename Number>
Number ExponentialHardeningElastoplasticMaterial<dim, Number>::get_material_Jacobian(const point_index_t &point_index) const {
Number ExponentialHardeningElastoplasticMaterial<dim, Number>::get_material_Jacobian(const point_index_t &) const {
throw NotImplementedException();
}

template <int dim, typename Number>
dealii::SymmetricTensor<2, dim, Number> ExponentialHardeningElastoplasticMaterial<dim, Number>::get_plastic_strain(const point_index_t &point_index) const {
dealii::SymmetricTensor<2, dim, Number> ExponentialHardeningElastoplasticMaterial<dim, Number>::get_plastic_strain(const point_index_t &) const {
throw NotImplementedException();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@ namespace PlasticityLab {

void compute_constitutive_request(
ConstitutiveModelRequest<dim, Number> &constitutive_request,
const point_index_t &point_index);
const point_index_t &point_index) override;

Number get_material_Jacobian(const point_index_t &point_index) const;
dealii::SymmetricTensor<2, dim, Number> get_plastic_strain(const point_index_t &point_index) const;
Number get_material_Jacobian(const point_index_t &point_index) const override;
dealii::SymmetricTensor<2, dim, Number> get_plastic_strain(const point_index_t &point_index) const override;

void setup_point_history (const point_index_t point_count);
void setup_point_history (const point_index_t point_count) override;

std::vector<Number> get_state_parameters(
const point_index_t &point_index,
const Tensor<2, dim, Number> &reference_transformation=unit_symmetric_tensor<dim>()) const;
const Tensor<2, dim, Number> &reference_transformation=unit_symmetric_tensor<dim>()) const override;

void set_state_parameters(
const point_index_t &point_index,
const std::vector<Number> &state_parameters,
const Tensor<2, dim, Number> &reference_transformation);
size_t get_material_parameter_count() const;
const Tensor<2, dim, Number> &reference_transformation) override;
size_t get_material_parameter_count() const override;

private:
const Number kappa;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace PlasticityLab {
Number hardening_alpha_derivatives(Number &D_isotropic_hardening,
Number &D_kinematic_hardening,
const Number alpha,
const Number gamma,
[[maybe_unused]] const Number gamma,
const Number time_increment,
const Number temperature) const {
Number Dh = (delta * (K_infty - K_0) * exp(-delta * alpha) + H_bar) * (1 - std::min(softening_threshold, hardening_softening * (temperature - reference_temperature)))
Expand All @@ -65,8 +65,8 @@ namespace PlasticityLab {
Number hardening_temperature_derivatives(Number &D_isotropic_hardening,
Number &D_kinematic_hardening,
const Number alpha,
const Number gamma,
const Number time_increment,
[[maybe_unused]] const Number gamma,
[[maybe_unused]] const Number time_increment,
const Number temperature) const {
Number Dh = (hardening_softening * (temperature - reference_temperature) < softening_threshold)?
-flow_stress_softening * K_0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ namespace PlasticityLab {
const Number minimum_strain_rate = creep_strain_rate_factor * epsilon_dot_0;
const Number strain_rate = std::max(sqrt2thirds*gamma/time_increment, minimum_strain_rate);
const Number softened_quasistatic_elastoplastic_stress = get_elastoplastic_factor(alpha) * get_softening_factor(temperature);
const Number Carreau_viscocity = get_Carreau_viscocity(strain_rate, softened_quasistatic_elastoplastic_stress);
[[maybe_unused]] const Number Carreau_viscocity = get_Carreau_viscocity(strain_rate, softened_quasistatic_elastoplastic_stress);
const Number stress_temperature_tangent =
get_elastoplastic_factor(alpha) * get_softening_factor_tangent(temperature);
Number Carreau_viscocity_strain_rate_tangent, Carreau_viscocity_stress_tangent;
Expand Down
Loading