From 0bfce6726fd3f7263bd8c320fb1f83c2e003bc0e Mon Sep 17 00:00:00 2001 From: William Adelman Date: Wed, 3 Jul 2024 11:09:08 -0600 Subject: [PATCH 01/27] WIP - param.setDocUnit(...) for units for relevant params --- src/materials/ConcreteASREigenstrain.C | 11 +++++--- .../ConcreteExpansionEigenstrainBase.C | 1 + .../ConcreteExpansionMicrocrackingDamage.C | 7 ++++-- src/materials/ConcreteLogarithmicCreepModel.C | 10 +++++--- src/materials/ConcreteThermalMoisture.C | 25 +++++++++++++------ src/materials/DamagePlasticityStressUpdate.C | 1 + 6 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/materials/ConcreteASREigenstrain.C b/src/materials/ConcreteASREigenstrain.C index 01cca11b..3b3dd10c 100644 --- a/src/materials/ConcreteASREigenstrain.C +++ b/src/materials/ConcreteASREigenstrain.C @@ -39,9 +39,12 @@ 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"); + // WGA - energy units? params.addRangeCheckedParam("characteristic_activation_energy", 5400.0, "characteristic_activation_energy > 0.0", @@ -275,7 +278,7 @@ ConcreteASREigenstrain::computeResidual(unsigned qp, Real scalar) // Convert current temperature to Kelvin const Real T = _temperature[qp] + _temp_offset; - // ASR characteristic and latency times (in days) + // ASR characteristic and latency times (in ) Real tau_c = _tau_c_T0 * std::exp(_Uc * (1.0 / T - 1.0 / _ref_temp)); Real tau_L = f * _tau_L_T0 * std::exp(_UL * (1.0 / T - 1.0 / _ref_temp)); @@ -309,7 +312,7 @@ ConcreteASREigenstrain::computeDerivative(unsigned qp, Real scalar) // Convert current temperature to Kelvin const Real T = _temperature[qp] + _temp_offset; - // ASR characteristic and latency times (in days) + // ASR characteristic and latency times (in ) Real tau_c = _tau_c_T0 * std::exp(_Uc * (1.0 / T - 1.0 / _ref_temp)); Real tau_L = f * _tau_L_T0 * std::exp(_UL * (1.0 / T - 1.0 / _ref_temp)); diff --git a/src/materials/ConcreteExpansionEigenstrainBase.C b/src/materials/ConcreteExpansionEigenstrainBase.C index 18de8564..afabe78e 100644 --- a/src/materials/ConcreteExpansionEigenstrainBase.C +++ b/src/materials/ConcreteExpansionEigenstrainBase.C @@ -24,6 +24,7 @@ ConcreteExpansionEigenstrainBase::validParams() "expansion_type", expansion_type, "Type of expansion resulting from volumetric strain"); params.addRangeCheckedParam( "compressive_strength", "compressive_strength > 0", "Compressive strength of concrete"); + // WGA - unclear if units are needed? params.addRangeCheckedParam( "expansion_stress_limit", "expansion_stress_limit > 0", diff --git a/src/materials/ConcreteExpansionMicrocrackingDamage.C b/src/materials/ConcreteExpansionMicrocrackingDamage.C index b9a1500f..8135d4da 100644 --- a/src/materials/ConcreteExpansionMicrocrackingDamage.C +++ b/src/materials/ConcreteExpansionMicrocrackingDamage.C @@ -42,15 +42,18 @@ ConcreteExpansionMicrocrackingDamage::validParams() "Correction factor by which the eigenstrain is multiplied before " "evaluating the damage"); + // WGA - [m/m] ??? params.addRequiredRangeCheckedParam( "microcracking_initiation_strain", "microcracking_initiation_strain > 0", - "Linear strain at which the microcracking initiates (in [m/m])"); + "Linear strain at which the microcracking initiates"); + params.setDocUnit("microcracking_initiation_strain", "[m/m]"); 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.setDocUnit("microcracking_strain_branch", "[m/m]"); params.addParam( "expansion_stress_limit", diff --git a/src/materials/ConcreteLogarithmicCreepModel.C b/src/materials/ConcreteLogarithmicCreepModel.C index fdfa2f19..850b8787 100644 --- a/src/materials/ConcreteLogarithmicCreepModel.C +++ b/src/materials/ConcreteLogarithmicCreepModel.C @@ -38,11 +38,15 @@ ConcreteLogarithmicCreepModel::validParams() 1, "long_term_characteristic_time > 0", "Rate at which the long_term viscosity increases"); - params.addCoupledVar("temperature", "Temperature variable [in Celsius]"); + // WGA - using 0C for degrees celcius + params.addCoupledVar("temperature", "Temperature variable"); + params.setDocUnit("temperature", "0C"); 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", "0C"); params.addCoupledVar("humidity", "Humidity variable"); params.addRangeCheckedParam("drying_creep_viscosity", "drying_creep_viscosity > 0", diff --git a/src/materials/ConcreteThermalMoisture.C b/src/materials/ConcreteThermalMoisture.C index 1511236f..e64abd7f 100644 --- a/src/materials/ConcreteThermalMoisture.C +++ b/src/materials/ConcreteThermalMoisture.C @@ -71,25 +71,36 @@ 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"); + // WGA - unclear if units for following two params is kg or kg/m^3 - assuming kg + 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_density", "refernece density of porous media"); + params.setDocUnit("ref_density", "kg/m^3"); + // WGA - Joules / Kilograms / ??? - what is 0C? + params.addParam("ref_specific_heat", "reference specific heat of concrete"); + params.setDocUnit("ref_specific_heat", "J/kg/0C"); + // WGA - Watts / Meters / ??? - what is C? params.addParam("ref_thermal_conductivity", - "concrete reference thermal conductivity (W/m/C)"); + "concrete reference thermal conductivity"); + params.setDocUnit("ref_thermal_conductivity", "W/m/C"); // parameters for Bazant mositure transport model - params.addParam("D1", "empirical constants (m2/s)"); + // WGA - m2 = m^2 ?? - assuming so? + 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"); diff --git a/src/materials/DamagePlasticityStressUpdate.C b/src/materials/DamagePlasticityStressUpdate.C index d9006449..a2bd09f4 100644 --- a/src/materials/DamagePlasticityStressUpdate.C +++ b/src/materials/DamagePlasticityStressUpdate.C @@ -39,6 +39,7 @@ DamagePlasticityStressUpdate::validParams() "ft_ep_slope_factor_at_zero_ep", "ft_ep_slope_factor_at_zero_ep <= 1 & ft_ep_slope_factor_at_zero_ep >= 0", "slope of ft vs plastic strain curve at zero plastic strain"); + // WGA - unit needed for this? params.addRequiredParam( "tensile_damage_at_half_tensile_strength", "fraction of the elastic recovery slope in tension at 0.5*ft0 after yielding"); From 6ede39d543374df3928c836b05d539a8ce2a33e3 Mon Sep 17 00:00:00 2001 From: William Adelman Date: Wed, 3 Jul 2024 14:23:58 -0600 Subject: [PATCH 02/27] WIP - param.setDocUnit(...) for units for relevant params ref #396 --- src/materials/ConcreteThermalMoisture.C | 1 - 1 file changed, 1 deletion(-) diff --git a/src/materials/ConcreteThermalMoisture.C b/src/materials/ConcreteThermalMoisture.C index e64abd7f..808edfe2 100644 --- a/src/materials/ConcreteThermalMoisture.C +++ b/src/materials/ConcreteThermalMoisture.C @@ -81,7 +81,6 @@ ConcreteThermalMoisture::validParams() params.addParam("concrete_cure_time", "concrete curing time in days"); params.addParam("ref_density", "refernece density of porous media"); params.setDocUnit("ref_density", "kg/m^3"); - // WGA - Joules / Kilograms / ??? - what is 0C? params.addParam("ref_specific_heat", "reference specific heat of concrete"); params.setDocUnit("ref_specific_heat", "J/kg/0C"); // WGA - Watts / Meters / ??? - what is C? From 168b00101712d33d6ba5c958ae36ca58b6b91324 Mon Sep 17 00:00:00 2001 From: William Adelman Date: Wed, 3 Jul 2024 14:35:04 -0600 Subject: [PATCH 03/27] autogenerated style changes --- src/materials/ConcreteExpansionMicrocrackingDamage.C | 7 +++---- src/materials/ConcreteThermalMoisture.C | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/materials/ConcreteExpansionMicrocrackingDamage.C b/src/materials/ConcreteExpansionMicrocrackingDamage.C index 8135d4da..1a3b4ca4 100644 --- a/src/materials/ConcreteExpansionMicrocrackingDamage.C +++ b/src/materials/ConcreteExpansionMicrocrackingDamage.C @@ -43,10 +43,9 @@ ConcreteExpansionMicrocrackingDamage::validParams() "evaluating the damage"); // WGA - [m/m] ??? - params.addRequiredRangeCheckedParam( - "microcracking_initiation_strain", - "microcracking_initiation_strain > 0", - "Linear strain at which the microcracking initiates"); + params.addRequiredRangeCheckedParam("microcracking_initiation_strain", + "microcracking_initiation_strain > 0", + "Linear strain at which the microcracking initiates"); params.setDocUnit("microcracking_initiation_strain", "[m/m]"); params.addRequiredRangeCheckedParam( diff --git a/src/materials/ConcreteThermalMoisture.C b/src/materials/ConcreteThermalMoisture.C index 808edfe2..a895b22b 100644 --- a/src/materials/ConcreteThermalMoisture.C +++ b/src/materials/ConcreteThermalMoisture.C @@ -84,8 +84,7 @@ ConcreteThermalMoisture::validParams() params.addParam("ref_specific_heat", "reference specific heat of concrete"); params.setDocUnit("ref_specific_heat", "J/kg/0C"); // WGA - Watts / Meters / ??? - what is C? - params.addParam("ref_thermal_conductivity", - "concrete reference thermal conductivity"); + params.addParam("ref_thermal_conductivity", "concrete reference thermal conductivity"); params.setDocUnit("ref_thermal_conductivity", "W/m/C"); // parameters for Bazant mositure transport model From 7fc5b8d64112865216b2428e49b23c0fcc0631b0 Mon Sep 17 00:00:00 2001 From: William Adelman Date: Wed, 3 Jul 2024 15:34:02 -0600 Subject: [PATCH 04/27] requested changes --- src/materials/ConcreteASREigenstrain.C | 4 ++-- src/materials/ConcreteExpansionMicrocrackingDamage.C | 7 ++----- src/materials/ConcreteLogarithmicCreepModel.C | 6 +++--- src/materials/DamagePlasticityStressUpdate.C | 1 - 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/materials/ConcreteASREigenstrain.C b/src/materials/ConcreteASREigenstrain.C index 3b3dd10c..d1fc230f 100644 --- a/src/materials/ConcreteASREigenstrain.C +++ b/src/materials/ConcreteASREigenstrain.C @@ -278,7 +278,7 @@ ConcreteASREigenstrain::computeResidual(unsigned qp, Real scalar) // Convert current temperature to Kelvin const Real T = _temperature[qp] + _temp_offset; - // ASR characteristic and latency times (in ) + // ASR characteristic and latency times (in days) Real tau_c = _tau_c_T0 * std::exp(_Uc * (1.0 / T - 1.0 / _ref_temp)); Real tau_L = f * _tau_L_T0 * std::exp(_UL * (1.0 / T - 1.0 / _ref_temp)); @@ -312,7 +312,7 @@ ConcreteASREigenstrain::computeDerivative(unsigned qp, Real scalar) // Convert current temperature to Kelvin const Real T = _temperature[qp] + _temp_offset; - // ASR characteristic and latency times (in ) + // ASR characteristic and latency times (in days) Real tau_c = _tau_c_T0 * std::exp(_Uc * (1.0 / T - 1.0 / _ref_temp)); Real tau_L = f * _tau_L_T0 * std::exp(_UL * (1.0 / T - 1.0 / _ref_temp)); diff --git a/src/materials/ConcreteExpansionMicrocrackingDamage.C b/src/materials/ConcreteExpansionMicrocrackingDamage.C index 1a3b4ca4..59d09aa3 100644 --- a/src/materials/ConcreteExpansionMicrocrackingDamage.C +++ b/src/materials/ConcreteExpansionMicrocrackingDamage.C @@ -42,17 +42,14 @@ ConcreteExpansionMicrocrackingDamage::validParams() "Correction factor by which the eigenstrain is multiplied before " "evaluating the damage"); - // WGA - [m/m] ??? params.addRequiredRangeCheckedParam("microcracking_initiation_strain", "microcracking_initiation_strain > 0", - "Linear strain at which the microcracking initiates"); - params.setDocUnit("microcracking_initiation_strain", "[m/m]"); + "Linear strain at which the microcracking initiates (in [m/m])"); params.addRequiredRangeCheckedParam( "microcracking_strain_branch", "microcracking_strain_branch > 0", - "Parameter controlling the rate at which the microcracking increases"); - params.setDocUnit("microcracking_strain_branch", "[m/m]"); + "Parameter controlling the rate at which the microcracking increases (in [m/m])"); params.addParam( "expansion_stress_limit", diff --git a/src/materials/ConcreteLogarithmicCreepModel.C b/src/materials/ConcreteLogarithmicCreepModel.C index 850b8787..371da11d 100644 --- a/src/materials/ConcreteLogarithmicCreepModel.C +++ b/src/materials/ConcreteLogarithmicCreepModel.C @@ -38,15 +38,15 @@ ConcreteLogarithmicCreepModel::validParams() 1, "long_term_characteristic_time > 0", "Rate at which the long_term viscosity increases"); - // WGA - using 0C for degrees celcius + // WGA - using C for degrees celcius params.addCoupledVar("temperature", "Temperature variable"); - params.setDocUnit("temperature", "0C"); + params.setDocUnit("temperature", "C"); params.addRangeCheckedParam("activation_temperature", "activation_temperature >= 0", "Activation temperature for the creep"); params.setDocUnit("activation_temperature", "K"); params.addParam("reference_temperature", 20, "Reference temperature"); - params.setDocUnit("reference_temperature", "0C"); + params.setDocUnit("reference_temperature", "C"); params.addCoupledVar("humidity", "Humidity variable"); params.addRangeCheckedParam("drying_creep_viscosity", "drying_creep_viscosity > 0", diff --git a/src/materials/DamagePlasticityStressUpdate.C b/src/materials/DamagePlasticityStressUpdate.C index a2bd09f4..d9006449 100644 --- a/src/materials/DamagePlasticityStressUpdate.C +++ b/src/materials/DamagePlasticityStressUpdate.C @@ -39,7 +39,6 @@ DamagePlasticityStressUpdate::validParams() "ft_ep_slope_factor_at_zero_ep", "ft_ep_slope_factor_at_zero_ep <= 1 & ft_ep_slope_factor_at_zero_ep >= 0", "slope of ft vs plastic strain curve at zero plastic strain"); - // WGA - unit needed for this? params.addRequiredParam( "tensile_damage_at_half_tensile_strength", "fraction of the elastic recovery slope in tension at 0.5*ft0 after yielding"); From e9a1316d336e5cb6032621f63b0652547a14849c Mon Sep 17 00:00:00 2001 From: William Adelman Date: Mon, 15 Jul 2024 12:47:06 -0600 Subject: [PATCH 05/27] clarify ambiguity in temperatures and add energy units --- src/materials/ConcreteASREigenstrain.C | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/materials/ConcreteASREigenstrain.C b/src/materials/ConcreteASREigenstrain.C index d1fc230f..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( @@ -44,17 +45,19 @@ ConcreteASREigenstrain::validParams() params.addRequiredParam("latency_time", "Latency ASR time at reference temprature (tau_L(T_0))"); params.setDocUnit("latency_time", "d"); - // WGA - energy units? 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 From 6c53cdf8e89a2bfe0db81194e50a28e15bc7dc14 Mon Sep 17 00:00:00 2001 From: William Adelman Date: Mon, 15 Jul 2024 12:51:30 -0600 Subject: [PATCH 06/27] add strength and stress units --- src/materials/ConcreteExpansionEigenstrainBase.C | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/materials/ConcreteExpansionEigenstrainBase.C b/src/materials/ConcreteExpansionEigenstrainBase.C index afabe78e..dcdd7b63 100644 --- a/src/materials/ConcreteExpansionEigenstrainBase.C +++ b/src/materials/ConcreteExpansionEigenstrainBase.C @@ -25,12 +25,15 @@ ConcreteExpansionEigenstrainBase::validParams() params.addRangeCheckedParam( "compressive_strength", "compressive_strength > 0", "Compressive strength of concrete"); // WGA - unclear if units are needed? + 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; } From eea17f3a17fa2e79d20ae50d00ea1f489c7f58b8 Mon Sep 17 00:00:00 2001 From: William Adelman Date: Mon, 15 Jul 2024 12:54:47 -0600 Subject: [PATCH 07/27] updated strain to be unitless --- src/materials/ConcreteExpansionMicrocrackingDamage.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/materials/ConcreteExpansionMicrocrackingDamage.C b/src/materials/ConcreteExpansionMicrocrackingDamage.C index 59d09aa3..b7c8a325 100644 --- a/src/materials/ConcreteExpansionMicrocrackingDamage.C +++ b/src/materials/ConcreteExpansionMicrocrackingDamage.C @@ -44,12 +44,12 @@ ConcreteExpansionMicrocrackingDamage::validParams() params.addRequiredRangeCheckedParam("microcracking_initiation_strain", "microcracking_initiation_strain > 0", - "Linear strain at which the microcracking initiates (in [m/m])"); + "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", From 194b8e12a5eea99423818c5056fa76a42db028b4 Mon Sep 17 00:00:00 2001 From: HiddenRoom <107678660+HiddenRoom@users.noreply.github.com> Date: Thu, 18 Jul 2024 15:15:19 -0600 Subject: [PATCH 08/27] typo Co-authored-by: Ben Spencer --- src/materials/ConcreteThermalMoisture.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/materials/ConcreteThermalMoisture.C b/src/materials/ConcreteThermalMoisture.C index a895b22b..654417cb 100644 --- a/src/materials/ConcreteThermalMoisture.C +++ b/src/materials/ConcreteThermalMoisture.C @@ -79,7 +79,7 @@ ConcreteThermalMoisture::validParams() 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"); + 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/0C"); From 48c1392719e346b5963677e1967df75fe09c6ccd Mon Sep 17 00:00:00 2001 From: moosetest Date: Wed, 3 Jul 2024 21:43:40 -0600 Subject: [PATCH 09/27] Updating stable moose submodule refs #000 Triggered by CIVET job https://civet.inl.gov/job/2312477 --- moose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moose b/moose index 7921af52..dc00ea5e 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit 7921af52de7885a62a3f51c8351ce6517966c765 +Subproject commit dc00ea5e8cb2734c158414745b690a67a3065f98 From 048f33fe360c1d17fdb2aa78c276a005ac740476 Mon Sep 17 00:00:00 2001 From: moosetest Date: Mon, 8 Jul 2024 07:06:56 -0600 Subject: [PATCH 10/27] Updating stable moose submodule refs #000 Triggered by CIVET job https://civet.inl.gov/job/2315029 --- moose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moose b/moose index dc00ea5e..fd18d88b 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit dc00ea5e8cb2734c158414745b690a67a3065f98 +Subproject commit fd18d88b460d7bfbcd385bbb28ed167023244f01 From 8020fc4f736c6006a11d0581c6dafa35e5a97dd3 Mon Sep 17 00:00:00 2001 From: moosetest Date: Wed, 10 Jul 2024 11:40:53 -0600 Subject: [PATCH 11/27] Updating stable moose submodule refs #000 Triggered by CIVET job https://civet.inl.gov/job/2320969 --- moose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moose b/moose index fd18d88b..25924d94 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit fd18d88b460d7bfbcd385bbb28ed167023244f01 +Subproject commit 25924d9423c690f7f611d2e72f401ca480f94cd8 From 0479c15d247edb0aa32963f8b432b73e35efa464 Mon Sep 17 00:00:00 2001 From: moosetest Date: Wed, 10 Jul 2024 23:04:10 -0600 Subject: [PATCH 12/27] Updating stable moose submodule refs #000 Triggered by CIVET job https://civet.inl.gov/job/2323264 --- moose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moose b/moose index 25924d94..3e142a7e 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit 25924d9423c690f7f611d2e72f401ca480f94cd8 +Subproject commit 3e142a7e8aeb17d1a9fbbd719d12c2d421bbb168 From db7bb31328a57d3cd6bd880f03c6b4f6c323b261 Mon Sep 17 00:00:00 2001 From: moosetest Date: Thu, 11 Jul 2024 22:09:24 -0600 Subject: [PATCH 13/27] Updating stable moose submodule refs #000 Triggered by CIVET job https://civet.inl.gov/job/2325808 --- moose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moose b/moose index 3e142a7e..8c825900 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit 3e142a7e8aeb17d1a9fbbd719d12c2d421bbb168 +Subproject commit 8c825900799a7e06398ea448a9d013b966dd5fd0 From b5df9385bea89ee87ad5c3683c8003facf6a5507 Mon Sep 17 00:00:00 2001 From: Ben Spencer Date: Thu, 11 Jul 2024 18:04:58 -0600 Subject: [PATCH 14/27] Update NEML submodule ref #66 --- contrib/neml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From aa528b445a204a0cb250480e88b49f5fe7f20fe4 Mon Sep 17 00:00:00 2001 From: moosetest Date: Mon, 15 Jul 2024 21:31:52 -0600 Subject: [PATCH 15/27] Updating stable moose submodule refs #000 Triggered by CIVET job https://civet.inl.gov/job/2328699 --- moose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moose b/moose index 8c825900..dfb97632 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit 8c825900799a7e06398ea448a9d013b966dd5fd0 +Subproject commit dfb97632891bb7fe730c103afc55b2ec0060d52e From 4607275e54343e5ec35a222c1f4f7fe6a3a5f873 Mon Sep 17 00:00:00 2001 From: moosetest Date: Tue, 16 Jul 2024 14:48:10 -0600 Subject: [PATCH 16/27] Updating stable moose submodule refs #000 Triggered by CIVET job https://civet.inl.gov/job/2330312 --- moose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moose b/moose index dfb97632..d8dfe70e 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit dfb97632891bb7fe730c103afc55b2ec0060d52e +Subproject commit d8dfe70edf868e743e3f9614b409a8c9aea39f64 From 75fe0cb97869f129ee0d5dbf3b8b5ed459564936 Mon Sep 17 00:00:00 2001 From: moosetest Date: Wed, 17 Jul 2024 03:08:14 -0600 Subject: [PATCH 17/27] Updating stable moose submodule refs #000 Triggered by CIVET job https://civet.inl.gov/job/2333183 --- moose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moose b/moose index d8dfe70e..c15cdce7 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit d8dfe70edf868e743e3f9614b409a8c9aea39f64 +Subproject commit c15cdce7d3e4f9ce38cf067ab4b3c3de6246a2e6 From faf07cb7afdb95ec12d87a5e870e75647106a521 Mon Sep 17 00:00:00 2001 From: Alex Lindsay Date: Tue, 16 Jul 2024 17:16:27 -0700 Subject: [PATCH 18/27] Bump some tolerances in concrete tests Refs [idaholab/moose#27605](https://github.com/idaholab/moose/pull/27605) --- test/tests/concrete_drying_shrinkage/tests | 6 +++--- test/tests/concrete_expansion_microcracking/tests | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 From ec3ebbb3ad4844744852508293d61820e385fa49 Mon Sep 17 00:00:00 2001 From: moosetest Date: Wed, 17 Jul 2024 14:55:48 -0600 Subject: [PATCH 19/27] Updating stable moose submodule refs #000 Triggered by CIVET job https://civet.inl.gov/job/2334480 --- moose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moose b/moose index c15cdce7..cf062e7b 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit c15cdce7d3e4f9ce38cf067ab4b3c3de6246a2e6 +Subproject commit cf062e7b7eeb995e33482f34dadd40275b36572c From fdc35f0e63862b76ff0a3f13df6489068da9436b Mon Sep 17 00:00:00 2001 From: William Adelman Date: Thu, 18 Jul 2024 15:20:55 -0600 Subject: [PATCH 20/27] Additional units and clarifaction --- src/materials/ConcreteLogarithmicCreepModel.C | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/materials/ConcreteLogarithmicCreepModel.C b/src/materials/ConcreteLogarithmicCreepModel.C index 371da11d..feb948bd 100644 --- a/src/materials/ConcreteLogarithmicCreepModel.C +++ b/src/materials/ConcreteLogarithmicCreepModel.C @@ -21,24 +21,28 @@ 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"); - // WGA - using C for degrees celcius + params.setDocUnit("long_term_characteristic_time", "Model-specific time unit"); params.addCoupledVar("temperature", "Temperature variable"); params.setDocUnit("temperature", "C"); params.addRangeCheckedParam("activation_temperature", @@ -51,6 +55,7 @@ ConcreteLogarithmicCreepModel::validParams() 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; From 175d5b943c35f2fb00a93551a655e1ce0e29fa22 Mon Sep 17 00:00:00 2001 From: HiddenRoom <107678660+HiddenRoom@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:21:40 -0600 Subject: [PATCH 21/27] Update src/materials/ConcreteThermalMoisture.C Co-authored-by: Ben Spencer --- src/materials/ConcreteThermalMoisture.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/materials/ConcreteThermalMoisture.C b/src/materials/ConcreteThermalMoisture.C index 654417cb..f8641089 100644 --- a/src/materials/ConcreteThermalMoisture.C +++ b/src/materials/ConcreteThermalMoisture.C @@ -82,7 +82,7 @@ ConcreteThermalMoisture::validParams() 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/0C"); + params.setDocUnit("ref_specific_heat", "J/kg/K"); // WGA - Watts / Meters / ??? - what is C? params.addParam("ref_thermal_conductivity", "concrete reference thermal conductivity"); params.setDocUnit("ref_thermal_conductivity", "W/m/C"); From 3b392f48696a47a1603efc5ebb0e841f7018912a Mon Sep 17 00:00:00 2001 From: HiddenRoom <107678660+HiddenRoom@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:21:51 -0600 Subject: [PATCH 22/27] Update src/materials/ConcreteThermalMoisture.C Co-authored-by: Ben Spencer --- src/materials/ConcreteThermalMoisture.C | 1 - 1 file changed, 1 deletion(-) diff --git a/src/materials/ConcreteThermalMoisture.C b/src/materials/ConcreteThermalMoisture.C index f8641089..1c84b920 100644 --- a/src/materials/ConcreteThermalMoisture.C +++ b/src/materials/ConcreteThermalMoisture.C @@ -83,7 +83,6 @@ ConcreteThermalMoisture::validParams() 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"); - // WGA - Watts / Meters / ??? - what is C? params.addParam("ref_thermal_conductivity", "concrete reference thermal conductivity"); params.setDocUnit("ref_thermal_conductivity", "W/m/C"); From 4fdc4b12551f9360820bcb4c51decddbd2227fd8 Mon Sep 17 00:00:00 2001 From: HiddenRoom <107678660+HiddenRoom@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:21:59 -0600 Subject: [PATCH 23/27] Update src/materials/ConcreteThermalMoisture.C Co-authored-by: Ben Spencer --- src/materials/ConcreteThermalMoisture.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/materials/ConcreteThermalMoisture.C b/src/materials/ConcreteThermalMoisture.C index 1c84b920..ec2f40ed 100644 --- a/src/materials/ConcreteThermalMoisture.C +++ b/src/materials/ConcreteThermalMoisture.C @@ -84,7 +84,7 @@ ConcreteThermalMoisture::validParams() 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/C"); + params.setDocUnit("ref_thermal_conductivity", "W/m/K"); // parameters for Bazant mositure transport model // WGA - m2 = m^2 ?? - assuming so? From 500568d72727dd4488516aa4326e6a22160abfc7 Mon Sep 17 00:00:00 2001 From: HiddenRoom <107678660+HiddenRoom@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:22:07 -0600 Subject: [PATCH 24/27] Update src/materials/ConcreteThermalMoisture.C Co-authored-by: Ben Spencer --- src/materials/ConcreteThermalMoisture.C | 1 - 1 file changed, 1 deletion(-) diff --git a/src/materials/ConcreteThermalMoisture.C b/src/materials/ConcreteThermalMoisture.C index ec2f40ed..367b9f75 100644 --- a/src/materials/ConcreteThermalMoisture.C +++ b/src/materials/ConcreteThermalMoisture.C @@ -87,7 +87,6 @@ ConcreteThermalMoisture::validParams() params.setDocUnit("ref_thermal_conductivity", "W/m/K"); // parameters for Bazant mositure transport model - // WGA - m2 = m^2 ?? - assuming so? params.addParam("D1", "empirical constants"); params.setDocUnit("D1", "m^2/s"); params.addParam("n", "empirical constants"); From a59aeb0a7b69e016c9e74054e19016c725921084 Mon Sep 17 00:00:00 2001 From: William Adelman Date: Tue, 23 Jul 2024 14:23:16 -0600 Subject: [PATCH 25/27] remove comment --- src/materials/ConcreteExpansionEigenstrainBase.C | 1 - 1 file changed, 1 deletion(-) diff --git a/src/materials/ConcreteExpansionEigenstrainBase.C b/src/materials/ConcreteExpansionEigenstrainBase.C index dcdd7b63..9c4cfdc3 100644 --- a/src/materials/ConcreteExpansionEigenstrainBase.C +++ b/src/materials/ConcreteExpansionEigenstrainBase.C @@ -24,7 +24,6 @@ ConcreteExpansionEigenstrainBase::validParams() "expansion_type", expansion_type, "Type of expansion resulting from volumetric strain"); params.addRangeCheckedParam( "compressive_strength", "compressive_strength > 0", "Compressive strength of concrete"); - // WGA - unclear if units are needed? params.setDocUnit("compressive_strength", "Model-specific stress unit"); params.addRangeCheckedParam( "expansion_stress_limit", From 9075c74f27f02a6ea0bbe3803c6bf0e41f9a1562 Mon Sep 17 00:00:00 2001 From: William Adelman Date: Tue, 23 Jul 2024 14:26:49 -0600 Subject: [PATCH 26/27] Celcius units --- src/materials/ConcreteThermalMoisture.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/materials/ConcreteThermalMoisture.C b/src/materials/ConcreteThermalMoisture.C index 367b9f75..32cfce11 100644 --- a/src/materials/ConcreteThermalMoisture.C +++ b/src/materials/ConcreteThermalMoisture.C @@ -71,7 +71,6 @@ ConcreteThermalMoisture::validParams() params.addParam( "aggregate_pore_type", aggregate_pore_type, "aggregate pore structure"); - // WGA - unclear if units for following two params is kg or kg/m^3 - assuming kg params.addParam("cement_mass", "cement mass per m^3"); params.setDocUnit("cement_mass", "kg"); params.addParam("aggregate_mass", "aggregate mass per m^3"); @@ -101,7 +100,8 @@ ConcreteThermalMoisture::validParams() 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; From 679ae5876f6da316121429fe4de5ffd3603531ab Mon Sep 17 00:00:00 2001 From: William Adelman Date: Wed, 24 Jul 2024 13:01:03 -0600 Subject: [PATCH 27/27] cure time units --- src/materials/ConcreteThermalMoisture.C | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/materials/ConcreteThermalMoisture.C b/src/materials/ConcreteThermalMoisture.C index 32cfce11..874e7fc4 100644 --- a/src/materials/ConcreteThermalMoisture.C +++ b/src/materials/ConcreteThermalMoisture.C @@ -77,7 +77,8 @@ ConcreteThermalMoisture::validParams() 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("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");