Skip to content

Commit 3423591

Browse files
authored
Add units PetaJoule, TeraJoule (#1143)
1 parent a15ce52 commit 3423591

File tree

12 files changed

+234
-26
lines changed

12 files changed

+234
-26
lines changed

Common/UnitDefinitions/Energy.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"FromUnitToBaseFunc": "{x}",
2020
"FromBaseToUnitFunc": "{x}",
21-
"Prefixes": [ "Milli", "Kilo", "Mega", "Giga" ],
21+
"Prefixes": [ "Milli", "Kilo", "Mega", "Giga", "Tera", "Peta" ],
2222
"Localization": [
2323
{
2424
"Culture": "en-US",

Common/UnitEnumValues.g.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,9 @@
406406
"ThermImperial": 33,
407407
"ThermUs": 34,
408408
"WattDay": 35,
409-
"WattHour": 36
409+
"WattHour": 36,
410+
"Petajoule": 43,
411+
"Terajoule": 37
410412
},
411413
"Entropy": {
412414
"CaloriePerKelvin": 1,

UnitsNet.NanoFramework/GeneratedCode/Quantities/Energy.g.cs

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

UnitsNet.NanoFramework/GeneratedCode/Units/EnergyUnit.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.

UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToEnergyExtensionsTest.g.cs

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

UnitsNet.NumberExtensions/GeneratedCode/NumberToEnergyExtensions.g.cs

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

UnitsNet.Tests/CustomCode/EnergyTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ public class EnergyTests : EnergyTestsBase
2424

2525
protected override double MegajoulesInOneJoule => 1E-6;
2626

27+
protected override double TerajoulesInOneJoule => 1E-12;
28+
29+
protected override double PetajoulesInOneJoule => 1E-15;
30+
2731
protected override double BritishThermalUnitsInOneJoule => 0.00094781712;
2832

2933
protected override double CaloriesInOneJoule => 0.239005736;

0 commit comments

Comments
 (0)