Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Common/UnitDefinitions/Energy.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@
{
"SingularName": "ThermEc",
"PluralName": "ThermsEc",
"XmlDocSummary": "The therm (symbol, thm) is a non-SI unit of heat energy equal to 100,000 British thermal units (BTU), and approximately 105 megajoules, 29.3 kilowatt-hours, 25,200 kilocalories and 25.2 thermies. One therm is the energy content of approximately 100 cubic feet (2.83 cubic metres) of natural gas at standard temperature and pressure. However, the BTU is not standardised worldwide, with slightly different values in the EU, UK, and United States, meaning that the energy content of the therm also varies by territory.",
"XmlDocRemarks": "https://en.wikipedia.org/wiki/Therm",
"FromUnitToBaseFunc": "{x} * 1.05505585262e8",
"FromBaseToUnitFunc": "{x} / 1.05505585262e8",
"XmlDocSummary": "The EC therm (symbol, thm) is a non-SI unit of heat energy, defined in the European Community as 100,000 ISO British thermal units, exactly 105,506,000 joules (NIST SP 811). One therm is the energy content of approximately 100 cubic feet (2.83 cubic metres) of natural gas at standard temperature and pressure. The US and UK therms differ slightly, because the BTU is not standardised worldwide.",
"XmlDocRemarks": "https://www.nist.gov/pml/special-publication-811/nist-guide-si-appendix-b-conversion-factors/nist-guide-si-appendix-b8",
"FromUnitToBaseFunc": "{x} * 1.05506e8",
"FromBaseToUnitFunc": "{x} / 1.05506e8",
"Prefixes": [ "Deca" ],
"Localization": [
{
Expand Down
6 changes: 4 additions & 2 deletions Common/UnitDefinitions/LeakRate.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@
{
"SingularName": "TorrLiterPerSecond",
"PluralName": "TorrLitersPerSecond",
"FromUnitToBaseFunc": "{x} / 7.5",
"FromBaseToUnitFunc": "{x} * 7.5",
"XmlDocSummary": "A leak rate of one liter per second at a pressure of one torr. The torr is exactly 101325/760 pascals (1/760 of a standard atmosphere), so one torr liter per second is about 0.1333224 Pa·m³/s.",
"XmlDocRemarks": "https://www.nist.gov/pml/special-publication-811/nist-guide-si-appendix-b-conversion-factors/nist-guide-si-appendix-b8",
"FromUnitToBaseFunc": "{x} * 101325 / 760 / 1e3",
"FromBaseToUnitFunc": "{x} * 760 / 101325 * 1e3",
"Localization": [
{
"Culture": "en-US",
Expand Down
8 changes: 4 additions & 4 deletions Common/UnitDefinitions/Mass.json
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,10 @@
"BaseUnits": {
"M": "SolarMass"
},
"XmlDocSummary": "Solar mass is a ratio unit to the mass of the solar system star, the sun.",
"XmlDocSummary": "Solar mass is a ratio unit to the mass of the solar system star, the sun. This unit uses 1.98847×10^30 kg, within the uncertainty of the best estimate of (1.988475 ± 0.000092)×10^30 kg. The IAU defines only a nominal solar mass parameter (GM), so a nominal mass in kilograms depends on the measured gravitational constant.",
"XmlDocRemarks": "https://en.wikipedia.org/wiki/Solar_mass",
"FromUnitToBaseFunc": "{x} * 1.98947e30",
"FromBaseToUnitFunc": "{x} / 1.98947e30",
"FromUnitToBaseFunc": "{x} * 1.98847e30",
"FromBaseToUnitFunc": "{x} / 1.98847e30",
"Localization": [
{
"Culture": "en-US",
Expand Down Expand Up @@ -289,6 +289,6 @@
"Abbreviations": [ "Da", "u" ]
}
]
},
}
]
}
8 changes: 4 additions & 4 deletions Common/UnitDefinitions/Power.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@
{
"SingularName": "BoilerHorsepower",
"PluralName": "BoilerHorsepower",
"XmlDocSummary": "Boiler horsepower is a boiler's capacity to deliver steam to a steam engine and is not the same unit of power as the 550 ft lb/s definition. One boiler horsepower is equal to the thermal energy rate required to evaporate 34.5 pounds (15.6 kg) of fresh water at 212 °F (100 °C) in one hour.",
"XmlDocRemarks": "https://en.wikipedia.org/wiki/Horsepower#Boiler_horsepower",
"FromUnitToBaseFunc": "{x} * 9812.5",
"FromBaseToUnitFunc": "{x} / 9812.5",
"XmlDocSummary": "Boiler horsepower is a boiler's capacity to deliver steam to a steam engine and is not the same unit of power as the 550 ft lb/s definition. One boiler horsepower is equal to the thermal energy rate required to evaporate 34.5 pounds (15.6 kg) of fresh water at 212 °F (100 °C) in one hour. This unit uses 9809.5 W, the value given by NIST SP 811 for the 1884 ASME definition of about 33,469.5 BTU/h. Current industrial practice instead uses 33,475 BTU/h, about 9811 W.",
"XmlDocRemarks": "https://www.nist.gov/pml/special-publication-811/nist-guide-si-appendix-b-conversion-factors/nist-guide-si-appendix-b8",
"FromUnitToBaseFunc": "{x} * 9809.5",
"FromBaseToUnitFunc": "{x} / 9809.5",
"Localization": [
{
"Culture": "en-US",
Expand Down
6 changes: 4 additions & 2 deletions Common/UnitDefinitions/Temperature.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,13 @@
{
"SingularName": "SolarTemperature",
"PluralName": "SolarTemperatures",
"XmlDocSummary": "The nominal solar effective temperature of 5772 K, adopted by IAU 2015 Resolution B3 as a conversion constant for expressing stellar temperatures.",
"XmlDocRemarks": "https://arxiv.org/abs/1510.07674",
"BaseUnits": {
"Θ": "SolarTemperature"
},
"FromUnitToBaseFunc": "{x} * 5778",
"FromBaseToUnitFunc": "{x} / 5778",
"FromUnitToBaseFunc": "{x} * 5772",
"FromBaseToUnitFunc": "{x} / 5772",
"Localization": [
{
"Culture": "en-US",
Expand Down
2 changes: 1 addition & 1 deletion UnitsNet.Tests/CustomCode/EnergyTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class EnergyTests : EnergyTestsBase

protected override double TerawattDaysInOneJoule => 1.157407407407410E-17;

protected override double ThermsEcInOneJoule => 9.4781712031331720001278504447561e-9;
protected override double ThermsEcInOneJoule => 9.47813394498891058328436297462e-9;

protected override double FootPoundsInOneJoule => 0.737562149;

Expand Down
2 changes: 1 addition & 1 deletion UnitsNet.Tests/CustomCode/LeakRateTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class LeakRateTests : LeakRateTestsBase

protected override double MillibarLitersPerSecondInOnePascalCubicMeterPerSecond => 10;

protected override double TorrLitersPerSecondInOnePascalCubicMeterPerSecond => 7.5;
protected override double TorrLitersPerSecondInOnePascalCubicMeterPerSecond => 7.50061682704169750801875154207;

}
}
2 changes: 1 addition & 1 deletion UnitsNet.Tests/CustomCode/MassTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class MassTests : MassTestsBase

protected override double EarthMassesInOneKilogram => 1.6744248350691500000000000E-25;

protected override double SolarMassesInOneKilogram => 5.0264643347223100000000000E-31;
protected override double SolarMassesInOneKilogram => 5.02899213968528567189849482265E-31;

protected override double FemtogramsInOneKilogram => 1E18;

Expand Down
2 changes: 1 addition & 1 deletion UnitsNet.Tests/CustomCode/PowerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class PowerTests : PowerTestsBase

protected override double KilobritishThermalUnitsPerHourInOneWatt => 3.412141633e-3;

protected override double BoilerHorsepowerInOneWatt => 1.0191082802547770700636942675159e-4;
protected override double BoilerHorsepowerInOneWatt => 1.01941995004842244762730006626e-4;

protected override double MegabritishThermalUnitsPerHourInOneWatt => 3.412141633e-6;

Expand Down
2 changes: 1 addition & 1 deletion UnitsNet.Tests/CustomCode/TemperatureTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class TemperatureTests : TemperatureTestsBase

protected override double MillidegreesCelsiusInOneKelvin => -272150;

protected override double SolarTemperaturesInOneKelvin => 1.73070266528210E-04;
protected override double SolarTemperaturesInOneKelvin => 1.73250173250173250173250173250E-04;

[Fact]
public void AllBaseQuantityUnitsAreBaseUnits()
Expand Down
4 changes: 2 additions & 2 deletions UnitsNet/GeneratedCode/Quantities/Energy.g.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UnitsNet/GeneratedCode/Quantities/LeakRate.g.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UnitsNet/GeneratedCode/Quantities/Mass.g.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UnitsNet/GeneratedCode/Quantities/Power.g.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UnitsNet/GeneratedCode/Quantities/Temperature.g.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions UnitsNet/GeneratedCode/Units/EnergyUnit.g.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions UnitsNet/GeneratedCode/Units/LeakRateUnit.g.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UnitsNet/GeneratedCode/Units/MassUnit.g.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions UnitsNet/GeneratedCode/Units/PowerUnit.g.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions UnitsNet/GeneratedCode/Units/TemperatureUnit.g.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading