Skip to content

Commit d8d86b1

Browse files
enterprisebugangularsen
authored andcommitted
Add Flow.CubicDecimeterPerMinute (#170)
1 parent 90d1006 commit d8d86b1

File tree

6 files changed

+70
-2
lines changed

6 files changed

+70
-2
lines changed

UnitsNet.Tests/CustomCode/FlowTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public class FlowTests : FlowTestsBase
2525
{
2626
protected override double CubicMetersPerHourInOneCubicMeterPerSecond => 3600.0;
2727

28+
protected override double CubicDecimetersPerMinuteInOneCubicMeterPerSecond => 60000.00000;
29+
2830
protected override double CubicFeetPerSecondInOneCubicMeterPerSecond => 35.314666213;
2931

3032
protected override double MillionUsGallonsPerDayInOneCubicMeterPerSecond => 22.824465227;

UnitsNet.Tests/GeneratedCode/FlowTestsBase.g.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ namespace UnitsNet.Tests
3737
public abstract partial class FlowTestsBase
3838
{
3939
protected abstract double CentilitersPerMinuteInOneCubicMeterPerSecond { get; }
40+
protected abstract double CubicDecimetersPerMinuteInOneCubicMeterPerSecond { get; }
4041
protected abstract double CubicFeetPerSecondInOneCubicMeterPerSecond { get; }
4142
protected abstract double CubicMetersPerHourInOneCubicMeterPerSecond { get; }
4243
protected abstract double CubicMetersPerSecondInOneCubicMeterPerSecond { get; }
@@ -51,6 +52,7 @@ public abstract partial class FlowTestsBase
5152

5253
// ReSharper disable VirtualMemberNeverOverriden.Global
5354
protected virtual double CentilitersPerMinuteTolerance { get { return 1e-5; } }
55+
protected virtual double CubicDecimetersPerMinuteTolerance { get { return 1e-5; } }
5456
protected virtual double CubicFeetPerSecondTolerance { get { return 1e-5; } }
5557
protected virtual double CubicMetersPerHourTolerance { get { return 1e-5; } }
5658
protected virtual double CubicMetersPerSecondTolerance { get { return 1e-5; } }
@@ -69,6 +71,7 @@ public void CubicMeterPerSecondToFlowUnits()
6971
{
7072
Flow cubicmeterpersecond = Flow.FromCubicMetersPerSecond(1);
7173
Assert.AreEqual(CentilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.CentilitersPerMinute, CentilitersPerMinuteTolerance);
74+
Assert.AreEqual(CubicDecimetersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.CubicDecimetersPerMinute, CubicDecimetersPerMinuteTolerance);
7275
Assert.AreEqual(CubicFeetPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.CubicFeetPerSecond, CubicFeetPerSecondTolerance);
7376
Assert.AreEqual(CubicMetersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.CubicMetersPerHour, CubicMetersPerHourTolerance);
7477
Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.CubicMetersPerSecond, CubicMetersPerSecondTolerance);
@@ -86,6 +89,7 @@ public void CubicMeterPerSecondToFlowUnits()
8689
public void FromValueAndUnit()
8790
{
8891
Assert.AreEqual(1, Flow.From(1, FlowUnit.CentilitersPerMinute).CentilitersPerMinute, CentilitersPerMinuteTolerance);
92+
Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicDecimeterPerMinute).CubicDecimetersPerMinute, CubicDecimetersPerMinuteTolerance);
8993
Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicFootPerSecond).CubicFeetPerSecond, CubicFeetPerSecondTolerance);
9094
Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicMeterPerHour).CubicMetersPerHour, CubicMetersPerHourTolerance);
9195
Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicMeterPerSecond).CubicMetersPerSecond, CubicMetersPerSecondTolerance);
@@ -104,6 +108,7 @@ public void As()
104108
{
105109
var cubicmeterpersecond = Flow.FromCubicMetersPerSecond(1);
106110
Assert.AreEqual(CentilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CentilitersPerMinute), CentilitersPerMinuteTolerance);
111+
Assert.AreEqual(CubicDecimetersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicDecimeterPerMinute), CubicDecimetersPerMinuteTolerance);
107112
Assert.AreEqual(CubicFeetPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicFootPerSecond), CubicFeetPerSecondTolerance);
108113
Assert.AreEqual(CubicMetersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicMeterPerHour), CubicMetersPerHourTolerance);
109114
Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicMeterPerSecond), CubicMetersPerSecondTolerance);
@@ -122,6 +127,7 @@ public void ConversionRoundTrip()
122127
{
123128
Flow cubicmeterpersecond = Flow.FromCubicMetersPerSecond(1);
124129
Assert.AreEqual(1, Flow.FromCentilitersPerMinute(cubicmeterpersecond.CentilitersPerMinute).CubicMetersPerSecond, CentilitersPerMinuteTolerance);
130+
Assert.AreEqual(1, Flow.FromCubicDecimetersPerMinute(cubicmeterpersecond.CubicDecimetersPerMinute).CubicMetersPerSecond, CubicDecimetersPerMinuteTolerance);
125131
Assert.AreEqual(1, Flow.FromCubicFeetPerSecond(cubicmeterpersecond.CubicFeetPerSecond).CubicMetersPerSecond, CubicFeetPerSecondTolerance);
126132
Assert.AreEqual(1, Flow.FromCubicMetersPerHour(cubicmeterpersecond.CubicMetersPerHour).CubicMetersPerSecond, CubicMetersPerHourTolerance);
127133
Assert.AreEqual(1, Flow.FromCubicMetersPerSecond(cubicmeterpersecond.CubicMetersPerSecond).CubicMetersPerSecond, CubicMetersPerSecondTolerance);

UnitsNet/GeneratedCode/Enums/FlowUnit.g.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public enum FlowUnit
2626
{
2727
Undefined = 0,
2828
CentilitersPerMinute,
29+
CubicDecimeterPerMinute,
2930
CubicFootPerSecond,
3031
CubicMeterPerHour,
3132
CubicMeterPerSecond,

UnitsNet/GeneratedCode/UnitClasses/Flow.g.cs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,14 @@ public double CentilitersPerMinute
101101
get { return (_cubicMetersPerSecond*60000.00000) / 1e-2d; }
102102
}
103103

104+
/// <summary>
105+
/// Get Flow in CubicDecimetersPerMinute.
106+
/// </summary>
107+
public double CubicDecimetersPerMinute
108+
{
109+
get { return _cubicMetersPerSecond*60000.00000; }
110+
}
111+
104112
/// <summary>
105113
/// Get Flow in CubicFeetPerSecond.
106114
/// </summary>
@@ -206,6 +214,14 @@ public static Flow FromCentilitersPerMinute(double centilitersperminute)
206214
return new Flow((centilitersperminute/60000.00000) * 1e-2d);
207215
}
208216

