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

Update parameter descriptions to use new API #397

Open
wants to merge 28 commits into
base: devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0bfce67
WIP - param.setDocUnit(...) for units for relevant params
Jul 3, 2024
9a630e7
Merge branch 'idaholab:devel' into units
HiddenRoom Jul 3, 2024
6ede39d
WIP - param.setDocUnit(...) for units for relevant params ref #396
Jul 3, 2024
168b001
autogenerated style changes
Jul 3, 2024
7fc5b8d
requested changes
Jul 3, 2024
e9a1316
clarify ambiguity in temperatures and add energy units
Jul 15, 2024
6c53cdf
add strength and stress units
Jul 15, 2024
eea17f3
updated strain to be unitless
Jul 15, 2024
194b8e1
typo
HiddenRoom Jul 18, 2024
48c1392
Updating stable moose submodule refs #000
Jul 4, 2024
048f33f
Updating stable moose submodule refs #000
Jul 8, 2024
8020fc4
Updating stable moose submodule refs #000
Jul 10, 2024
0479c15
Updating stable moose submodule refs #000
Jul 11, 2024
db7bb31
Updating stable moose submodule refs #000
Jul 12, 2024
b5df938
Update NEML submodule ref #66
bwspenc Jul 12, 2024
aa528b4
Updating stable moose submodule refs #000
Jul 16, 2024
4607275
Updating stable moose submodule refs #000
Jul 16, 2024
75fe0cb
Updating stable moose submodule refs #000
Jul 17, 2024
faf07cb
Bump some tolerances in concrete tests
lindsayad Jul 17, 2024
ec3ebbb
Updating stable moose submodule refs #000
Jul 17, 2024
fdc35f0
Additional units and clarifaction
Jul 18, 2024
175d5b9
Update src/materials/ConcreteThermalMoisture.C
HiddenRoom Jul 23, 2024
3b392f4
Update src/materials/ConcreteThermalMoisture.C
HiddenRoom Jul 23, 2024
4fdc4b1
Update src/materials/ConcreteThermalMoisture.C
HiddenRoom Jul 23, 2024
500568d
Update src/materials/ConcreteThermalMoisture.C
HiddenRoom Jul 23, 2024
a59aeb0
remove comment
Jul 23, 2024
9075c74
Celcius units
Jul 23, 2024
679ae58
cure time units
Jul 24, 2024
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
2 changes: 1 addition & 1 deletion moose
Submodule moose updated 291 files
10 changes: 8 additions & 2 deletions src/materials/ConcreteASREigenstrain.C
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ConcreteASREigenstrain::validParams()
params.makeParamRequired<Real>("tensile_strength");

params.addRequiredCoupledVar("temperature", "Coupled temperature");
params.setDocUnit("temperature", "Unit defined by 'temperature_units'");
params.addRequiredCoupledVar("relative_humidity", "Coupled relative humidity");

params.addRangeCheckedParam<Real>(
Expand All @@ -39,19 +40,24 @@ ConcreteASREigenstrain::validParams()
params.addRequiredRangeCheckedParam<Real>(
"characteristic_time",
"characteristic_time > 0.0",
"Chracteristic ASR time (in days) at reference temprature. (tau_C(T_0))");
"Chracteristic ASR time at reference temprature. (tau_C(T_0))");
params.setDocUnit("characteristic_time", "d");
params.addRequiredParam<Real>("latency_time",
"Latency ASR time (in days) at reference temprature (tau_L(T_0))");
"Latency ASR time at reference temprature (tau_L(T_0))");
params.setDocUnit("latency_time", "d");
params.addRangeCheckedParam<Real>("characteristic_activation_energy",
5400.0,
"characteristic_activation_energy > 0.0",
"Activation energy associated with characteristic_time (U_C)");
params.setDocUnit("characteristic_activation_energy", "K");
params.addRangeCheckedParam<Real>("latency_activation_energy",
9400.0,
"latency_activation_energy > 0.0",
"Activation energy associated with latency_time (U_L)");
params.setDocUnit("latency_activation_energy", "K");
params.addRequiredParam<Real>("reference_temperature",
"Reference temperature for ASR reaction constants.");
Copy link
Collaborator

Choose a reason for hiding this comment

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

in unit specified by 'temperature_units'

params.setDocUnit("reference_temperature", "Unit defined by 'temperature_units'");

