Skip to content

Commit

Permalink
improving test coverage ref #272
Browse files Browse the repository at this point in the history
  • Loading branch information
@jain651
jain651 committed Nov 2, 2021
1 parent 79ea8ed commit 111b825
Show file tree
Hide file tree
Showing 8 changed files with 3,147 additions and 3,078 deletions.
2 changes: 0 additions & 2 deletions src/materials/ConcreteThermalMoisture.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,6 @@ ConcreteThermalMoisture::computeProperties()
_thermal_conductivity[qp] = 1.4875;
else if (T >= 20.0 && T < 800.0)
_thermal_conductivity[qp] = -0.000625 * T + 1.5;
else if (T >= 800.0)
_thermal_conductivity[qp] = 1.0;
break;

case 1: // carbonate aggregate
Expand Down
24 changes: 13 additions & 11 deletions test/tests/concrete_moisture_heat_transfer/concrete_thermal_moisture_properties.i
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Tmax = 1200
Tmin = 28
Tmax = 635

[Mesh]
type = GeneratedMesh
dim = 2
Expand Down Expand Up @@ -69,16 +71,16 @@ Tmax = 1200
[Functions]
[temperature]
type = PiecewiseLinear
xy_data = '28 28
635 635
636 28
1243 635
1244 28
1851 635
1852 28
2459 635
2460 28
3067 635'
xy_data = '28 ${Tmin}
635 ${Tmax}
636 ${Tmin}
1243 ${Tmax}
1244 ${Tmin}
1851 ${Tmax}
1852 ${Tmin}
2459 ${Tmax}
2460 ${Tmin}
3067 ${Tmax}'
[]
[rh]
type = PiecewiseLinear
Expand Down
1,218 changes: 609 additions & 609 deletions test/tests/concrete_moisture_heat_transfer/gold/asce_carbonate_thermal_model_out.csv
View file

Large diffs are not rendered by default.

1,218 changes: 609 additions & 609 deletions test/tests/concrete_moisture_heat_transfer/gold/asce_siliceous_thermal_model_out.csv
View file

Large diffs are not rendered by default.

1,216 changes: 608 additions & 608 deletions test/tests/concrete_moisture_heat_transfer/gold/eurocode_thermal_model_out.csv
View file

Large diffs are not rendered by default.

1,218 changes: 609 additions & 609 deletions test/tests/concrete_moisture_heat_transfer/gold/kodur_carbonate_thermal_model_out.csv
View file

Large diffs are not rendered by default.

1,218 changes: 609 additions & 609 deletions test/tests/concrete_moisture_heat_transfer/gold/kodur_siliceous_thermal_model_out.csv
View file

Large diffs are not rendered by default.

