Skip to content

Commit 0826b75

Browse files
committed
Merge remote-tracking branch 'origin/master' into v4
2 parents 71bc0a8 + f5c256d commit 0826b75

18 files changed

+8383
-0
lines changed

Common/GeneratedCode/Quantities/MassFlow.Common.g.cs

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

Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs

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

Common/UnitDefinitions/MassFlow.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,22 @@
3636
}
3737
]
3838
},
39+
{
40+
"SingularName": "KilogramPerMinute",
41+
"PluralName": "KilogramsPerMinute",
42+
"FromUnitToBaseFunc": "x/0.06",
43+
"FromBaseToUnitFunc": "x*0.06",
44+
"Localization": [
45+
{
46+
"Culture": "en-US",
47+
"Abbreviations": [ "kg/min" ]
48+
},
49+
{
50+
"Culture": "ru-RU",
51+
"Abbreviations": [ "кг/мин" ]
52+
}
53+
]
54+
},
3955
{
4056
"SingularName": "TonnePerHour",
4157
"PluralName": "TonnesPerHour",

Common/UnitDefinitions/VolumeFlow.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,18 @@
200200
}
201201
]
202202
},
203+
{
204+
"SingularName": "KilousGallonsPerMinute",
205+
"PluralName": "KilousGallonsPerMinute",
206+
"FromUnitToBaseFunc": "x/15.850323141489",
207+
"FromBaseToUnitFunc": "x*15.850323141489",
208+
"Localization": [
209+
{
210+
"Culture": "en-US",
211+
"Abbreviations": [ "kgal (U.S.)/min", "KGPM" ]
212+
}
213+
]
214+
},
203215
{
204216
"SingularName": "UsGallonPerHour",
205217
"PluralName": "UsGallonsPerHour",

UnitsNet.Tests/CustomCode/MassFlowTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ public class MassFlowTests : MassFlowTestsBase
6060

6161
protected override double MegapoundsPerMinuteInOneGramPerSecond => 0.132277e-6;
6262

63+
protected override double KilogramsPerMinuteInOneGramPerSecond => 0.06;
64+
6365
[Fact]
6466
public void DurationTimesMassFlowEqualsMass()
6567
{

UnitsNet.Tests/CustomCode/VolumeFlowTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ public class VolumeFlowTests : VolumeFlowTestsBase
9595

9696
protected override double OilBarrelsPerMinuteInOneCubicMeterPerSecond => 3.77388865E2;
9797

98+
protected override double KilousGallonsPerMinuteInOneCubicMeterPerSecond => 1.5850323141489e1;
99+
98100
[Theory]
99101
[InlineData(20, 2, 40)]
100102
[InlineData(20, 62, 1240)]

UnitsNet.Tests/GeneratedCode/MassFlowTestsBase.g.cs

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

UnitsNet.Tests/GeneratedCode/VolumeFlowTestsBase.g.cs

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

UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFlow.WindowsRuntimeComponent.g.cs

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

UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeFlow.WindowsRuntimeComponent.g.cs

Lines changed: 17 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)