Permalink
Browse files

Merge pull request #12577 from bwspenc/rm_store_stress_old

Remove store_stress_old and store_stress_older
  • Loading branch information...
dschwen committed Dec 5, 2018
2 parents ee396f6 + 5ebfc99 commit b4bbc2d5e848ad6b5c795a275fef39b7ebc17fb4
Showing with 3 additions and 79 deletions.
  1. +0 −5 modules/combined/test/tests/solid_mechanics/Rayleigh_damping/HHT_time_integration/Rayleigh_HHT.i
  2. +1 −4 .../combined/test/tests/solid_mechanics/Rayleigh_damping/Newmark_time_integration/Rayleigh_Newmark.i
  3. +1 −4 modules/combined/test/tests/solid_mechanics/Time_integration/HHT_time_integration/HHT_test.i
  4. +0 −3 modules/combined/test/tests/solid_mechanics/Wave_1_D/HHT_time_integration/wave_bc_1d.i
  5. +0 −3 modules/combined/test/tests/solid_mechanics/Wave_1_D/Rayleigh_HHT/wave_bc_1d.i
  6. +0 −3 modules/combined/test/tests/solid_mechanics/Wave_1_D/Rayleigh_Newmark/wave_bc_1d.i
  7. +0 −1 modules/solid_mechanics/include/materials/SolidModel.h
  8. +0 −6 modules/solid_mechanics/src/materials/SolidModel.C
  9. +0 −4 modules/tensor_mechanics/doc/content/modules/tensor_mechanics/Dynamics.md
  10. +0 −3 modules/tensor_mechanics/include/materials/ComputeStressBase.h
  11. +1 −8 modules/tensor_mechanics/src/materials/ComputeStressBase.C
  12. +0 −2 modules/tensor_mechanics/test/tests/dynamics/linear_constraint/disp_mid.i
  13. +0 −1 ...s/tensor_mechanics/test/tests/dynamics/prescribed_displacement/3D_QStatic_1_Ramped_Displacement.i
  14. +0 −1 ...ensor_mechanics/test/tests/dynamics/prescribed_displacement/3D_QStatic_1_Ramped_Displacement_ti.i
  15. +0 −1 ...anics/test/tests/dynamics/prescribed_displacement/3D_QStatic_1_Ramped_Displacement_with_gravity.i
  16. +0 −5 modules/tensor_mechanics/test/tests/dynamics/rayleigh_damping/rayleigh_hht.i
  17. +0 −5 modules/tensor_mechanics/test/tests/dynamics/rayleigh_damping/rayleigh_hht_ti.i
  18. +0 −4 modules/tensor_mechanics/test/tests/dynamics/rayleigh_damping/rayleigh_newmark.i
  19. +0 −4 modules/tensor_mechanics/test/tests/dynamics/rayleigh_damping/rayleigh_newmark_material_dependent.i
  20. +0 −4 modules/tensor_mechanics/test/tests/dynamics/time_integration/hht_test.i
  21. +0 −4 modules/tensor_mechanics/test/tests/dynamics/time_integration/hht_test_ti.i
  22. +0 −1 modules/tensor_mechanics/test/tests/dynamics/wave_1D/wave_hht.i
  23. +0 −1 modules/tensor_mechanics/test/tests/dynamics/wave_1D/wave_rayleigh_hht.i
  24. +0 −1 modules/tensor_mechanics/test/tests/dynamics/wave_1D/wave_rayleigh_hht_ti.i
  25. +0 −1 modules/tensor_mechanics/test/tests/dynamics/wave_1D/wave_rayleigh_newmark.i
