diff --git a/contrib/neml b/contrib/neml index a4330ebc..65c2ee4b 160000 --- a/contrib/neml +++ b/contrib/neml @@ -1 +1 @@ -Subproject commit a4330ebc98936374c6b4e2f2dfc208ca32d4764f +Subproject commit 65c2ee4bbfb4f5499f17952e64ed87f85a1ef538 diff --git a/moose b/moose index 7921af52..cf062e7b 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit 7921af52de7885a62a3f51c8351ce6517966c765 +Subproject commit cf062e7b7eeb995e33482f34dadd40275b36572c diff --git a/src/materials/ConcreteASREigenstrain.C b/src/materials/ConcreteASREigenstrain.C index 01cca11b..8be724cc 100644 --- a/src/materials/ConcreteASREigenstrain.C +++ b/src/materials/ConcreteASREigenstrain.C @@ -24,6 +24,7 @@ ConcreteASREigenstrain::validParams() params.makeParamRequired("tensile_strength"); params.addRequiredCoupledVar("temperature", "Coupled temperature"); + params.setDocUnit("temperature", "Unit defined by 'temperature_units'"); params.addRequiredCoupledVar("relative_humidity", "Coupled relative humidity"); params.addRangeCheckedParam( @@ -39,19 +40,24 @@ ConcreteASREigenstrain::validParams() params.addRequiredRangeCheckedParam( "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("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("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("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("reference_temperature", "Reference temperature for ASR reaction constants."); + 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 diff --git a/src/materials/ConcreteExpansionEigenstrainBase.C b/src/materials/ConcreteExpansionEigenstrainBase.C index 18de8564..9c4cfdc3 100644 --- a/src/materials/ConcreteExpansionEigenstrainBase.C +++ b/src/materials/ConcreteExpansionEigenstrainBase.C @@ -24,12 +24,15 @@ ConcreteExpansionEigenstrainBase::validParams() "expansion_type", expansion_type, "Type of expansion resulting from volumetric strain"); params.addRangeCheckedParam( "compressive_strength", "compressive_strength > 0", "Compressive strength of concrete"); + params.setDocUnit("compressive_strength", "Model-specific stress unit"); params.addRangeCheckedParam( "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( "tensile_strength", "tensile_strength > 0", "Tensile strength of concrete"); + params.setDocUnit("tensile_strength", "Model-specific stress unit"); return params; } diff --git a/src/materials/ConcreteExpansionMicrocrackingDamage.C b/src/materials/ConcreteExpansionMicrocrackingDamage.C index b9a1500f..b7c8a325 100644 --- a/src/materials/ConcreteExpansionMicrocrackingDamage.C +++ b/src/materials/ConcreteExpansionMicrocrackingDamage.C @@ -42,15 +42,14 @@ ConcreteExpansionMicrocrackingDamage::validParams() "Correction factor by which the eigenstrain is multiplied before " "evaluating the damage"); - params.addRequiredRangeCheckedParam( - "microcracking_initiation_strain", - "microcracking_initiation_strain > 0", - "Linear strain at which the microcracking initiates (in [m/m])"); + params.addRequiredRangeCheckedParam("microcracking_initiation_strain", + "microcracking_initiation_strain > 0", + "Linear strain at which the microcracking initiates"); params.addRequiredRangeCheckedParam( "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( "expansion_stress_limit", diff --git a/src/materials/ConcreteLogarithmicCreepModel.C b/src/materials/ConcreteLogarithmicCreepModel.C index fdfa2f19..feb948bd 100644 --- a/src/materials/ConcreteLogarithmicCreepModel.C +++ b/src/materials/ConcreteLogarithmicCreepModel.C @@ -21,32 +21,41 @@ ConcreteLogarithmicCreepModel::validParams() { InputParameters params = GeneralizedKelvinVoigtBase::validParams(); params.addRequiredParam("youngs_modulus", "Initial elastic modulus of the material"); + params.setDocUnit("youngs_modulus", "Model-specific stress unit"); params.addRequiredParam("poissons_ratio", "Initial poisson ratio of the material"); params.addParam("recoverable_youngs_modulus", "Modulus corresponding to the recoverable part of the deformation"); + params.setDocUnit("recoverable_youngs_modulus", "Model-specific stress unit"); params.addParam("recoverable_poissons_ratio", "Poisson coefficient of the recoverable part of the deformation"); params.addRangeCheckedParam( "recoverable_viscosity", "recoverable_viscosity > 0", "Viscosity corresponding to the recoverable part of the deformation"); + params.setDocUnit("recoverable_viscosity", "Model-specific time unit"); params.addRequiredRangeCheckedParam( "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("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("activation_temperature", "activation_temperature >= 0", - "Activation temperature for the creep [in Kelvin]"); - params.addParam("reference_temperature", 20, "Reference temperature [in Celsius]"); + "Activation temperature for the creep"); + params.setDocUnit("activation_temperature", "K"); + params.addParam("reference_temperature", 20, "Reference temperature"); + params.setDocUnit("reference_temperature", "C"); params.addCoupledVar("humidity", "Humidity variable"); params.addRangeCheckedParam("drying_creep_viscosity", "drying_creep_viscosity > 0", "Viscosity corresponding to the drying creep"); + params.setDocUnit("drying_creep_viscosity", "Model-specific time unit"); params.addParam("use_recovery", true, "Enables or disables creep recovery"); params.addClassDescription("Logarithmic viscoelastic model for cementitious materials."); return params; diff --git a/src/materials/ConcreteThermalMoisture.C b/src/materials/ConcreteThermalMoisture.C index 1511236f..874e7fc4 100644 --- a/src/materials/ConcreteThermalMoisture.C +++ b/src/materials/ConcreteThermalMoisture.C @@ -71,30 +71,38 @@ ConcreteThermalMoisture::validParams() params.addParam( "aggregate_pore_type", aggregate_pore_type, "aggregate pore structure"); - params.addParam("cement_mass", "cement mass (kg) per m^3"); - params.addParam("aggregate_mass", "aggregate mass (kg) per m^3"); + params.addParam("cement_mass", "cement mass per m^3"); + params.setDocUnit("cement_mass", "kg"); + params.addParam("aggregate_mass", "aggregate mass per m^3"); + params.setDocUnit("aggregate_mass", "kg"); params.addParam("water_to_cement_ratio", "water to cement ratio"); params.addParam("aggregate_vol_fraction", "volumetric fraction of aggregates"); - params.addParam("concrete_cure_time", "concrete curing time in days"); - params.addParam("ref_density", "refernece density of porous media Kg/m^3"); - params.addParam("ref_specific_heat", "reference specific heat of concrete J/Kg/0C"); - params.addParam("ref_thermal_conductivity", - "concrete reference thermal conductivity (W/m/C)"); + params.addParam("concrete_cure_time", "concrete curing time"); + params.setDocUnit("concrete_cure_time", "d"); + params.addParam("ref_density", "reference density of concrete"); + params.setDocUnit("ref_density", "kg/m^3"); + params.addParam("ref_specific_heat", "reference specific heat of concrete"); + params.setDocUnit("ref_specific_heat", "J/kg/K"); + params.addParam("ref_thermal_conductivity", "concrete reference thermal conductivity"); + params.setDocUnit("ref_thermal_conductivity", "W/m/K"); // parameters for Bazant mositure transport model - params.addParam("D1", "empirical constants (m2/s)"); + params.addParam("D1", "empirical constants"); + params.setDocUnit("D1", "m^2/s"); params.addParam("n", "empirical constants"); params.addParam("critical_relative_humidity", "empirical constants"); params.addParam("coupled_moisture_diffusivity_factor", "coupling coefficient mositure transfer due to heat"); // parameters for Mensi's moisture model - params.addParam("A", "empirical constants (m2/s)"); + params.addParam("A", "empirical constants"); + params.setDocUnit("A", "m^2/s"); params.addParam("B", "empirical constants"); params.addCoupledVar("relative_humidity", "nonlinear variable name for rel. humidity"); 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; diff --git a/test/tests/concrete_drying_shrinkage/tests b/test/tests/concrete_drying_shrinkage/tests index 82537857..f8d46f13 100644 --- a/test/tests/concrete_drying_shrinkage/tests +++ b/test/tests/concrete_drying_shrinkage/tests @@ -7,7 +7,7 @@ [shrinkage] type = 'Exodiff' input = 'shrinkage.i' -# abs_zero = 1e-5 + abs_zero = 2e-5 exodiff = 'shrinkage_out.e' detail = 'with an exponent of 1, ' [] @@ -15,7 +15,7 @@ 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, ' [] @@ -23,7 +23,7 @@ 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.' [] diff --git a/test/tests/concrete_expansion_microcracking/tests b/test/tests/concrete_expansion_microcracking/tests index bd5754c5..a98f7700 100644 --- a/test/tests/concrete_expansion_microcracking/tests +++ b/test/tests/concrete_expansion_microcracking/tests @@ -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 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