217+
/// <summary>
218+
/// Get Flow from CubicDecimetersPerMinute.
219+
/// </summary>
220+
public static Flow FromCubicDecimetersPerMinute(double cubicdecimetersperminute)
221+
{
222+
return new Flow(cubicdecimetersperminute/60000.00000);
223+
}
224+
209225
/// <summary>
210226
/// Get Flow from CubicFeetPerSecond.
211227
/// </summary>
@@ -310,6 +326,21 @@ public static Flow FromUsGallonsPerMinute(double usgallonsperminute)
310326
}
311327
}
312328

329+
/// <summary>
330+
/// Get nullable Flow from nullable CubicDecimetersPerMinute.
331+
/// </summary>
332+
public static Flow? FromCubicDecimetersPerMinute(double? cubicdecimetersperminute)
333+
{
334+
if (cubicdecimetersperminute.HasValue)
335+
{
336+
return FromCubicDecimetersPerMinute(cubicdecimetersperminute.Value);
337+
}
338+
else
339+
{
340+
return null;
341+
}
342+
}
343+
313344
/// <summary>
314345
/// Get nullable Flow from nullable CubicFeetPerSecond.
315346
/// </summary>
@@ -489,6 +520,8 @@ public static Flow From(double val, FlowUnit fromUnit)
489520
{
490521
case FlowUnit.CentilitersPerMinute:
491522
return FromCentilitersPerMinute(val);
523+
case FlowUnit.CubicDecimeterPerMinute:
524+
return FromCubicDecimetersPerMinute(val);
492525
case FlowUnit.CubicFootPerSecond:
493526
return FromCubicFeetPerSecond(val);
494527
case FlowUnit.CubicMeterPerHour:
@@ -534,6 +567,8 @@ public static Flow From(double val, FlowUnit fromUnit)
534567
{
535568
case FlowUnit.CentilitersPerMinute:
536569
return FromCentilitersPerMinute(value.Value);
570+
case FlowUnit.CubicDecimeterPerMinute:
571+
return FromCubicDecimetersPerMinute(value.Value);
537572
case FlowUnit.CubicFootPerSecond:
538573
return FromCubicFeetPerSecond(value.Value);
539574
case FlowUnit.CubicMeterPerHour:
@@ -712,6 +747,8 @@ public double As(FlowUnit unit)
712747
{
713748
case FlowUnit.CentilitersPerMinute:
714749
return CentilitersPerMinute;
750+
case FlowUnit.CubicDecimeterPerMinute:
751+
return CubicDecimetersPerMinute;
715752
case FlowUnit.CubicFootPerSecond:
716753
return CubicFeetPerSecond;
717754
case FlowUnit.CubicMeterPerHour:

UnitsNet/GeneratedCode/UnitSystem.Default.g.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,12 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
567567
{
568568
new AbbreviationsForCulture("en-US", "cLPM"),
569569
}),
570+
new CulturesForEnumValue((int) FlowUnit.CubicDecimeterPerMinute,
571+
new[]
572+
{
573+
new AbbreviationsForCulture("en-US", "dm³/min"),
574+
new AbbreviationsForCulture("ru-RU", "дм³/мин"),
575+
}),
570576
new CulturesForEnumValue((int) FlowUnit.CubicFootPerSecond,
571577
new[]
572578
{

UnitsNet/Scripts/UnitDefinitions/Flow.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
"PluralName": "LitersPerMinute",
6565
"FromUnitToBaseFunc": "x/60000.00000",
6666
"FromBaseToUnitFunc": "x*60000.00000",
67-
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo"],
67+
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ],
6868
"Localization": [
6969
{
7070
"Culture": "en-US",
7171
"Abbreviations": [ "LPM" ],
72-
"AbbreviationsWithPrefixes": ["nLPM", "μLPM", "mLPM", "cLPM", "dLPM", "kLPM"]
72+
"AbbreviationsWithPrefixes": [ "nLPM", "μLPM", "mLPM", "cLPM", "dLPM", "kLPM" ]
7373
}
7474
]
7575
},
@@ -84,6 +84,22 @@
8484
"Abbreviations": [ "GPM" ]
8585
}
8686
]
87+
},
88+
{
89+
"SingularName": "CubicDecimeterPerMinute",
90+
"PluralName": "CubicDecimetersPerMinute",
91+
"FromUnitToBaseFunc": "x/60000.00000",
92+
"FromBaseToUnitFunc": "x*60000.00000",
93+
"Localization": [
94+
{
95+
"Culture": "en-US",
96+
"Abbreviations": [ "dm³/min" ]
97+
},
98+
{
99+
"Culture": "ru-RU",
100+
"Abbreviations": [ "дм³/мин" ]
101+
}
102+
]
87103
}
88104
]
89105
}

0 commit comments

Comments
 (0)