-
Notifications
You must be signed in to change notification settings - Fork 42
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
base: devel
Are you sure you want to change the base?
Changes from 27 commits
0bfce67
9a630e7
6ede39d
168b001
7fc5b8d
e9a1316
6c53cdf
eea17f3
194b8e1
48c1392
048f33f
8020fc4
0479c15
db7bb31
b5df938
aa528b4
4607275
75fe0cb
faf07cb
ec3ebbb
fdc35f0
175d5b9
3b392f4
4fdc4b1
500568d
a59aeb0
9075c74
679ae58
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
+1 −1 | .github/workflows/package.yml | |
+1 −1 | .github/workflows/test_packages.yml | |
+1 −0 | include/damage.h | |
+1 −0 | include/neml_interface.h | |
+2 −0 | include/nemlerror.h | |
+3 −0 | neml/__init__.py | |
+17 −7 | neml/drivers.py | |
+1 −1 | pybind11 | |
+16 −6 | src/cp/batch.cxx | |
+18 −16 | src/damage.cxx | |
+0 −1 | src/nemlerror.cxx | |
+5 −0 | src/nemlerror_wrap.cxx | |
+2 −2 | test/test_nemlmath.py | |
+1 −1 | test/test_parse.py | |
+1 −1 | util/neml2_verification/README.md | |
+1 −1 | util/neml2_verification/run_neml2_test.py |
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
|
@@ -71,30 +71,37 @@ 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"); | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change is still needed. |
||||||||
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>("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; | ||||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,23 +7,23 @@ | |
[shrinkage] | ||
type = 'Exodiff' | ||
input = 'shrinkage.i' | ||
# abs_zero = 1e-5 | ||
abs_zero = 2e-5 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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.' | ||
[] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
There was a problem hiding this comment.
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'