Skip to content

Commit 5151ce1

Browse files
committed
Merge remote-tracking branch 'origin/master' into v4
2 parents f752062 + c99a888 commit 5151ce1

File tree

4 files changed

+47
-1
lines changed

4 files changed

+47
-1
lines changed

Common/UnitDefinitions/HeatFlux.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,30 @@
116116
"Abbreviations": [ "kcal/h·m²" ]
117117
}
118118
]
119+
},
120+
{
121+
"SingularName": "PoundForcePerFootSecond",
122+
"PluralName": "PoundsForcePerFootSecond",
123+
"FromUnitToBaseFunc": "x*1.459390293720636e1",
124+
"FromBaseToUnitFunc": "x/1.459390293720636e1",
125+
"Localization": [
126+
{
127+
"Culture": "en-US",
128+
"Abbreviations": [ "lbf/(ft·s)" ]
129+
}
130+
]
131+
},
132+
{
133+
"SingularName": "PoundPerSecondCubed",
134+
"PluralName": "PoundsPerSecondCubed",
135+
"FromUnitToBaseFunc": "x*4.5359237e-1",
136+
"FromBaseToUnitFunc": "x/4.5359237e-1",
137+
"Localization": [
138+
{
139+
"Culture": "en-US",
140+
"Abbreviations": [ "lb/s³", "lbm/s³" ]
141+
}
142+
]
119143
}
120144
]
121145
}

UnitsNet.Tests/CustomCode/HeatFluxTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ public class HeatFluxTests : HeatFluxTestsBase
6262
protected override double WattsPerSquareFootInOneWattPerSquareMeter => 9.290304e-2;
6363
protected override double WattsPerSquareInchInOneWattPerSquareMeter => 6.4516e-4;
6464
protected override double WattsPerSquareMeterInOneWattPerSquareMeter => 1;
65+
protected override double PoundsForcePerFootSecondInOneWattPerSquareMeter => 6.852176585679176e-2;
66+
protected override double PoundsPerSecondCubedInOneWattPerSquareMeter => 2.204622621848776;
6567

66-
[Fact]
68+
[ Fact]
6769
public void PowerDividedByAreaEqualsHeatFlux()
6870
{
6971
HeatFlux heatFlux = Power.FromWatts(12) / Area.FromSquareMeters(3);

UnitsNet/GeneratedCode/Quantities/HeatFlux.NetFramework.g.cs

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet/GeneratedCode/Units/HeatFluxUnit.g.cs

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)