// Note that Fahrenheit is not supported because that would require different parameters for the
// times and activation energies
Expand Down
3 changes: 3 additions & 0 deletions src/materials/ConcreteExpansionEigenstrainBase.C
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@ ConcreteExpansionEigenstrainBase::validParams()
"expansion_type", expansion_type, "Type of expansion resulting from volumetric strain");
params.addRangeCheckedParam<Real>(
"compressive_strength", "compressive_strength > 0", "Compressive strength of concrete");
params.setDocUnit("compressive_strength", "Model-specific stress unit");
params.addRangeCheckedParam<Real>(
"expansion_stress_limit",
"expansion_stress_limit > 0",
"Upper bound compressive stress beyond which no expansion occurs");
params.setDocUnit("expansion_stress_limit", "Model-specific stress unit");
params.addRangeCheckedParam<Real>(
"tensile_strength", "tensile_strength > 0", "Tensile strength of concrete");
params.setDocUnit("tensile_strength", "Model-specific stress unit");
return params;
}

Expand Down
9 changes: 4 additions & 5 deletions src/materials/ConcreteExpansionMicrocrackingDamage.C
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,14 @@ ConcreteExpansionMicrocrackingDamage::validParams()
"Correction factor by which the eigenstrain is multiplied before "
"evaluating the damage");

params.addRequiredRangeCheckedParam<Real>(
"microcracking_initiation_strain",
"microcracking_initiation_strain > 0",
"Linear strain at which the microcracking initiates (in [m/m])");
params.addRequiredRangeCheckedParam<Real>("microcracking_initiation_strain",
"microcracking_initiation_strain > 0",
"Linear strain at which the microcracking initiates");

params.addRequiredRangeCheckedParam<Real>(
"microcracking_strain_branch",
"microcracking_strain_branch > 0",
"Parameter controlling the rate at which the microcracking increases (in [m/m])");
"Parameter controlling the rate at which the microcracking increases");

params.addParam<Real>(
"expansion_stress_limit",
Expand Down
15 changes: 12 additions & 3 deletions src/materials/ConcreteLogarithmicCreepModel.C
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,41 @@ ConcreteLogarithmicCreepModel::validParams()
{
InputParameters params = GeneralizedKelvinVoigtBase::validParams();
params.addRequiredParam<Real>("youngs_modulus", "Initial elastic modulus of the material");
params.setDocUnit("youngs_modulus", "Model-specific stress unit");
params.addRequiredParam<Real>("poissons_ratio", "Initial poisson ratio of the material");
params.addParam<Real>("recoverable_youngs_modulus",
"Modulus corresponding to the recoverable part of the deformation");
params.setDocUnit("recoverable_youngs_modulus", "Model-specific stress unit");
params.addParam<Real>("recoverable_poissons_ratio",
"Poisson coefficient of the recoverable part of the deformation");
params.addRangeCheckedParam<Real>(
"recoverable_viscosity",
"recoverable_viscosity > 0",
"Viscosity corresponding to the recoverable part of the deformation");
params.setDocUnit("recoverable_viscosity", "Model-specific time unit");
params.addRequiredRangeCheckedParam<Real>(
"long_term_viscosity",
"long_term_viscosity > 0",
"Viscosity corresponding to the long-term part of the deformation");
params.setDocUnit("long_term_viscosity", "Model-specific time unit");
params.addRangeCheckedParam<Real>("long_term_characteristic_time",
1,
"long_term_characteristic_time > 0",
"Rate at which the long_term viscosity increases");
params.addCoupledVar("temperature", "Temperature variable [in Celsius]");
params.setDocUnit("long_term_characteristic_time", "Model-specific time unit");
params.addCoupledVar("temperature", "Temperature variable");
params.setDocUnit("temperature", "C");
params.addRangeCheckedParam<Real>("activation_temperature",
"activation_temperature >= 0",
"Activation temperature for the creep [in Kelvin]");
params.addParam<Real>("reference_temperature", 20, "Reference temperature [in Celsius]");
"Activation temperature for the creep");
params.setDocUnit("activation_temperature", "K");
params.addParam<Real>("reference_temperature", 20, "Reference temperature");
params.setDocUnit("reference_temperature", "C");
params.addCoupledVar("humidity", "Humidity variable");
params.addRangeCheckedParam<Real>("drying_creep_viscosity",
bwspenc marked this conversation as resolved.
Show resolved Hide resolved
"drying_creep_viscosity > 0",
"Viscosity corresponding to the drying creep");
params.setDocUnit("drying_creep_viscosity", "Model-specific time unit");
params.addParam<bool>("use_recovery", true, "Enables or disables creep recovery");
params.addClassDescription("Logarithmic viscoelastic model for cementitious materials.");
return params;
Expand Down
28 changes: 18 additions & 10 deletions src/materials/ConcreteThermalMoisture.C
Original file line number Diff line number Diff line change
Expand Up @@ -71,30 +71,38 @@ ConcreteThermalMoisture::validParams()
params.addParam<MooseEnum>(
"aggregate_pore_type", aggregate_pore_type, "aggregate pore structure");

params.addParam<Real>("cement_mass", "cement mass (kg) per m^3");
params.addParam<Real>("aggregate_mass", "aggregate mass (kg) per m^3");
params.addParam<Real>("cement_mass", "cement mass per m^3");
params.setDocUnit("cement_mass", "kg");
params.addParam<Real>("aggregate_mass", "aggregate mass per m^3");
params.setDocUnit("aggregate_mass", "kg");
params.addParam<Real>("water_to_cement_ratio", "water to cement ratio");
params.addParam<Real>("aggregate_vol_fraction", "volumetric fraction of aggregates");
params.addParam<Real>("concrete_cure_time", "concrete curing time in days");
params.addParam<Real>("ref_density", "refernece density of porous media Kg/m^3");
params.addParam<Real>("ref_specific_heat", "reference specific heat of concrete J/Kg/0C");
params.addParam<Real>("ref_thermal_conductivity",
"concrete reference thermal conductivity (W/m/C)");
params.addParam<Real>("concrete_cure_time", "concrete curing time");
params.setDocUnit("concrete_cure_time", "d");
params.addParam<Real>("ref_density", "reference density of concrete");
params.setDocUnit("ref_density", "kg/m^3");
params.addParam<Real>("ref_specific_heat", "reference specific heat of concrete");
params.setDocUnit("ref_specific_heat", "J/kg/K");
params.addParam<Real>("ref_thermal_conductivity", "concrete reference thermal conductivity");
params.setDocUnit("ref_thermal_conductivity", "W/m/K");

// parameters for Bazant mositure transport model
params.addParam<Real>("D1", "empirical constants (m2/s)");
params.addParam<Real>("D1", "empirical constants");
params.setDocUnit("D1", "m^2/s");
params.addParam<Real>("n", "empirical constants");
params.addParam<Real>("critical_relative_humidity", "empirical constants");
params.addParam<Real>("coupled_moisture_diffusivity_factor",
"coupling coefficient mositure transfer due to heat");

// parameters for Mensi's moisture model
params.addParam<Real>("A", "empirical constants (m2/s)");
params.addParam<Real>("A", "empirical constants");
params.setDocUnit("A", "m^2/s");
params.addParam<Real>("B", "empirical constants");

params.addCoupledVar("relative_humidity", "nonlinear variable name for rel. humidity");
bwspenc marked this conversation as resolved.
Show resolved Hide resolved
params.addCoupledVar("temperature",
"nonlinear variable name for temperature in unit of Celscius");
"nonlinear variable name for temperature");
params.setDocUnit("temperature", "C");
params.addClassDescription("Material parameters for thermal and moisture transport in concrete.");