111 changes: 90 additions & 21 deletions test/tests/concrete_moisture_heat_transfer/tests
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
rel_err = 1e-6
abs_zero = 1e-10
[]
issues = '#245'
issues = '#245 #272'
design = 'ConcreteThermalMoisture.md'
[thermal_model]
requirement = 'Blackbear shall compute the heat capacity and thermal conductivity for concrete for the following models and options:'
Expand All @@ -35,11 +35,13 @@
csvdiff = 'asce_siliceous_thermal_model_out.csv'
cli_args = 'Materials/concrete/thermal_model=ASCE-1992 '
'Materials/concrete/aggregate_type=Siliceous '
'Materials/concrete/moisture_model=Bazant '
'Materials/concrete/D1=3.0e-10 '
'Materials/concrete/n=16 '
'Materials/concrete/critical_relative_humidity=0.75 '
'Materials/concrete/coupled_moisture_diffusivity_factor=1e-5 '
'Materials/concrete/moisture_model=Mensi '
'Materials/concrete/A=1.042e-13 '
'Materials/concrete/B=0.05 '
'Materials/concrete/cement_mass=354 '
'Materials/concrete/water_to_cement_ratio=0.5 '
'Tmin=10 '
'Tmax=800 '
'Outputs/file_base=asce_siliceous_thermal_model_out '
detail = 'ASCE-1992 siliceous thermal model.'
[]
Expand All @@ -49,11 +51,12 @@
csvdiff = 'asce_carbonate_thermal_model_out.csv'
cli_args = 'Materials/concrete/thermal_model=ASCE-1992 '
'Materials/concrete/aggregate_type=Carbonate '
'Materials/concrete/moisture_model=Bazant '
'Materials/concrete/D1=3.0e-10 '
'Materials/concrete/n=16 '
'Materials/concrete/critical_relative_humidity=0.75 '
'Materials/concrete/coupled_moisture_diffusivity_factor=1e-5 '
'Materials/concrete/moisture_model=Mensi '
'Materials/concrete/A=1.042e-13 '
'Materials/concrete/B=0.05 '
'Materials/concrete/cement_mass=354 '
'Materials/concrete/water_to_cement_ratio=0.5 '
'Tmax=800 '
'Outputs/file_base=asce_carbonate_thermal_model_out '
detail = 'ASCE-1992 carbonate thermal model.'
[]
Expand All @@ -63,11 +66,12 @@
csvdiff = 'kodur_siliceous_thermal_model_out.csv'
cli_args = 'Materials/concrete/thermal_model=KODUR-2004 '
'Materials/concrete/aggregate_type=Siliceous '
'Materials/concrete/moisture_model=Bazant '
'Materials/concrete/D1=3.0e-10 '
'Materials/concrete/n=16 '
'Materials/concrete/critical_relative_humidity=0.75 '
'Materials/concrete/coupled_moisture_diffusivity_factor=1e-5 '
'Materials/concrete/moisture_model=Mensi '
'Materials/concrete/A=1.042e-13 '
'Materials/concrete/B=0.05 '
'Materials/concrete/cement_mass=354 '
'Materials/concrete/water_to_cement_ratio=0.5 '
'Tmin=10 '
'Outputs/file_base=kodur_siliceous_thermal_model_out '
detail = 'Kodur-2004 siliceous thermal model.'
[]
Expand All @@ -77,11 +81,12 @@
csvdiff = 'kodur_carbonate_thermal_model_out.csv'
cli_args = 'Materials/concrete/thermal_model=KODUR-2004 '
'Materials/concrete/aggregate_type=Carbonate '
'Materials/concrete/moisture_model=Bazant '
'Materials/concrete/D1=3.0e-10 '
'Materials/concrete/n=16 '
'Materials/concrete/critical_relative_humidity=0.75 '
'Materials/concrete/coupled_moisture_diffusivity_factor=1e-5 '
'Materials/concrete/moisture_model=Mensi '
'Materials/concrete/A=1.042e-13 '
'Materials/concrete/B=0.05 '
'Materials/concrete/cement_mass=354 '
'Materials/concrete/water_to_cement_ratio=0.5 '
'Tmax=1000 '
'Outputs/file_base=kodur_carbonate_thermal_model_out '
detail = 'Kodur-2004 carbonate thermal model.'
[]
Expand All @@ -97,6 +102,7 @@
'Materials/concrete/n=16 '
'Materials/concrete/critical_relative_humidity=0.75 '
'Materials/concrete/coupled_moisture_diffusivity_factor=1e-5 '
'Tmax=1199 '
'Outputs/file_base=eurocode_thermal_model_out '
detail = 'Eurocode-2004 thermal model.'
[]
Expand Down Expand Up @@ -602,5 +608,68 @@
allow_test_objects = True
detail = "Xi moisture model shall generate error if water_to_cement_ratio is set < 0.5."
[]
[kodur_siliceous_T_outside_range]
type = 'RunException'
input = 'concrete_thermal_moisture_properties.i'
expect_err = "Temperature outside of the range for the KODUR-2004 thermal model"
cli_args = 'Materials/concrete/thermal_model=KODUR-2004 '
'Materials/concrete/aggregate_type=Siliceous '
'Materials/concrete/moisture_model=Mensi '
'Materials/concrete/A=1.042e-13 '
'Materials/concrete/B=0.05 '
'Materials/concrete/cement_mass=354 '
'Materials/concrete/water_to_cement_ratio=0.5 '
'Tmax=650 '
allow_test_objects = True
detail = "Kodur-2004 thermal model shall generate error if temperature is more than 635."
[]
[kodur_carbonate_T_outside_range]
type = 'RunException'
input = 'concrete_thermal_moisture_properties.i'
expect_err = "Temperature outside of the range for the KODUR-2004 thermal model"
cli_args = 'Materials/concrete/thermal_model=KODUR-2004 '
'Materials/concrete/aggregate_type=Carbonate '
'Materials/concrete/moisture_model=Mensi '
'Materials/concrete/A=1.042e-13 '
'Materials/concrete/B=0.05 '
'Materials/concrete/cement_mass=354 '
'Materials/concrete/water_to_cement_ratio=0.5 '
'Tmax=1100 '
allow_test_objects = True
detail = "Kodur-2004 thermal model shall generate error if temperature is more than 1100."
[]
[eurocode_T_outside_range]
type = 'RunException'
input = 'concrete_thermal_moisture_properties.i'
expect_err = "Temperature outside of the range for the EUROCODE-2004 thermal model"
cli_args = 'Materials/concrete/thermal_model=EUROCODE-2004 '
'Materials/concrete/ref_density=2231 '
'Materials/concrete/ref_specific_heat=1100 '
'Materials/concrete/moisture_model=Mensi '
'Materials/concrete/A=1.042e-13 '
'Materials/concrete/B=0.05 '
'Materials/concrete/cement_mass=354 '
'Materials/concrete/water_to_cement_ratio=0.5 '
'Tmin=10 '
'Tmax=1300 '
allow_test_objects = True
detail = "EUROCODE-2004 thermal model shall generate error if temperature is more than 1200."
[]
[bazant_T_outside_range]
type = 'RunException'
input = 'concrete_thermal_moisture_properties.i'
expect_err = "Temperature outside of the range for the Bazant moisture model"
cli_args = 'Materials/concrete/moisture_model=Bazant '
'Materials/concrete/D1=3.0e-10 '
'Materials/concrete/n=16 '
'Materials/concrete/critical_relative_humidity=0.75 '
'Materials/concrete/coupled_moisture_diffusivity_factor=1e-5 '
'Materials/concrete/thermal_model=KODUR-2004 '
'Materials/concrete/aggregate_type=Siliceous '
'Outputs/file_base=bazant_moisture_model_out '
'Tmin=0 '
allow_test_objects = True
detail = "Bazant moisture model shall generate error if temperature is less than 25."
[]
[]
[]

0 comments on commit 111b825

Please sign in to comment.