@@ -25,10 +25,6 @@
# The system will come to steady state slowly after the pressure
# becomes constant. Alpha equal to zero will result in Newmark
# integration.
#
# The store_stress_older flag in the SolidModel material model needs
# to be turned on to store stress older. In this example, this flag is
# turned on using the child class Elastic.
[GlobalParams]
order = FIRST
family = LAGRANGE
@@ -299,7 +295,6 @@
youngs_modulus = 210e+09
poissons_ratio = 0
thermal_expansion = 0
store_stress_older = true
[../]
[./density]
@@ -20,9 +20,7 @@
# Pressure is evaluated using Pressure boundary condition
#
# The system will come to steady state slowly after the pressure
# becomes constant. The store_stress_older flag in the SolidModel
# material model needs to be turned on to store stress older. In this
# example, this flag is turned on using the child class Elastic.
# becomes constant.
[GlobalParams]
order = FIRST
family = LAGRANGE
@@ -241,7 +239,6 @@
youngs_modulus = 210e+09
poissons_ratio = 0
thermal_expansion = 0
store_stress_older = true
[../]
[./density]
@@ -20,9 +20,7 @@
#
# The system will come to steady state slowly after the pressure
# becomes constant. Alpha equal to zero will result in Newmark
# integration. The store_stress_older flag in the SolidModel material
# model needs to be turned on to store stress older. In this example,
# this flag is turned on using the child class Elastic.
# integration.
[GlobalParams]
order = FIRST
family = LAGRANGE
@@ -287,7 +285,6 @@
youngs_modulus = 210e+09
poissons_ratio = 0
thermal_expansion = 0
store_stress_older = true
[../]
[./density]
@@ -9,8 +9,6 @@
#
# Here M is the mass matrix, K is the stiffness matrix
#
# store_stress_older should be set to true in material model
#
# The displacement at the second, third and fourth node at t = 0.1 are
# -8.097405701570538350e-02, 2.113131879547342634e-02 and -5.182787688751439893e-03, respectively.
@@ -254,7 +252,6 @@
youngs_modulus = 1
poissons_ratio = 0
thermal_expansion = 0
store_stress_older = true
[../]
[./density]
@@ -12,8 +12,6 @@
#
# Here M is the mass matrix, K is the stiffness matrix
#
# store_stress_older should be set to true in material model
#
# The displacement at the first, second, third and fourth node at t = 0.1 are
# -7.787499960311491942e-02, 1.955566679096475483e-02 and -4.634888180231294501e-03, respectively.
[GlobalParams]
@@ -259,7 +257,6 @@
youngs_modulus = 1
poissons_ratio = 0
thermal_expansion = 0
store_stress_older = true
[../]
[./density]
@@ -12,8 +12,6 @@
#
# Here M is the mass matrix, K is the stiffness matrix
#
# store_stress_older should be set to true in material model
#
# The displacement at the second, third and fourth node at t = 0.1 are
# -7.776268399030435152e-02, 1.949967184623528985e-02 and -4.615737877580032046e-03, respectively
[GlobalParams]
@@ -253,7 +251,6 @@
youngs_modulus = 1
poissons_ratio = 0
thermal_expansion = 0
store_stress_older = true
[../]
[./density]
type = GenericConstantMaterial
@@ -153,7 +153,6 @@ class SolidModel : public DerivativeMaterialInterface<Material>
const bool _compute_JIntegral;
const bool _compute_InteractionIntegral;
bool _store_stress_older;
// These are used in calculation of the J integral
MaterialProperty<Real> * _SED;
@@ -102,11 +102,6 @@ validParams<SolidModel>()
params.addParam<bool>("compute_JIntegral", false, "Whether to compute the J Integral.");
params.addParam<bool>(
"compute_InteractionIntegral", false, "Whether to compute the Interaction Integral.");
params.addParam<bool>("store_stress_older",
false,
"Parameter which indicates whether the older "
"stress state, required for HHT time "
"integration, needs to be stored");
params.addCoupledVar("disp_r", "The r displacement");
params.addCoupledVar("disp_x", "The x displacement");
params.addCoupledVar("disp_y", "The y displacement");
@@ -217,7 +212,6 @@ SolidModel::SolidModel(const InputParameters & parameters)
_strain_increment(0),
_compute_JIntegral(getParam<bool>("compute_JIntegral")),
_compute_InteractionIntegral(getParam<bool>("compute_InteractionIntegral")),
_store_stress_older(getParam<bool>("store_stress_older")),
_SED(NULL),
_SED_old(NULL),
_Eshelby_tensor(NULL),
@@ -110,10 +110,6 @@ The input file syntax for calculating the residual due to both the Inertial forc
Here, `./DynamicTensorMechanics` is the action that calls the [DynamicStressDivergenceTensors](/DynamicStressDivergenceTensors.md) kernel.
For calculating the time derivative of the stress, we require old and older states of stress, i.e., $\sigma(t)$ and $\sigma(t-\Delta t)$, respectively. These values need to be stored only when the [DynamicStressDivergenceTensors](/DynamicStressDivergenceTensors.md) kernel is used. Therefore, we can request the stress calculator to store the old states of stress through the boolean flag `store_stress_old` when [DynamicStressDivergenceTensors](/DynamicStressDivergenceTensors.md) kernel is used. The input file syntax for setting `store_stress_old` to true is as follows:
!listing modules/tensor_mechanics/test/tests/dynamics/rayleigh_damping/rayleigh_hht.i start=Materials end=Executioner
Finally, when using HHT time integration method, external forces like gravity and pressure also require $\alpha$ as input.
!alert note
@@ -51,9 +51,6 @@ class ComputeStressBase : public DerivativeMaterialInterface<Material>
/// derivative of stress w.r.t. strain (_dstress_dstrain)
MaterialProperty<RankFourTensor> & _Jacobian_mult;
/// Parameter which decides whether to store old stress. This is required for HHT time integration and Rayleigh damping
const bool _store_stress_old;
};
#endif // COMPUTESTRESSBASE_H
@@ -20,12 +20,6 @@ validParams<ComputeStressBase>()
"Optional parameter that allows the user to define "
"multiple mechanics material systems on the same "
"block, i.e. for multiple phases");
params.addParam<bool>("store_stress_old",
false,
"Parameter which indicates whether the old "
"stress state, required for the HHT time "
"integration scheme and Rayleigh damping, needs "
"to be stored");
params.suppressParameter<bool>("use_displaced_mesh");
return params;
}
@@ -39,8 +33,7 @@ ComputeStressBase::ComputeStressBase(const InputParameters & parameters)
_elastic_strain(declareProperty<RankTwoTensor>(_base_name + "elastic_strain")),
_elasticity_tensor(getMaterialPropertyByName<RankFourTensor>(_elasticity_tensor_name)),
_extra_stress(getDefaultMaterialProperty<RankTwoTensor>(_base_name + "extra_stress")),
_Jacobian_mult(declareProperty<RankFourTensor>(_base_name + "Jacobian_mult")),
_store_stress_old(getParam<bool>("store_stress_old"))
_Jacobian_mult(declareProperty<RankFourTensor>(_base_name + "Jacobian_mult"))
{
if (getParam<bool>("use_displaced_mesh"))
@@ -77,7 +77,6 @@
[./stress_1]
type = ComputeLinearElasticStress
store_stress_old = true
block = 1
[../]
@@ -103,7 +102,6 @@
[./stress_2]
type = ComputeLinearElasticStress
store_stress_old = true
block = 2
[../]
@@ -269,7 +269,6 @@
[./stress]
#Computes the stress, using linear elasticity
type = ComputeLinearElasticStress
store_stress_old = true
block = 0
[../]
[./density]
@@ -245,7 +245,6 @@
[./stress]
#Computes the stress, using linear elasticity
type = ComputeLinearElasticStress
store_stress_old = true
block = 0
[../]
[./density]
@@ -268,7 +268,6 @@
[./stress]
#Computes the stress, using linear elasticity
type = ComputeLinearElasticStress
store_stress_old = true
block = 0
[../]
[./density]
@@ -24,10 +24,6 @@
#
# The system will come to steady state slowly after the pressure becomes constant.
# Alpha equal to zero will result in Newmark integration.
#
# The store_stress_old flag in the ComputeStressBase material model needs to be
# turned on to store stress old. In this example, this flag is turned on using
# the child class ComputeLinearElasticStress.
[Mesh]
type = GeneratedMesh
@@ -240,7 +236,6 @@
[./stress]
type = ComputeLinearElasticStress
store_stress_old = True
block = 0
[../]
@@ -24,10 +24,6 @@
#
# The system will come to steady state slowly after the pressure becomes constant.
# Alpha equal to zero will result in Newmark integration.
#
# The store_stress_old flag in the ComputeStressBase material model needs to be
# turned on to store stress old. In this example, this flag is turned on using
# the child class ComputeLinearElasticStress.
[Mesh]
type = GeneratedMesh
@@ -216,7 +212,6 @@
[./stress]
type = ComputeLinearElasticStress
store_stress_old = True
block = 0
[../]
@@ -20,9 +20,6 @@
# The residual due to Pressure is evaluated using Pressure boundary condition
#
# The system will come to steady state slowly after the pressure becomes constant.
# The store_stress_old flag in the ComputeStressBase material model needs to be
# turned on to store stress old. In this example, this flag is turned on using
# the child class ComputeLinearElasticStress.
[Mesh]
type = GeneratedMesh
@@ -230,7 +227,6 @@
[./stress]
type = ComputeLinearElasticStress
store_stress_old = True
block = 0
[../]
@@ -20,9 +20,6 @@
# The residual due to Pressure is evaluated using Pressure boundary condition
#
# The system will come to steady state slowly after the pressure becomes constant.
# The store_stress_old flag in the ComputeStressBase material model needs to be
# turned on to store stress old. In this example, this flag is turned on using
# the child class ComputeLinearElasticStress.
[Mesh]
type = GeneratedMesh
@@ -229,7 +226,6 @@
[./stress]
type = ComputeLinearElasticStress
store_stress_old = True
block = 0
[../]
@@ -20,9 +20,6 @@
#
# The system will come to steady state slowly after the pressure becomes constant.
# Alpha equal to zero will result in Newmark integration.
# The store_stress_old flag in the ComputeStressBase material model needs to be turned
# on to store stress old. In this example, this flag is turned on using the child class
# ComputeLinearElasticStress.
[Mesh]
type = GeneratedMesh
@@ -228,7 +225,6 @@
[./stress]
type = ComputeLinearElasticStress
store_stress_old = True
block = 0
[../]
[./density]
@@ -20,9 +20,6 @@
#
# The system will come to steady state slowly after the pressure becomes constant.
# Alpha equal to zero will result in Newmark integration.
# The store_stress_old flag in the ComputeStressBase material model needs to be turned
# on to store stress old. In this example, this flag is turned on using the child class
# ComputeLinearElasticStress.
[Mesh]
type = GeneratedMesh
@@ -203,7 +200,6 @@
[./stress]
type = ComputeLinearElasticStress
store_stress_old = True
block = 0
[../]
[./density]
@@ -238,7 +238,6 @@
[./stress]
type = ComputeLinearElasticStress
store_stress_old = true
block = 0
[../]
@@ -245,7 +245,6 @@
[./stress]
type = ComputeLinearElasticStress
store_stress_old = true
block = 0
[../]
@@ -221,7 +221,6 @@
[./stress]
type = ComputeLinearElasticStress
store_stress_old = true
block = 0
[../]
@@ -264,7 +264,6 @@
[./stress]
type = ComputeLinearElasticStress
store_stress_old = true
block = 0
[../]

0 comments on commit b4bbc2d

Please sign in to comment.