Skip to content

Commit

Permalink
revert unneeded changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@onufer
onufer committed Aug 25, 2022
1 parent dcb08df commit 648b054
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion armi/materials/zr.py
View file
Expand Up @@ -130,7 +130,7 @@ def linearExpansionPercent(self, Tk=None, Tc=None):
Tk = getTk(Tc, Tk)
self.checkPropertyTempRange("linear expansion percent", Tk)

if Tk >= 291.62 and Tk < 1137:
if Tk >= 293 and Tk < 1137:
return (
-0.111 + (2.325e-4 * Tk) + (5.595e-7 * Tk ** 2) - (1.768e-10 * Tk ** 3)
)
Expand Down
60 changes: 30 additions & 30 deletions armi/tests/detailedAxialExpansion/refSmallReactorBase.yaml
View file
Expand Up @@ -23,7 +23,7 @@ blocks:
grid:
shape: Hexagon
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
ip: 15.277
mult: 1.0
Expand Down Expand Up @@ -60,7 +60,7 @@ blocks:
shield:
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 600.0
id: 0.0
mult: 169.0
Expand All @@ -76,15 +76,15 @@ blocks:
clad:
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 470.0
id: 1.0
mult: shield.mult
od: 1.09
wire:
shape: Helix
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
axialPitch: 30.15
helixDiameter: 1.19056
Expand All @@ -95,7 +95,7 @@ blocks:
duct: &component_fuel_duct
shape: Hexagon
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
ip: 16.0
mult: 1.0
Expand All @@ -113,7 +113,7 @@ blocks:
fuel: &component_fuel_fuel
shape: Circle
material: UZr
Tinput: 45.187
Tinput: 25.0
Thot: 600.0
id: 0.0
mult: 169.0
Expand All @@ -129,15 +129,15 @@ blocks:
clad: &component_fuel_clad
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 470.0
id: 1.0
mult: fuel.mult
od: 1.09
wire: &component_fuel_wire
shape: Helix
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
axialPitch: 30.15
helixDiameter: 1.19056
Expand All @@ -160,15 +160,15 @@ blocks:
clad: &component_plenum_clad
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 470.0
id: 1.0
mult: 169.0
od: 1.09
wire: &component_plenum_wire
shape: Helix
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
axialPitch: 30.15
helixDiameter: 1.19056
Expand All @@ -187,7 +187,7 @@ blocks:
duct:
shape: Hexagon
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
ip: 16.0
mult: 1.0
Expand Down Expand Up @@ -215,7 +215,7 @@ blocks:
liner2: &component_fuel2_liner2
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 600.0
id: 0.98
mergeWith: clad
Expand All @@ -224,7 +224,7 @@ blocks:
liner1: &component_fuel2_liner1
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 600.0
id: 0.99
mergeWith: clad
Expand All @@ -251,7 +251,7 @@ blocks:
fuel:
shape: Circle
material: UZr
Tinput: 45.187
Tinput: 25.0
Thot: 600.0
id: 0.0
isotopics: PuUZr
Expand All @@ -278,7 +278,7 @@ blocks:
fuel:
shape: Circle
material: UZr
Tinput: 45.187
Tinput: 25.0
Thot: 600.0
id: 0.600
mult: 169.0
Expand All @@ -295,7 +295,7 @@ blocks:
inner liner:
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 430.0
id: 0.878
mult: fuel.mult
Expand All @@ -311,7 +311,7 @@ blocks:
outer liner:
shape: Circle
material: Zr
Tinput: 18.474
Tinput: 25.0
Thot: 430.0
id: 0.898
mult: fuel.mult
Expand All @@ -327,7 +327,7 @@ blocks:
clad:
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 430.0
id: 0.900
mult: fuel.mult
Expand All @@ -344,7 +344,7 @@ blocks:
duct: &component_control_duct
shape: Hexagon
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
ip: 15.277
mult: 1.0
Expand Down Expand Up @@ -378,15 +378,15 @@ blocks:
clad:
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
id: 1.358
mult: control.mult
od: 1.686
wire:
shape: Helix
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
axialPitch: 50.0
helixDiameter: 1.771
Expand All @@ -396,7 +396,7 @@ blocks:
innerDuct:
shape: Hexagon
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
ip: 14.268
mult: 1.0
Expand All @@ -417,15 +417,15 @@ blocks:
clad:
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
id: 1.358
mult: 61.0
od: 1.686
wire:
shape: Helix
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
axialPitch: 30.15
helixDiameter: 1.19056
Expand All @@ -442,7 +442,7 @@ blocks:
shield:
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 600.0
id: 0.0
mult: 169.0
Expand All @@ -458,15 +458,15 @@ blocks:
clad:
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
id: 0.90562
mult: shield.mult
od: 1.05036
wire:
shape: Helix
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
axialPitch: 30.15
helixDiameter: 16.85056
Expand All @@ -489,15 +489,15 @@ blocks:
clad: &component_radial_shield_clad
shape: Circle
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
id: 0.90562
mult: 169.0
od: 1.05036
wire: &component_radial_shield_plenum_wire
shape: Helix
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
axialPitch: 30.15
helixDiameter: 1.19056
Expand All @@ -516,7 +516,7 @@ blocks:
duct:
shape: Hexagon
material: HT9
Tinput: 27.548
Tinput: 25.0
Thot: 450.0
ip: 16.0
mult: 1.0
Expand Down

0 comments on commit 648b054

Please sign in to comment.