return params;
Expand Down
6 changes: 3 additions & 3 deletions test/tests/concrete_drying_shrinkage/tests
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
[shrinkage]
type = 'Exodiff'
input = 'shrinkage.i'
# abs_zero = 1e-5
abs_zero = 2e-5
Copy link
Collaborator

Choose a reason for hiding this comment

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

This file shouldn't be changed. There was another commit that got merged in that modified these.

exodiff = 'shrinkage_out.e'
detail = 'with an exponent of 1, '
[]
[shrinkage_quad]
type = 'Exodiff'
input = 'shrinkage.i'
cli_args = 'Materials/shrinkage/exponent=2 Outputs/file_base=shrinkage_quad_out'
abs_zero = 1e-5
abs_zero = 2e-5
exodiff = 'shrinkage_quad_out.e'
detail = 'with an exponent of 2, '
[]
[shrinkage_irreversible]
type = 'Exodiff'
input = 'shrinkage.i'
cli_args = 'Materials/shrinkage/irreversibility_threshold=0.2 Outputs/file_base=shrinkage_irreversible_out'
abs_zero = 1e-5
abs_zero = 2e-5
exodiff = 'shrinkage_irreversible_out.e'
detail = 'and with an irreversibility threshold of 0.2.'
[]
Expand Down
2 changes: 1 addition & 1 deletion test/tests/concrete_expansion_microcracking/tests
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
type = 'CSVDiff'
input = 'concrete_expansion_microcracking.i'
csvdiff = 'concrete_expansion_microcracking_5_5_out.csv'
abs_zero = 1e-6
abs_zero = 2e-6
Copy link
Collaborator

Choose a reason for hiding this comment

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

This file shouldn't be changed either.

cli_args = 'Materials/microcracking/expansion_stress_limit=10e6 BCs/load_x/value=-5e6 BCs/load_y/value=-5e6 '
'Outputs/file_base=concrete_expansion_microcracking_5_5_out'
allow_test_objects = True
Expand Down