Skip to content

Commit

Permalink
hand clang format src hugary1995#92
Browse files Browse the repository at this point in the history
  • Loading branch information
Bo Zeng committed Sep 3, 2021
1 parent 2c98d9b commit 756b09d
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 48 deletions.
6 changes: 2 additions & 4 deletions src/auxkernels/ConditionalBoundsAux.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ ConditionalBoundsAux::validParams()
"for kumar's phase-field fracture model 2020"
"variable to PETSc's SNES variational inequalities solver.");
params.addRequiredParam<Real>(
"fixed_bound_value",
"The value of fixed bound for the variable");
"fixed_bound_value", "The value of fixed bound for the variable");
params.addRequiredParam<Real>(
"threshold_value",
"The threshold for conditional history bound for the variable");
"threshold_value", "The threshold for conditional history bound for the variable");
return params;
}

Expand Down
70 changes: 26 additions & 44 deletions src/materials/GeneralizedExternalDrivingForce.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,49 +26,31 @@ GeneralizedExternalDrivingForce::validParams()
params.addParam<MaterialPropertyName>(
"energy_release_rate", "Gc", "energy release rate or fracture toughness");
params.addParam<MaterialPropertyName>(
"phase_field_regularization_length",
"l",
"the phase field regularization length");
params.addParam<MaterialPropertyName>(
"Lambda",
"Lambda",
"Lame's first parameter Lambda");
params.addParam<MaterialPropertyName>(
"shear_modulus",
"G",
"shear modulus mu or G");
params.addRequiredParam<Real>(
"tensile_strength",
"critical tensile strength");
params.addRequiredParam<Real>(
"compressive_strength",
"critical compressive strength");
"phase_field_regularization_length", "l", "the phase field regularization length");
params.addParam<MaterialPropertyName>("Lambda", "Lambda", "Lame's first parameter Lambda");
params.addParam<MaterialPropertyName>("shear_modulus", "G", "shear modulus mu or G");
params.addRequiredParam<Real>("tensile_strength", "critical tensile strength");
params.addRequiredParam<Real>("compressive_strength", "critical compressive strength");
params.addRequiredParam<Real>("delta", "delta");
params.addParam<MaterialPropertyName>(
"rank_two_tensor",
"stress",
"name of the stress tensor");
params.addParam<MaterialPropertyName>(
"external_driving_force_name",
"ex_driving",
"name of the material that holds the external_driving_force");
params.addParam<MaterialPropertyName>("rank_two_tensor", "stress", "name of the stress tensor");
params.addParam<MaterialPropertyName>("external_driving_force_name", "ex_driving", "name of the material that holds the external_driving_force");
return params;
}

GeneralizedExternalDrivingForce::GeneralizedExternalDrivingForce(
const InputParameters & parameters)
: Material(parameters),
_ex_driving_name(getParam<MaterialPropertyName>("external_driving_force_name")),
_ex_driving(declareADProperty<Real>(_ex_driving_name)),
_Gc(getADMaterialProperty<Real>("energy_release_rate")),
_L(getADMaterialProperty<Real>("phase_field_regularization_length")),
_Lambda(getADMaterialProperty<Real>("Lambda")),
_mu(getADMaterialProperty<Real>("shear_modulus")),
_sigma_ts(getParam<Real>("tensile_strength")),
_sigma_cs(getParam<Real>("compressive_strength")),
_delta(getParam<Real>("delta")),
_rank_two_tensor(getParam<MaterialPropertyName>("rank_two_tensor")),
_stress(getADMaterialProperty<RankTwoTensor>(_rank_two_tensor))
_ex_driving_name(getParam<MaterialPropertyName>("external_driving_force_name")),
_ex_driving(declareADProperty<Real>(_ex_driving_name)),
_Gc(getADMaterialProperty<Real>("energy_release_rate")),
_L(getADMaterialProperty<Real>("phase_field_regularization_length")),
_Lambda(getADMaterialProperty<Real>("Lambda")),
_mu(getADMaterialProperty<Real>("shear_modulus")),
_sigma_ts(getParam<Real>("tensile_strength")),
_sigma_cs(getParam<Real>("compressive_strength")),
_delta(getParam<Real>("delta")),
_rank_two_tensor(getParam<MaterialPropertyName>("rank_two_tensor")),
_stress(getADMaterialProperty<RankTwoTensor>(_rank_two_tensor))
{
}

Expand All @@ -77,29 +59,29 @@ GeneralizedExternalDrivingForce::computeQpProperties()
{
ADReal K = _Lambda[_qp] + 2.0 * _mu[_qp] / 3.0;
ADReal _gamma_0 =
(_mu[_qp] + 3 * K) * _sigma_ts * _L[_qp] / _Gc[_qp] / 18 / _mu[_qp] / _mu[_qp] / K / K;
(_mu[_qp] + 3 * K) * _sigma_ts * _L[_qp] / _Gc[_qp] / 18 / _mu[_qp] / _mu[_qp] / K / K;
ADReal _gamma_1 = (1.0 + _delta) / (2.0 * _sigma_ts * _sigma_cs);
ADReal _gamma_2 =
(8 * _mu[_qp] + 24 * K - 27 * _sigma_ts) / 144 / _mu[_qp] / K;
(8 * _mu[_qp] + 24 * K - 27 * _sigma_ts) / 144 / _mu[_qp] / K;
ADReal _temp = _Gc[_qp] * 3.0 / _L[_qp] / 8.0;
ADReal I1 = _stress[_qp](0, 0) + _stress[_qp](1, 1) + _stress[_qp](2, 2);
ADReal J2 = (pow(_stress[_qp](0, 0) - _stress[_qp](1, 1), 2) +
pow(_stress[_qp](1, 1) - _stress[_qp](2, 2), 2) +
pow(_stress[_qp](0, 0) - _stress[_qp](2, 2), 2)) /
6.0 +
pow(_stress[_qp](0, 1), 2) + pow(_stress[_qp](0, 2), 2) +
pow(_stress[_qp](2, 1), 2);
pow(_stress[_qp](0, 1), 2) + pow(_stress[_qp](0, 2), 2) +
pow(_stress[_qp](2, 1), 2);

mooseAssert(J2 >= 0, "Negative J2");

ADReal _beta_0 = _delta * _temp;
ADReal _beta_1 = (-_gamma_1 * _temp - _gamma_2) * (_sigma_cs - _sigma_ts) -
_gamma_0 * (pow(_sigma_cs, 3) - pow(_sigma_ts, 3));
ADReal _beta_2 =
std::sqrt(3.0) * ((-_gamma_1 * _temp + _gamma_2) * (_sigma_cs + _sigma_ts) +
_gamma_0 * (pow(_sigma_cs, 3) + pow(_sigma_ts, 3)));
std::sqrt(3.0) * ((-_gamma_1 * _temp + _gamma_2) * (_sigma_cs + _sigma_ts) +
_gamma_0 * (pow(_sigma_cs, 3) + pow(_sigma_ts, 3)));
ADReal _beta_3 = _L[_qp] * _sigma_ts / _mu[_qp] / K / _Gc[_qp];

_ex_driving[_qp] = (_beta_2 * std::sqrt(J2) + _beta_1 * I1 + _beta_0) /
(1 + _beta_3 * I1 * I1);
_ex_driving[_qp] =
(_beta_2 * std::sqrt(J2) + _beta_1 * I1 + _beta_0) / (1 + _beta_3 * I1 * I1);
}

0 comments on commit 756b09d

Please sign in to comment.