diff --git a/Common/UnitDefinitions/HeatFlux.json b/Common/UnitDefinitions/HeatFlux.json index d889bcf48a..afd86a10d1 100644 --- a/Common/UnitDefinitions/HeatFlux.json +++ b/Common/UnitDefinitions/HeatFlux.json @@ -27,8 +27,8 @@ { "SingularName": "WattPerSquareInch", "PluralName": "WattsPerSquareInch", - "FromUnitToBaseFunc": "{x} * 1.5500031e3", - "FromBaseToUnitFunc": "{x} / 1.5500031e3", + "FromUnitToBaseFunc": "{x} / (2.54e-2 * 2.54e-2)", + "FromBaseToUnitFunc": "{x} * (2.54e-2 * 2.54e-2)", "Localization": [ { "Culture": "en-US", @@ -39,8 +39,8 @@ { "SingularName": "WattPerSquareFoot", "PluralName": "WattsPerSquareFoot", - "FromUnitToBaseFunc": "{x} * 1.07639e1", - "FromBaseToUnitFunc": "{x} / 1.07639e1", + "FromUnitToBaseFunc": "{x} / (0.3048 * 0.3048)", + "FromBaseToUnitFunc": "{x} * (0.3048 * 0.3048)", "Localization": [ { "Culture": "en-US", @@ -51,8 +51,8 @@ { "SingularName": "BtuPerSecondSquareInch", "PluralName": "BtusPerSecondSquareInch", - "FromUnitToBaseFunc": "{x} * 1.63533984e6", - "FromBaseToUnitFunc": "{x} / 1.63533984e6", + "FromUnitToBaseFunc": "{x} * 1055.05585262 / (2.54e-2 * 2.54e-2)", + "FromBaseToUnitFunc": "{x} * (2.54e-2 * 2.54e-2) / 1055.05585262", "Localization": [ { "Culture": "en-US", @@ -63,8 +63,8 @@ { "SingularName": "BtuPerSecondSquareFoot", "PluralName": "BtusPerSecondSquareFoot", - "FromUnitToBaseFunc": "{x} * 1.13565267e4", - "FromBaseToUnitFunc": "{x} / 1.13565267e4", + "FromUnitToBaseFunc": "{x} * 1055.05585262 / (0.3048 * 0.3048)", + "FromBaseToUnitFunc": "{x} * (0.3048 * 0.3048) / 1055.05585262", "Localization": [ { "Culture": "en-US", @@ -75,8 +75,8 @@ { "SingularName": "BtuPerMinuteSquareFoot", "PluralName": "BtusPerMinuteSquareFoot", - "FromUnitToBaseFunc": "{x} * 1.89275445e2", - "FromBaseToUnitFunc": "{x} / 1.89275445e2", + "FromUnitToBaseFunc": "{x} * 1055.05585262 / (0.3048 * 0.3048 * 60)", + "FromBaseToUnitFunc": "{x} * (0.3048 * 0.3048 * 60) / 1055.05585262", "Localization": [ { "Culture": "en-US", @@ -87,8 +87,8 @@ { "SingularName": "BtuPerHourSquareFoot", "PluralName": "BtusPerHourSquareFoot", - "FromUnitToBaseFunc": "{x} * 3.15459075", - "FromBaseToUnitFunc": "{x} / 3.15459075", + "FromUnitToBaseFunc": "{x} * 1055.05585262 / (0.3048 * 0.3048 * 3600)", + "FromBaseToUnitFunc": "{x} * (0.3048 * 0.3048 * 3600) / 1055.05585262", "Localization": [ { "Culture": "en-US", @@ -99,8 +99,8 @@ { "SingularName": "CaloriePerSecondSquareCentimeter", "PluralName": "CaloriesPerSecondSquareCentimeter", - "FromUnitToBaseFunc": "{x} * 4.1868e4", - "FromBaseToUnitFunc": "{x} / 4.1868e4", + "FromUnitToBaseFunc": "{x} * 4.184e4", + "FromBaseToUnitFunc": "{x} / 4.184e4", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -112,8 +112,8 @@ { "SingularName": "KilocaloriePerHourSquareMeter", "PluralName": "KilocaloriesPerHourSquareMeter", - "FromUnitToBaseFunc": "{x} * 1.163", - "FromBaseToUnitFunc": "{x} / 1.163", + "FromUnitToBaseFunc": "{x} * 4.184e3 / 3600", + "FromBaseToUnitFunc": "{x} * 3600 / 4.184e3", "Localization": [ { "Culture": "en-US", @@ -124,8 +124,8 @@ { "SingularName": "PoundForcePerFootSecond", "PluralName": "PoundsForcePerFootSecond", - "FromUnitToBaseFunc": "{x} * 1.459390293720636e1", - "FromBaseToUnitFunc": "{x} / 1.459390293720636e1", + "FromUnitToBaseFunc": "{x} * 1.3558179483314004 / 9.290304e-2", + "FromBaseToUnitFunc": "{x} * 9.290304e-2 / 1.3558179483314004", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/HeatTransferCoefficient.json b/Common/UnitDefinitions/HeatTransferCoefficient.json index 31ba31743e..f3108375f2 100644 --- a/Common/UnitDefinitions/HeatTransferCoefficient.json +++ b/Common/UnitDefinitions/HeatTransferCoefficient.json @@ -45,8 +45,8 @@ { "SingularName": "BtuPerHourSquareFootDegreeFahrenheit", "PluralName": "BtusPerHourSquareFootDegreeFahrenheit", - "FromUnitToBaseFunc": "{x} * 5.6782633411134878", - "FromBaseToUnitFunc": "{x} / 5.6782633411134878", + "FromUnitToBaseFunc": "{x} * ((1055.05585262 / (0.3048 * 0.3048 * 3600)) * 1.8)", + "FromBaseToUnitFunc": "{x} / ((1055.05585262 / (0.3048 * 0.3048 * 3600)) * 1.8)", "Localization": [ { "Culture": "en-US", @@ -58,8 +58,8 @@ "SingularName": "CaloriePerHourSquareMeterDegreeCelsius", "PluralName": "CaloriesPerHourSquareMeterDegreeCelsius", "Prefixes": [ "Kilo" ], - "FromUnitToBaseFunc": "({x} * 4.1868) / 3600", - "FromBaseToUnitFunc": "({x} / 4.1868) * 3600", + "FromUnitToBaseFunc": "({x} * 4.184) / 3600", + "FromBaseToUnitFunc": "({x} / 4.184) * 3600", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Impulse.json b/Common/UnitDefinitions/Impulse.json index ece5a03e74..81f64d8164 100644 --- a/Common/UnitDefinitions/Impulse.json +++ b/Common/UnitDefinitions/Impulse.json @@ -51,8 +51,8 @@ "M": "Pound", "T": "Second" }, - "FromUnitToBaseFunc": "{x} / 7.230657989877", - "FromBaseToUnitFunc": "{x} * 7.230657989877", + "FromUnitToBaseFunc": "{x} * (0.45359237 * 0.3048)", + "FromBaseToUnitFunc": "{x} / (0.45359237 * 0.3048)", "Localization": [ { "Culture": "en-US", @@ -63,8 +63,8 @@ { "SingularName": "PoundForceSecond", "PluralName": "PoundForceSeconds", - "FromUnitToBaseFunc": "{x} / 0.2248089430997", - "FromBaseToUnitFunc": "{x} * 0.2248089430997", + "FromUnitToBaseFunc": "{x} * 0.45359237 * 9.80665", + "FromBaseToUnitFunc": "{x} / 4.4482216152605", "Localization": [ { "Culture": "en-US", @@ -80,8 +80,8 @@ "M": "Slug", "T": "Second" }, - "FromUnitToBaseFunc": "{x} / 0.224735720691", - "FromBaseToUnitFunc": "{x} * 0.224735720691", + "FromUnitToBaseFunc": "{x} * (0.45359237 * 9.80665)", + "FromBaseToUnitFunc": "{x} / (0.45359237 * 9.80665)", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Luminosity.json b/Common/UnitDefinitions/Luminosity.json index 72b7be4a4d..149b53b773 100644 --- a/Common/UnitDefinitions/Luminosity.json +++ b/Common/UnitDefinitions/Luminosity.json @@ -30,9 +30,10 @@ { "SingularName": "SolarLuminosity", "PluralName": "SolarLuminosities", - "FromUnitToBaseFunc": "{x} * 3.846e26", - "FromBaseToUnitFunc": "{x} / 3.846e26", - "XmlDocRemarks": "https://www.britannica.com/science/luminosity", + "XmlDocSummary": "The IAU has defined a nominal solar luminosity of 3.828×10^26 W to promote publication of consistent and comparable values in units of the solar luminosity.", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Luminosity#Measurement", + "FromUnitToBaseFunc": "{x} * 3.828e26", + "FromBaseToUnitFunc": "{x} / 3.828e26", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Power.json b/Common/UnitDefinitions/Power.json index 507561b4cb..8fdfdd095b 100644 --- a/Common/UnitDefinitions/Power.json +++ b/Common/UnitDefinitions/Power.json @@ -29,8 +29,10 @@ { "SingularName": "MechanicalHorsepower", "PluralName": "MechanicalHorsepower", - "FromUnitToBaseFunc": "{x} * 745.69", - "FromBaseToUnitFunc": "{x} / 745.69", + "XmlDocSummary": "Assuming the third CGPM (1901, CR 70) definition of standard gravity, gn = 9.80665 m/s2, is used to define the pound-force as well as the kilogram force, and the international avoirdupois pound (1959), one imperial horsepower is: 76.0402249 × 9.80665 kg⋅m2/s3", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Horsepower#Imperial_horsepower", + "FromUnitToBaseFunc": "{x} * 76.0402249 * 9.80665", + "FromBaseToUnitFunc": "{x} / (76.0402249 * 9.80665)", "Localization": [ { "Culture": "en-US", @@ -41,6 +43,8 @@ { "SingularName": "MetricHorsepower", "PluralName": "MetricHorsepower", + "XmlDocSummary": "DIN 66036 defines one metric horsepower as the power to raise a mass of 75 kilograms against the Earth's gravitational force over a distance of one metre in one second:[18] 75 kg × 9.80665 m/s2 × 1 m / 1 s = 75 kgf⋅m/s = 1 PS. This is equivalent to 735.49875 W, or 98.6% of an imperial horsepower.", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Horsepower#Metric_horsepower_(PS,_KM,_cv,_hk,_pk,_k,_ks,_ch)", "FromUnitToBaseFunc": "{x} * 735.49875", "FromBaseToUnitFunc": "{x} / 735.49875", "Localization": [ @@ -53,6 +57,8 @@ { "SingularName": "ElectricalHorsepower", "PluralName": "ElectricalHorsepower", + "XmlDocSummary": "Nameplates on electrical motors show their power output, not the power input (the power delivered at the shaft, not the power consumed to drive the motor). This power output is ordinarily stated in watts or kilowatts. In the United States, the power output is stated in horsepower, which for this purpose is defined as exactly 746 W.", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Horsepower#Electrical_horsepower", "FromUnitToBaseFunc": "{x} * 746", "FromBaseToUnitFunc": "{x} / 746", "Localization": [ @@ -65,6 +71,8 @@ { "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", "Localization": [ @@ -77,6 +85,8 @@ { "SingularName": "HydraulicHorsepower", "PluralName": "HydraulicHorsepower", + "XmlDocSummary": "Hydraulic horsepower can represent the power available within hydraulic machinery, power through the down-hole nozzle of a drilling rig, or can be used to estimate the mechanical power needed to generate a known hydraulic flow rate.", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Horsepower#Hydraulic_horsepower", "FromUnitToBaseFunc": "{x} * 745.69988145", "FromBaseToUnitFunc": "{x} / 745.69988145", "Localization": [ @@ -89,8 +99,8 @@ { "SingularName": "BritishThermalUnitPerHour", "PluralName": "BritishThermalUnitsPerHour", - "FromUnitToBaseFunc": "{x} * 0.29307107017", - "FromBaseToUnitFunc": "{x} / 0.29307107017", + "FromUnitToBaseFunc": "{x} * 1055.05585262 / 3600", + "FromBaseToUnitFunc": "{x} * 3600 / 1055.05585262", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/Pressure.json b/Common/UnitDefinitions/Pressure.json index c5895550cb..e23f1a5ccc 100644 --- a/Common/UnitDefinitions/Pressure.json +++ b/Common/UnitDefinitions/Pressure.json @@ -33,6 +33,8 @@ { "SingularName": "Atmosphere", "PluralName": "Atmospheres", + "XmlDocSummary": "The standard atmosphere (symbol: atm) is a unit of pressure defined as 101325 Pa. It is sometimes used as a reference pressure or standard pressure. It is approximately equal to Earth's average atmospheric pressure at sea level.", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Standard_atmosphere_(unit)", "FromUnitToBaseFunc": "{x} * 1.01325 * 1e5", "FromBaseToUnitFunc": "{x} / (1.01325 * 1e5)", "Localization": [ @@ -49,6 +51,8 @@ { "SingularName": "Bar", "PluralName": "Bars", + "XmlDocSummary": "The bar is a metric unit of pressure defined as 100,000 Pa (100 kPa), though not part of the International System of Units (SI). A pressure of 1 bar is slightly less than the current average atmospheric pressure on Earth at sea level (approximately 1.013 bar).", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Bar_(unit)", "FromUnitToBaseFunc": "{x} * 1e5", "FromBaseToUnitFunc": "{x} / 1e5", "Prefixes": [ "Micro", "Milli", "Centi", "Deci", "Kilo", "Mega" ], @@ -66,8 +70,8 @@ { "SingularName": "KilogramForcePerSquareMeter", "PluralName": "KilogramsForcePerSquareMeter", - "FromUnitToBaseFunc": "{x} * 9.80665019960652", - "FromBaseToUnitFunc": "{x} * 0.101971619222242", + "FromUnitToBaseFunc": "{x} * 9.80665", + "FromBaseToUnitFunc": "{x} / 9.80665", "Localization": [ { "Culture": "en-US", @@ -82,6 +86,8 @@ { "SingularName": "KilogramForcePerSquareCentimeter", "PluralName": "KilogramsForcePerSquareCentimeter", + "XmlDocSummary": "A kilogram-force per centimetre square (kgf/cm2), often just kilogram per square centimetre (kg/cm2), or kilopond per centimetre square (kp/cm2) is a deprecated unit of pressure using metric units. It is not a part of the International System of Units (SI), the modern metric system. 1 kgf/cm2 equals 98.0665 kPa (kilopascals). It is also known as a technical atmosphere (symbol: at).", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Kilogram-force_per_square_centimetre", "FromUnitToBaseFunc": "{x} * 9.80665e4", "FromBaseToUnitFunc": "{x} / 9.80665e4", "Localization": [ @@ -170,8 +176,10 @@ { "SingularName": "TechnicalAtmosphere", "PluralName": "TechnicalAtmospheres", - "FromUnitToBaseFunc": "{x} * 9.80680592331 * 1e4", - "FromBaseToUnitFunc": "{x} / (9.80680592331 * 1e4)", + "XmlDocSummary": "A kilogram-force per centimetre square (kgf/cm2), often just kilogram per square centimetre (kg/cm2), or kilopond per centimetre square (kp/cm2) is a deprecated unit of pressure using metric units. It is not a part of the International System of Units (SI), the modern metric system. 1 kgf/cm2 equals 98.0665 kPa (kilopascals). It is also known as a technical atmosphere (symbol: at).", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Kilogram-force_per_square_centimetre", + "FromUnitToBaseFunc": "{x} * 9.80665e4", + "FromBaseToUnitFunc": "{x} / 9.80665e4", "Localization": [ { "Culture": "en-US", @@ -186,8 +194,10 @@ { "SingularName": "Torr", "PluralName": "Torrs", - "FromUnitToBaseFunc": "{x} * 1.3332266752 * 1e2", - "FromBaseToUnitFunc": "{x} / (1.3332266752 * 1e2)", + "XmlDocSummary": "The torr (symbol: Torr) is a unit of pressure based on an absolute scale, defined as exactly 1/760 of a standard atmosphere (101325 Pa). Thus one torr is exactly 101325/760 pascals (≈ 133.32 Pa).", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Torr", + "FromUnitToBaseFunc": "{x} * 101325 / 760", + "FromBaseToUnitFunc": "{x} * 760 / 101325", "Localization": [ { "Culture": "en-US", @@ -202,8 +212,8 @@ { "SingularName": "PoundForcePerSquareInch", "PluralName": "PoundsForcePerSquareInch", - "FromUnitToBaseFunc": "{x} * 6.894757293168361e3", - "FromBaseToUnitFunc": "{x} / 6.894757293168361e3", + "FromUnitToBaseFunc": "{x} * 4.4482216152605 / 0.00064516", + "FromBaseToUnitFunc": "{x} * 0.00064516 / 4.4482216152605", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -221,8 +231,8 @@ { "SingularName": "PoundForcePerSquareMil", "PluralName": "PoundsForcePerSquareMil", - "FromUnitToBaseFunc": "{x} * 6.894757293168361e9", - "FromBaseToUnitFunc": "{x} / 6.894757293168361e9", + "FromUnitToBaseFunc": "{x} * 4.4482216152605 / (2.54e-5 * 2.54e-5)", + "FromBaseToUnitFunc": "{x} * (2.54e-5 * 2.54e-5) / 4.4482216152605", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -235,8 +245,8 @@ { "SingularName": "PoundForcePerSquareFoot", "PluralName": "PoundsForcePerSquareFoot", - "FromUnitToBaseFunc": "{x} * 4.788025898033584e1", - "FromBaseToUnitFunc": "{x} / 4.788025898033584e1", + "FromUnitToBaseFunc": "{x} * 4.4482216152605 / 9.290304e-2", + "FromBaseToUnitFunc": "{x} * 9.290304e-2 / 4.4482216152605", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -274,7 +284,7 @@ "SingularName": "MeterOfHead", "PluralName": "MetersOfHead", "FromUnitToBaseFunc": "{x} * 9804.139432", - "FromBaseToUnitFunc": "{x} * 0.0001019977334", + "FromBaseToUnitFunc": "{x} / 9804.139432", "Localization": [ { "Culture": "en-US", @@ -297,8 +307,8 @@ { "SingularName": "FootOfHead", "PluralName": "FeetOfHead", - "FromUnitToBaseFunc": "{x} * 2989.0669", - "FromBaseToUnitFunc": "{x} * 0.000334552565551", + "FromUnitToBaseFunc": "{x} * 9804.139432 * 0.3048", + "FromBaseToUnitFunc": "{x} / (9804.139432 * 0.3048)", "Localization": [ { "Culture": "en-US", @@ -309,8 +319,10 @@ { "SingularName": "MillimeterOfMercury", "PluralName": "MillimetersOfMercury", - "FromUnitToBaseFunc": "{x} / 7.50061561302643e-3", - "FromBaseToUnitFunc": "{x} * 7.50061561302643e-3", + "XmlDocSummary": "A millimetre of mercury is a manometric unit of pressure, formerly defined as the extra pressure generated by a column of mercury one millimetre high, and currently defined as exactly 133.322387415 pascals.", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Millimetre_of_mercury", + "FromUnitToBaseFunc": "{x} * 133.322387415", + "FromBaseToUnitFunc": "{x} / 133.322387415", "Localization": [ { "Culture": "en-US", @@ -325,8 +337,10 @@ { "SingularName": "InchOfMercury", "PluralName": "InchesOfMercury", - "FromUnitToBaseFunc": "{x} / 2.95299830714159e-4", - "FromBaseToUnitFunc": "{x} * 2.95299830714159e-4", + "XmlDocSummary": "Inch of mercury (inHg and ″Hg) is a non-SI unit of measurement for pressure. It is used for barometric pressure in weather reports, refrigeration and aviation in the United States. It is the pressure exerted by a column of mercury 1 inch (25.4 mm) in height at the standard acceleration of gravity.", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Inch_of_mercury", + "FromUnitToBaseFunc": "{x} * 2.54e1 * 133.322387415", + "FromBaseToUnitFunc": "{x} / (2.54e1 * 133.322387415)", "Localization": [ { "Culture": "en-US", @@ -349,8 +363,8 @@ { "SingularName": "PoundPerInchSecondSquared", "PluralName": "PoundsPerInchSecondSquared", - "FromUnitToBaseFunc": "{x} * 1.785796732283465e1", - "FromBaseToUnitFunc": "{x} / 1.785796732283465e1", + "FromUnitToBaseFunc": "{x} * (4.4482216152605 / 0.00064516) / 386.0886", + "FromBaseToUnitFunc": "{x} * 386.0886 / (4.4482216152605 / 0.00064516)", "Localization": [ { "Culture": "en-US", @@ -361,8 +375,10 @@ { "SingularName": "MeterOfWaterColumn", "PluralName": "MetersOfWaterColumn", - "FromUnitToBaseFunc": "{x} * 9.806650000000272e3", - "FromBaseToUnitFunc": "{x} / 9.806650000000272e3", + "XmlDocSummary": "A centimetre of water is defined as the pressure exerted by a column of water of 1 cm in height at 4 °C (temperature of maximum density) at the standard acceleration of gravity, so that 1 cmH2O (4°C) = 999.9720 kg/m3 × 9.80665 m/s2 × 1 cm = 98.063754138 Pa, but conventionally a nominal maximum water density of 1000 kg/m3 is used, giving 98.0665 Pa.", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Centimetre_or_millimetre_of_water", + "FromUnitToBaseFunc": "{x} * 9.80665e3", + "FromBaseToUnitFunc": "{x} / 9.80665e3", "Prefixes": [ "Milli", "Centi" ], "Localization": [ { @@ -374,8 +390,10 @@ { "SingularName": "InchOfWaterColumn", "PluralName": "InchesOfWaterColumn", - "FromUnitToBaseFunc": "{x} * 249.08890833333", - "FromBaseToUnitFunc": "{x} / 249.08890833333", + "XmlDocSummary": "Inches of water is a non-SI unit for pressure. It is defined as the pressure exerted by a column of water of 1 inch in height at defined conditions. At a temperature of 4 °C (39.2 °F) pure water has its highest density (1000 kg/m3). At that temperature and assuming the standard acceleration of gravity, 1 inAq is approximately 249.082 pascals (0.0361263 psi).", + "XmlDocRemarks": "https://en.wikipedia.org/wiki/Inch_of_water", + "FromUnitToBaseFunc": "{x} * 2.54e-2 * 9.80665e3", + "FromBaseToUnitFunc": "{x} / (2.54e-2 * 9.80665e3)", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/SpecificFuelConsumption.json b/Common/UnitDefinitions/SpecificFuelConsumption.json index b1b05e5318..d4c0b7c50c 100644 --- a/Common/UnitDefinitions/SpecificFuelConsumption.json +++ b/Common/UnitDefinitions/SpecificFuelConsumption.json @@ -11,8 +11,8 @@ { "SingularName": "PoundMassPerPoundForceHour", "PluralName": "PoundsMassPerPoundForceHour", - "FromUnitToBaseFunc": "{x} * 28.33", - "FromBaseToUnitFunc": "{x} / 28.33", + "FromUnitToBaseFunc": "{x} * 453.59237 / (0.0044482216152605 * 3600)", + "FromBaseToUnitFunc": "{x} * (0.0044482216152605 * 3600) / 453.59237", "Localization": [ { "Culture": "en-US", @@ -23,8 +23,8 @@ { "SingularName": "KilogramPerKilogramForceHour", "PluralName": "KilogramsPerKilogramForceHour", - "FromUnitToBaseFunc": "{x} * 28.33", - "FromBaseToUnitFunc": "{x} / 28.33", + "FromUnitToBaseFunc": "{x} * 453.59237 / (0.0044482216152605 * 3600)", + "FromBaseToUnitFunc": "{x} * (0.0044482216152605 * 3600) / 453.59237", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ThermalInsulance.json b/Common/UnitDefinitions/ThermalInsulance.json index a2f9f424ba..7e9ae0a217 100644 --- a/Common/UnitDefinitions/ThermalInsulance.json +++ b/Common/UnitDefinitions/ThermalInsulance.json @@ -69,8 +69,8 @@ { "SingularName": "SquareCentimeterHourDegreeCelsiusPerKilocalorie", "PluralName": "SquareCentimeterHourDegreesCelsiusPerKilocalorie", - "FromUnitToBaseFunc": "{x} * 0.0859779507590433", - "FromBaseToUnitFunc": "{x} / 0.0859779507590433", + "FromUnitToBaseFunc": "{x} * (0.0001 * 3600) / 4.184", + "FromBaseToUnitFunc": "{x} * 4.184 / (0.0001 * 3600)", "Localization": [ { "Culture": "en-US", @@ -81,8 +81,8 @@ { "SingularName": "HourSquareFeetDegreeFahrenheitPerBtu", "PluralName": "HourSquareFeetDegreesFahrenheitPerBtu", - "FromUnitToBaseFunc": "{x} * 176.1121482159839", - "FromBaseToUnitFunc": "{x} / 176.1121482159839", + "FromUnitToBaseFunc": "{x} * (1000 * 0.3048 * 0.3048 * 3600) / (1055.05585262 * 1.8)", + "FromBaseToUnitFunc": "{x} * (1055.05585262 * 1.8) / (1000 * 0.3048 * 0.3048 * 3600)", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/VolumetricHeatCapacity.json b/Common/UnitDefinitions/VolumetricHeatCapacity.json index 80dde6906b..8a6ef745bf 100644 --- a/Common/UnitDefinitions/VolumetricHeatCapacity.json +++ b/Common/UnitDefinitions/VolumetricHeatCapacity.json @@ -51,8 +51,8 @@ { "SingularName": "CaloriePerCubicCentimeterDegreeCelsius", "PluralName": "CaloriesPerCubicCentimeterDegreeCelsius", - "FromUnitToBaseFunc": "{x} / 2.388459e-7", - "FromBaseToUnitFunc": "{x} * 2.388459e-7", + "FromUnitToBaseFunc": "{x} * 4.184e6", + "FromBaseToUnitFunc": "{x} / 4.184e6", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -64,8 +64,8 @@ { "SingularName": "BtuPerCubicFootDegreeFahrenheit", "PluralName": "BtusPerCubicFootDegreeFahrenheit", - "FromUnitToBaseFunc": "{x} / 1.4910660e-5", - "FromBaseToUnitFunc": "{x} * 1.4910660e-5", + "FromUnitToBaseFunc": "{x} * (1055.05585262 / 0.028316846592) * 1.8", + "FromBaseToUnitFunc": "{x} / ((1055.05585262 / 0.028316846592) * 1.8)", "Localization": [ { "Culture": "en-US", diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/HeatFlux.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/HeatFlux.g.cs index b9c47e4b08..74bfb1a8e3 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Quantities/HeatFlux.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Quantities/HeatFlux.g.cs @@ -302,23 +302,23 @@ private double GetValueInBaseUnit() { return Unit switch { - HeatFluxUnit.BtuPerHourSquareFoot => _value * 3.15459075, - HeatFluxUnit.BtuPerMinuteSquareFoot => _value * 1.89275445e2, - HeatFluxUnit.BtuPerSecondSquareFoot => _value * 1.13565267e4, - HeatFluxUnit.BtuPerSecondSquareInch => _value * 1.63533984e6, - HeatFluxUnit.CaloriePerSecondSquareCentimeter => _value * 4.1868e4, + HeatFluxUnit.BtuPerHourSquareFoot => _value * 1055.05585262 / (0.3048 * 0.3048 * 3600), + HeatFluxUnit.BtuPerMinuteSquareFoot => _value * 1055.05585262 / (0.3048 * 0.3048 * 60), + HeatFluxUnit.BtuPerSecondSquareFoot => _value * 1055.05585262 / (0.3048 * 0.3048), + HeatFluxUnit.BtuPerSecondSquareInch => _value * 1055.05585262 / (2.54e-2 * 2.54e-2), + HeatFluxUnit.CaloriePerSecondSquareCentimeter => _value * 4.184e4, HeatFluxUnit.CentiwattPerSquareMeter => (_value) * 1e-2d, HeatFluxUnit.DeciwattPerSquareMeter => (_value) * 1e-1d, - HeatFluxUnit.KilocaloriePerHourSquareMeter => _value * 1.163, - HeatFluxUnit.KilocaloriePerSecondSquareCentimeter => (_value * 4.1868e4) * 1e3d, + HeatFluxUnit.KilocaloriePerHourSquareMeter => _value * 4.184e3 / 3600, + HeatFluxUnit.KilocaloriePerSecondSquareCentimeter => (_value * 4.184e4) * 1e3d, HeatFluxUnit.KilowattPerSquareMeter => (_value) * 1e3d, HeatFluxUnit.MicrowattPerSquareMeter => (_value) * 1e-6d, HeatFluxUnit.MilliwattPerSquareMeter => (_value) * 1e-3d, HeatFluxUnit.NanowattPerSquareMeter => (_value) * 1e-9d, - HeatFluxUnit.PoundForcePerFootSecond => _value * 1.459390293720636e1, + HeatFluxUnit.PoundForcePerFootSecond => _value * 1.3558179483314004 / 9.290304e-2, HeatFluxUnit.PoundPerSecondCubed => _value * 4.5359237e-1, - HeatFluxUnit.WattPerSquareFoot => _value * 1.07639e1, - HeatFluxUnit.WattPerSquareInch => _value * 1.5500031e3, + HeatFluxUnit.WattPerSquareFoot => _value / (0.3048 * 0.3048), + HeatFluxUnit.WattPerSquareInch => _value / (2.54e-2 * 2.54e-2), HeatFluxUnit.WattPerSquareMeter => _value, _ => throw new NotImplementedException($"Can not convert {Unit} to base units.") }; @@ -333,23 +333,23 @@ private double GetValueAs(HeatFluxUnit unit) return unit switch { - HeatFluxUnit.BtuPerHourSquareFoot => baseUnitValue / 3.15459075, - HeatFluxUnit.BtuPerMinuteSquareFoot => baseUnitValue / 1.89275445e2, - HeatFluxUnit.BtuPerSecondSquareFoot => baseUnitValue / 1.13565267e4, - HeatFluxUnit.BtuPerSecondSquareInch => baseUnitValue / 1.63533984e6, - HeatFluxUnit.CaloriePerSecondSquareCentimeter => baseUnitValue / 4.1868e4, + HeatFluxUnit.BtuPerHourSquareFoot => baseUnitValue * (0.3048 * 0.3048 * 3600) / 1055.05585262, + HeatFluxUnit.BtuPerMinuteSquareFoot => baseUnitValue * (0.3048 * 0.3048 * 60) / 1055.05585262, + HeatFluxUnit.BtuPerSecondSquareFoot => baseUnitValue * (0.3048 * 0.3048) / 1055.05585262, + HeatFluxUnit.BtuPerSecondSquareInch => baseUnitValue * (2.54e-2 * 2.54e-2) / 1055.05585262, + HeatFluxUnit.CaloriePerSecondSquareCentimeter => baseUnitValue / 4.184e4, HeatFluxUnit.CentiwattPerSquareMeter => (baseUnitValue) / 1e-2d, HeatFluxUnit.DeciwattPerSquareMeter => (baseUnitValue) / 1e-1d, - HeatFluxUnit.KilocaloriePerHourSquareMeter => baseUnitValue / 1.163, - HeatFluxUnit.KilocaloriePerSecondSquareCentimeter => (baseUnitValue / 4.1868e4) / 1e3d, + HeatFluxUnit.KilocaloriePerHourSquareMeter => baseUnitValue * 3600 / 4.184e3, + HeatFluxUnit.KilocaloriePerSecondSquareCentimeter => (baseUnitValue / 4.184e4) / 1e3d, HeatFluxUnit.KilowattPerSquareMeter => (baseUnitValue) / 1e3d, HeatFluxUnit.MicrowattPerSquareMeter => (baseUnitValue) / 1e-6d, HeatFluxUnit.MilliwattPerSquareMeter => (baseUnitValue) / 1e-3d, HeatFluxUnit.NanowattPerSquareMeter => (baseUnitValue) / 1e-9d, - HeatFluxUnit.PoundForcePerFootSecond => baseUnitValue / 1.459390293720636e1, + HeatFluxUnit.PoundForcePerFootSecond => baseUnitValue * 9.290304e-2 / 1.3558179483314004, HeatFluxUnit.PoundPerSecondCubed => baseUnitValue / 4.5359237e-1, - HeatFluxUnit.WattPerSquareFoot => baseUnitValue / 1.07639e1, - HeatFluxUnit.WattPerSquareInch => baseUnitValue / 1.5500031e3, + HeatFluxUnit.WattPerSquareFoot => baseUnitValue * (0.3048 * 0.3048), + HeatFluxUnit.WattPerSquareInch => baseUnitValue * (2.54e-2 * 2.54e-2), HeatFluxUnit.WattPerSquareMeter => baseUnitValue, _ => throw new NotImplementedException($"Can not convert {Unit} to {unit}.") }; diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs index 6cf7d5450a..2cc3802373 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs @@ -172,9 +172,9 @@ private double GetValueInBaseUnit() { return Unit switch { - HeatTransferCoefficientUnit.BtuPerHourSquareFootDegreeFahrenheit => _value * 5.6782633411134878, - HeatTransferCoefficientUnit.CaloriePerHourSquareMeterDegreeCelsius => (_value * 4.1868) / 3600, - HeatTransferCoefficientUnit.KilocaloriePerHourSquareMeterDegreeCelsius => ((_value * 4.1868) / 3600) * 1e3d, + HeatTransferCoefficientUnit.BtuPerHourSquareFootDegreeFahrenheit => _value * ((1055.05585262 / (0.3048 * 0.3048 * 3600)) * 1.8), + HeatTransferCoefficientUnit.CaloriePerHourSquareMeterDegreeCelsius => (_value * 4.184) / 3600, + HeatTransferCoefficientUnit.KilocaloriePerHourSquareMeterDegreeCelsius => ((_value * 4.184) / 3600) * 1e3d, HeatTransferCoefficientUnit.WattPerSquareMeterCelsius => _value, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin => _value, _ => throw new NotImplementedException($"Can not convert {Unit} to base units.") @@ -190,9 +190,9 @@ private double GetValueAs(HeatTransferCoefficientUnit unit) return unit switch { - HeatTransferCoefficientUnit.BtuPerHourSquareFootDegreeFahrenheit => baseUnitValue / 5.6782633411134878, - HeatTransferCoefficientUnit.CaloriePerHourSquareMeterDegreeCelsius => (baseUnitValue / 4.1868) * 3600, - HeatTransferCoefficientUnit.KilocaloriePerHourSquareMeterDegreeCelsius => ((baseUnitValue / 4.1868) * 3600) / 1e3d, + HeatTransferCoefficientUnit.BtuPerHourSquareFootDegreeFahrenheit => baseUnitValue / ((1055.05585262 / (0.3048 * 0.3048 * 3600)) * 1.8), + HeatTransferCoefficientUnit.CaloriePerHourSquareMeterDegreeCelsius => (baseUnitValue / 4.184) * 3600, + HeatTransferCoefficientUnit.KilocaloriePerHourSquareMeterDegreeCelsius => ((baseUnitValue / 4.184) * 3600) / 1e3d, HeatTransferCoefficientUnit.WattPerSquareMeterCelsius => baseUnitValue, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin => baseUnitValue, _ => throw new NotImplementedException($"Can not convert {Unit} to {unit}.") diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/Impulse.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/Impulse.g.cs index a10256838b..85d5906186 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Quantities/Impulse.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Quantities/Impulse.g.cs @@ -262,9 +262,9 @@ private double GetValueInBaseUnit() ImpulseUnit.MillinewtonSecond => (_value) * 1e-3d, ImpulseUnit.NanonewtonSecond => (_value) * 1e-9d, ImpulseUnit.NewtonSecond => _value, - ImpulseUnit.PoundFootPerSecond => _value / 7.230657989877, - ImpulseUnit.PoundForceSecond => _value / 0.2248089430997, - ImpulseUnit.SlugFootPerSecond => _value / 0.224735720691, + ImpulseUnit.PoundFootPerSecond => _value * (0.45359237 * 0.3048), + ImpulseUnit.PoundForceSecond => _value * 0.45359237 * 9.80665, + ImpulseUnit.SlugFootPerSecond => _value * (0.45359237 * 9.80665), _ => throw new NotImplementedException($"Can not convert {Unit} to base units.") }; } @@ -288,9 +288,9 @@ private double GetValueAs(ImpulseUnit unit) ImpulseUnit.MillinewtonSecond => (baseUnitValue) / 1e-3d, ImpulseUnit.NanonewtonSecond => (baseUnitValue) / 1e-9d, ImpulseUnit.NewtonSecond => baseUnitValue, - ImpulseUnit.PoundFootPerSecond => baseUnitValue * 7.230657989877, - ImpulseUnit.PoundForceSecond => baseUnitValue * 0.2248089430997, - ImpulseUnit.SlugFootPerSecond => baseUnitValue * 0.224735720691, + ImpulseUnit.PoundFootPerSecond => baseUnitValue / (0.45359237 * 0.3048), + ImpulseUnit.PoundForceSecond => baseUnitValue / 4.4482216152605, + ImpulseUnit.SlugFootPerSecond => baseUnitValue / (0.45359237 * 9.80665), _ => throw new NotImplementedException($"Can not convert {Unit} to {unit}.") }; } diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/Luminosity.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/Luminosity.g.cs index 33d92eca50..1ddfd277f9 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Quantities/Luminosity.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Quantities/Luminosity.g.cs @@ -276,7 +276,7 @@ private double GetValueInBaseUnit() LuminosityUnit.Nanowatt => (_value) * 1e-9d, LuminosityUnit.Petawatt => (_value) * 1e15d, LuminosityUnit.Picowatt => (_value) * 1e-12d, - LuminosityUnit.SolarLuminosity => _value * 3.846e26, + LuminosityUnit.SolarLuminosity => _value * 3.828e26, LuminosityUnit.Terawatt => (_value) * 1e12d, LuminosityUnit.Watt => _value, _ => throw new NotImplementedException($"Can not convert {Unit} to base units.") @@ -303,7 +303,7 @@ private double GetValueAs(LuminosityUnit unit) LuminosityUnit.Nanowatt => (baseUnitValue) / 1e-9d, LuminosityUnit.Petawatt => (baseUnitValue) / 1e15d, LuminosityUnit.Picowatt => (baseUnitValue) / 1e-12d, - LuminosityUnit.SolarLuminosity => baseUnitValue / 3.846e26, + LuminosityUnit.SolarLuminosity => baseUnitValue / 3.828e26, LuminosityUnit.Terawatt => (baseUnitValue) / 1e12d, LuminosityUnit.Watt => baseUnitValue, _ => throw new NotImplementedException($"Can not convert {Unit} to {unit}.") diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/Power.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/Power.g.cs index 6670b94cee..1360d55ba0 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Quantities/Power.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Quantities/Power.g.cs @@ -393,7 +393,7 @@ private double GetValueInBaseUnit() return Unit switch { PowerUnit.BoilerHorsepower => _value * 9812.5, - PowerUnit.BritishThermalUnitPerHour => _value * 0.29307107017, + PowerUnit.BritishThermalUnitPerHour => _value * 1055.05585262 / 3600, PowerUnit.Decawatt => (_value) * 1e1d, PowerUnit.Deciwatt => (_value) * 1e-1d, PowerUnit.ElectricalHorsepower => _value * 746, @@ -402,11 +402,11 @@ private double GetValueInBaseUnit() PowerUnit.Gigawatt => (_value) * 1e9d, PowerUnit.HydraulicHorsepower => _value * 745.69988145, PowerUnit.JoulePerHour => _value / 3600, - PowerUnit.KilobritishThermalUnitPerHour => (_value * 0.29307107017) * 1e3d, + PowerUnit.KilobritishThermalUnitPerHour => (_value * 1055.05585262 / 3600) * 1e3d, PowerUnit.KilojoulePerHour => (_value / 3600) * 1e3d, PowerUnit.Kilowatt => (_value) * 1e3d, - PowerUnit.MechanicalHorsepower => _value * 745.69, - PowerUnit.MegabritishThermalUnitPerHour => (_value * 0.29307107017) * 1e6d, + PowerUnit.MechanicalHorsepower => _value * 76.0402249 * 9.80665, + PowerUnit.MegabritishThermalUnitPerHour => (_value * 1055.05585262 / 3600) * 1e6d, PowerUnit.MegajoulePerHour => (_value / 3600) * 1e6d, PowerUnit.Megawatt => (_value) * 1e6d, PowerUnit.MetricHorsepower => _value * 735.49875, @@ -433,7 +433,7 @@ private double GetValueAs(PowerUnit unit) return unit switch { PowerUnit.BoilerHorsepower => baseUnitValue / 9812.5, - PowerUnit.BritishThermalUnitPerHour => baseUnitValue / 0.29307107017, + PowerUnit.BritishThermalUnitPerHour => baseUnitValue * 3600 / 1055.05585262, PowerUnit.Decawatt => (baseUnitValue) / 1e1d, PowerUnit.Deciwatt => (baseUnitValue) / 1e-1d, PowerUnit.ElectricalHorsepower => baseUnitValue / 746, @@ -442,11 +442,11 @@ private double GetValueAs(PowerUnit unit) PowerUnit.Gigawatt => (baseUnitValue) / 1e9d, PowerUnit.HydraulicHorsepower => baseUnitValue / 745.69988145, PowerUnit.JoulePerHour => baseUnitValue * 3600, - PowerUnit.KilobritishThermalUnitPerHour => (baseUnitValue / 0.29307107017) / 1e3d, + PowerUnit.KilobritishThermalUnitPerHour => (baseUnitValue * 3600 / 1055.05585262) / 1e3d, PowerUnit.KilojoulePerHour => (baseUnitValue * 3600) / 1e3d, PowerUnit.Kilowatt => (baseUnitValue) / 1e3d, - PowerUnit.MechanicalHorsepower => baseUnitValue / 745.69, - PowerUnit.MegabritishThermalUnitPerHour => (baseUnitValue / 0.29307107017) / 1e6d, + PowerUnit.MechanicalHorsepower => baseUnitValue / (76.0402249 * 9.80665), + PowerUnit.MegabritishThermalUnitPerHour => (baseUnitValue * 3600 / 1055.05585262) / 1e6d, PowerUnit.MegajoulePerHour => (baseUnitValue * 3600) / 1e6d, PowerUnit.Megawatt => (baseUnitValue) / 1e6d, PowerUnit.MetricHorsepower => baseUnitValue / 735.49875, diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/Pressure.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/Pressure.g.cs index a2607ee608..bdc26f0297 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Quantities/Pressure.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Quantities/Pressure.g.cs @@ -615,52 +615,52 @@ private double GetValueInBaseUnit() PressureUnit.Atmosphere => _value * 1.01325 * 1e5, PressureUnit.Bar => _value * 1e5, PressureUnit.Centibar => (_value * 1e5) * 1e-2d, - PressureUnit.CentimeterOfWaterColumn => (_value * 9.806650000000272e3) * 1e-2d, + PressureUnit.CentimeterOfWaterColumn => (_value * 9.80665e3) * 1e-2d, PressureUnit.Decapascal => (_value) * 1e1d, PressureUnit.Decibar => (_value * 1e5) * 1e-1d, PressureUnit.DynePerSquareCentimeter => _value * 1.0e-1, PressureUnit.FootOfElevation => Math.Pow(1.0 - (_value / 145366.45), 5.2553026003237266401799415610351) * 101325.0, - PressureUnit.FootOfHead => _value * 2989.0669, + PressureUnit.FootOfHead => _value * 9804.139432 * 0.3048, PressureUnit.Gigapascal => (_value) * 1e9d, PressureUnit.Hectopascal => (_value) * 1e2d, - PressureUnit.InchOfMercury => _value / 2.95299830714159e-4, - PressureUnit.InchOfWaterColumn => _value * 249.08890833333, + PressureUnit.InchOfMercury => _value * 2.54e1 * 133.322387415, + PressureUnit.InchOfWaterColumn => _value * 2.54e-2 * 9.80665e3, PressureUnit.Kilobar => (_value * 1e5) * 1e3d, PressureUnit.KilogramForcePerSquareCentimeter => _value * 9.80665e4, - PressureUnit.KilogramForcePerSquareMeter => _value * 9.80665019960652, + PressureUnit.KilogramForcePerSquareMeter => _value * 9.80665, PressureUnit.KilogramForcePerSquareMillimeter => _value * 9.80665e6, PressureUnit.KilonewtonPerSquareCentimeter => (_value * 1e4) * 1e3d, PressureUnit.KilonewtonPerSquareMeter => (_value) * 1e3d, PressureUnit.KilonewtonPerSquareMillimeter => (_value * 1e6) * 1e3d, PressureUnit.Kilopascal => (_value) * 1e3d, - PressureUnit.KilopoundForcePerSquareFoot => (_value * 4.788025898033584e1) * 1e3d, - PressureUnit.KilopoundForcePerSquareInch => (_value * 6.894757293168361e3) * 1e3d, - PressureUnit.KilopoundForcePerSquareMil => (_value * 6.894757293168361e9) * 1e3d, + PressureUnit.KilopoundForcePerSquareFoot => (_value * 4.4482216152605 / 9.290304e-2) * 1e3d, + PressureUnit.KilopoundForcePerSquareInch => (_value * 4.4482216152605 / 0.00064516) * 1e3d, + PressureUnit.KilopoundForcePerSquareMil => (_value * 4.4482216152605 / (2.54e-5 * 2.54e-5)) * 1e3d, PressureUnit.Megabar => (_value * 1e5) * 1e6d, PressureUnit.MeganewtonPerSquareMeter => (_value) * 1e6d, PressureUnit.Megapascal => (_value) * 1e6d, PressureUnit.MeterOfElevation => Math.Pow(1.0 - (_value / 44307.69396), 5.2553026003237266401799415610351) * 101325.0, PressureUnit.MeterOfHead => _value * 9804.139432, - PressureUnit.MeterOfWaterColumn => _value * 9.806650000000272e3, + PressureUnit.MeterOfWaterColumn => _value * 9.80665e3, PressureUnit.Microbar => (_value * 1e5) * 1e-6d, PressureUnit.Micropascal => (_value) * 1e-6d, PressureUnit.Millibar => (_value * 1e5) * 1e-3d, - PressureUnit.MillimeterOfMercury => _value / 7.50061561302643e-3, - PressureUnit.MillimeterOfWaterColumn => (_value * 9.806650000000272e3) * 1e-3d, + PressureUnit.MillimeterOfMercury => _value * 133.322387415, + PressureUnit.MillimeterOfWaterColumn => (_value * 9.80665e3) * 1e-3d, PressureUnit.Millipascal => (_value) * 1e-3d, PressureUnit.NewtonPerSquareCentimeter => _value * 1e4, PressureUnit.NewtonPerSquareMeter => _value, PressureUnit.NewtonPerSquareMillimeter => _value * 1e6, PressureUnit.Pascal => _value, - PressureUnit.PoundForcePerSquareFoot => _value * 4.788025898033584e1, - PressureUnit.PoundForcePerSquareInch => _value * 6.894757293168361e3, - PressureUnit.PoundForcePerSquareMil => _value * 6.894757293168361e9, - PressureUnit.PoundPerInchSecondSquared => _value * 1.785796732283465e1, - PressureUnit.TechnicalAtmosphere => _value * 9.80680592331 * 1e4, + PressureUnit.PoundForcePerSquareFoot => _value * 4.4482216152605 / 9.290304e-2, + PressureUnit.PoundForcePerSquareInch => _value * 4.4482216152605 / 0.00064516, + PressureUnit.PoundForcePerSquareMil => _value * 4.4482216152605 / (2.54e-5 * 2.54e-5), + PressureUnit.PoundPerInchSecondSquared => _value * (4.4482216152605 / 0.00064516) / 386.0886, + PressureUnit.TechnicalAtmosphere => _value * 9.80665e4, PressureUnit.TonneForcePerSquareCentimeter => _value * 9.80665e7, PressureUnit.TonneForcePerSquareMeter => _value * 9.80665e3, PressureUnit.TonneForcePerSquareMillimeter => _value * 9.80665e9, - PressureUnit.Torr => _value * 1.3332266752 * 1e2, + PressureUnit.Torr => _value * 101325 / 760, _ => throw new NotImplementedException($"Can not convert {Unit} to base units.") }; } @@ -677,52 +677,52 @@ private double GetValueAs(PressureUnit unit) PressureUnit.Atmosphere => baseUnitValue / (1.01325 * 1e5), PressureUnit.Bar => baseUnitValue / 1e5, PressureUnit.Centibar => (baseUnitValue / 1e5) / 1e-2d, - PressureUnit.CentimeterOfWaterColumn => (baseUnitValue / 9.806650000000272e3) / 1e-2d, + PressureUnit.CentimeterOfWaterColumn => (baseUnitValue / 9.80665e3) / 1e-2d, PressureUnit.Decapascal => (baseUnitValue) / 1e1d, PressureUnit.Decibar => (baseUnitValue / 1e5) / 1e-1d, PressureUnit.DynePerSquareCentimeter => baseUnitValue / 1.0e-1, PressureUnit.FootOfElevation => (1.0 - Math.Pow(baseUnitValue / 101325.0, 0.190284)) * 145366.45, - PressureUnit.FootOfHead => baseUnitValue * 0.000334552565551, + PressureUnit.FootOfHead => baseUnitValue / (9804.139432 * 0.3048), PressureUnit.Gigapascal => (baseUnitValue) / 1e9d, PressureUnit.Hectopascal => (baseUnitValue) / 1e2d, - PressureUnit.InchOfMercury => baseUnitValue * 2.95299830714159e-4, - PressureUnit.InchOfWaterColumn => baseUnitValue / 249.08890833333, + PressureUnit.InchOfMercury => baseUnitValue / (2.54e1 * 133.322387415), + PressureUnit.InchOfWaterColumn => baseUnitValue / (2.54e-2 * 9.80665e3), PressureUnit.Kilobar => (baseUnitValue / 1e5) / 1e3d, PressureUnit.KilogramForcePerSquareCentimeter => baseUnitValue / 9.80665e4, - PressureUnit.KilogramForcePerSquareMeter => baseUnitValue * 0.101971619222242, + PressureUnit.KilogramForcePerSquareMeter => baseUnitValue / 9.80665, PressureUnit.KilogramForcePerSquareMillimeter => baseUnitValue / 9.80665e6, PressureUnit.KilonewtonPerSquareCentimeter => (baseUnitValue / 1e4) / 1e3d, PressureUnit.KilonewtonPerSquareMeter => (baseUnitValue) / 1e3d, PressureUnit.KilonewtonPerSquareMillimeter => (baseUnitValue / 1e6) / 1e3d, PressureUnit.Kilopascal => (baseUnitValue) / 1e3d, - PressureUnit.KilopoundForcePerSquareFoot => (baseUnitValue / 4.788025898033584e1) / 1e3d, - PressureUnit.KilopoundForcePerSquareInch => (baseUnitValue / 6.894757293168361e3) / 1e3d, - PressureUnit.KilopoundForcePerSquareMil => (baseUnitValue / 6.894757293168361e9) / 1e3d, + PressureUnit.KilopoundForcePerSquareFoot => (baseUnitValue * 9.290304e-2 / 4.4482216152605) / 1e3d, + PressureUnit.KilopoundForcePerSquareInch => (baseUnitValue * 0.00064516 / 4.4482216152605) / 1e3d, + PressureUnit.KilopoundForcePerSquareMil => (baseUnitValue * (2.54e-5 * 2.54e-5) / 4.4482216152605) / 1e3d, PressureUnit.Megabar => (baseUnitValue / 1e5) / 1e6d, PressureUnit.MeganewtonPerSquareMeter => (baseUnitValue) / 1e6d, PressureUnit.Megapascal => (baseUnitValue) / 1e6d, PressureUnit.MeterOfElevation => (1.0 - Math.Pow(baseUnitValue / 101325.0, 0.190284)) * 44307.69396, - PressureUnit.MeterOfHead => baseUnitValue * 0.0001019977334, - PressureUnit.MeterOfWaterColumn => baseUnitValue / 9.806650000000272e3, + PressureUnit.MeterOfHead => baseUnitValue / 9804.139432, + PressureUnit.MeterOfWaterColumn => baseUnitValue / 9.80665e3, PressureUnit.Microbar => (baseUnitValue / 1e5) / 1e-6d, PressureUnit.Micropascal => (baseUnitValue) / 1e-6d, PressureUnit.Millibar => (baseUnitValue / 1e5) / 1e-3d, - PressureUnit.MillimeterOfMercury => baseUnitValue * 7.50061561302643e-3, - PressureUnit.MillimeterOfWaterColumn => (baseUnitValue / 9.806650000000272e3) / 1e-3d, + PressureUnit.MillimeterOfMercury => baseUnitValue / 133.322387415, + PressureUnit.MillimeterOfWaterColumn => (baseUnitValue / 9.80665e3) / 1e-3d, PressureUnit.Millipascal => (baseUnitValue) / 1e-3d, PressureUnit.NewtonPerSquareCentimeter => baseUnitValue / 1e4, PressureUnit.NewtonPerSquareMeter => baseUnitValue, PressureUnit.NewtonPerSquareMillimeter => baseUnitValue / 1e6, PressureUnit.Pascal => baseUnitValue, - PressureUnit.PoundForcePerSquareFoot => baseUnitValue / 4.788025898033584e1, - PressureUnit.PoundForcePerSquareInch => baseUnitValue / 6.894757293168361e3, - PressureUnit.PoundForcePerSquareMil => baseUnitValue / 6.894757293168361e9, - PressureUnit.PoundPerInchSecondSquared => baseUnitValue / 1.785796732283465e1, - PressureUnit.TechnicalAtmosphere => baseUnitValue / (9.80680592331 * 1e4), + PressureUnit.PoundForcePerSquareFoot => baseUnitValue * 9.290304e-2 / 4.4482216152605, + PressureUnit.PoundForcePerSquareInch => baseUnitValue * 0.00064516 / 4.4482216152605, + PressureUnit.PoundForcePerSquareMil => baseUnitValue * (2.54e-5 * 2.54e-5) / 4.4482216152605, + PressureUnit.PoundPerInchSecondSquared => baseUnitValue * 386.0886 / (4.4482216152605 / 0.00064516), + PressureUnit.TechnicalAtmosphere => baseUnitValue / 9.80665e4, PressureUnit.TonneForcePerSquareCentimeter => baseUnitValue / 9.80665e7, PressureUnit.TonneForcePerSquareMeter => baseUnitValue / 9.80665e3, PressureUnit.TonneForcePerSquareMillimeter => baseUnitValue / 9.80665e9, - PressureUnit.Torr => baseUnitValue / (1.3332266752 * 1e2), + PressureUnit.Torr => baseUnitValue * 760 / 101325, _ => throw new NotImplementedException($"Can not convert {Unit} to {unit}.") }; } diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs index 0d7f66059b..1a2dc699a2 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs @@ -166,9 +166,9 @@ private double GetValueInBaseUnit() return Unit switch { SpecificFuelConsumptionUnit.GramPerKilonewtonSecond => _value, - SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour => _value * 28.33, + SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour => _value * 453.59237 / (0.0044482216152605 * 3600), SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond => (_value) * 1e3d, - SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour => _value * 28.33, + SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour => _value * 453.59237 / (0.0044482216152605 * 3600), _ => throw new NotImplementedException($"Can not convert {Unit} to base units.") }; } @@ -183,9 +183,9 @@ private double GetValueAs(SpecificFuelConsumptionUnit unit) return unit switch { SpecificFuelConsumptionUnit.GramPerKilonewtonSecond => baseUnitValue, - SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour => baseUnitValue / 28.33, + SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour => baseUnitValue * (0.0044482216152605 * 3600) / 453.59237, SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond => (baseUnitValue) / 1e3d, - SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour => baseUnitValue / 28.33, + SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour => baseUnitValue * (0.0044482216152605 * 3600) / 453.59237, _ => throw new NotImplementedException($"Can not convert {Unit} to {unit}.") }; } diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/ThermalInsulance.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/ThermalInsulance.g.cs index 7e7e4723f0..e415f67581 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Quantities/ThermalInsulance.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Quantities/ThermalInsulance.g.cs @@ -182,8 +182,8 @@ private double GetValueInBaseUnit() { return Unit switch { - ThermalInsulanceUnit.HourSquareFeetDegreeFahrenheitPerBtu => _value * 176.1121482159839, - ThermalInsulanceUnit.SquareCentimeterHourDegreeCelsiusPerKilocalorie => _value * 0.0859779507590433, + ThermalInsulanceUnit.HourSquareFeetDegreeFahrenheitPerBtu => _value * (1000 * 0.3048 * 0.3048 * 3600) / (1055.05585262 * 1.8), + ThermalInsulanceUnit.SquareCentimeterHourDegreeCelsiusPerKilocalorie => _value * (0.0001 * 3600) / 4.184, ThermalInsulanceUnit.SquareCentimeterKelvinPerWatt => _value * 0.1, ThermalInsulanceUnit.SquareMeterDegreeCelsiusPerWatt => _value * 1000.0, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt => _value, @@ -201,8 +201,8 @@ private double GetValueAs(ThermalInsulanceUnit unit) return unit switch { - ThermalInsulanceUnit.HourSquareFeetDegreeFahrenheitPerBtu => baseUnitValue / 176.1121482159839, - ThermalInsulanceUnit.SquareCentimeterHourDegreeCelsiusPerKilocalorie => baseUnitValue / 0.0859779507590433, + ThermalInsulanceUnit.HourSquareFeetDegreeFahrenheitPerBtu => baseUnitValue * (1055.05585262 * 1.8) / (1000 * 0.3048 * 0.3048 * 3600), + ThermalInsulanceUnit.SquareCentimeterHourDegreeCelsiusPerKilocalorie => baseUnitValue * 4.184 / (0.0001 * 3600), ThermalInsulanceUnit.SquareCentimeterKelvinPerWatt => baseUnitValue / 0.1, ThermalInsulanceUnit.SquareMeterDegreeCelsiusPerWatt => baseUnitValue / 1000.0, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt => baseUnitValue, diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs index a63b936760..10e2e499ce 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs @@ -215,11 +215,11 @@ private double GetValueInBaseUnit() { return Unit switch { - VolumetricHeatCapacityUnit.BtuPerCubicFootDegreeFahrenheit => _value / 1.4910660e-5, - VolumetricHeatCapacityUnit.CaloriePerCubicCentimeterDegreeCelsius => _value / 2.388459e-7, + VolumetricHeatCapacityUnit.BtuPerCubicFootDegreeFahrenheit => _value * (1055.05585262 / 0.028316846592) * 1.8, + VolumetricHeatCapacityUnit.CaloriePerCubicCentimeterDegreeCelsius => _value * 4.184e6, VolumetricHeatCapacityUnit.JoulePerCubicMeterDegreeCelsius => _value, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin => _value, - VolumetricHeatCapacityUnit.KilocaloriePerCubicCentimeterDegreeCelsius => (_value / 2.388459e-7) * 1e3d, + VolumetricHeatCapacityUnit.KilocaloriePerCubicCentimeterDegreeCelsius => (_value * 4.184e6) * 1e3d, VolumetricHeatCapacityUnit.KilojoulePerCubicMeterDegreeCelsius => (_value) * 1e3d, VolumetricHeatCapacityUnit.KilojoulePerCubicMeterKelvin => (_value) * 1e3d, VolumetricHeatCapacityUnit.MegajoulePerCubicMeterDegreeCelsius => (_value) * 1e6d, @@ -237,11 +237,11 @@ private double GetValueAs(VolumetricHeatCapacityUnit unit) return unit switch { - VolumetricHeatCapacityUnit.BtuPerCubicFootDegreeFahrenheit => baseUnitValue * 1.4910660e-5, - VolumetricHeatCapacityUnit.CaloriePerCubicCentimeterDegreeCelsius => baseUnitValue * 2.388459e-7, + VolumetricHeatCapacityUnit.BtuPerCubicFootDegreeFahrenheit => baseUnitValue / ((1055.05585262 / 0.028316846592) * 1.8), + VolumetricHeatCapacityUnit.CaloriePerCubicCentimeterDegreeCelsius => baseUnitValue / 4.184e6, VolumetricHeatCapacityUnit.JoulePerCubicMeterDegreeCelsius => baseUnitValue, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin => baseUnitValue, - VolumetricHeatCapacityUnit.KilocaloriePerCubicCentimeterDegreeCelsius => (baseUnitValue * 2.388459e-7) / 1e3d, + VolumetricHeatCapacityUnit.KilocaloriePerCubicCentimeterDegreeCelsius => (baseUnitValue / 4.184e6) / 1e3d, VolumetricHeatCapacityUnit.KilojoulePerCubicMeterDegreeCelsius => (baseUnitValue) / 1e3d, VolumetricHeatCapacityUnit.KilojoulePerCubicMeterKelvin => (baseUnitValue) / 1e3d, VolumetricHeatCapacityUnit.MegajoulePerCubicMeterDegreeCelsius => (baseUnitValue) / 1e6d, diff --git a/UnitsNet.NanoFramework/GeneratedCode/Units/LuminosityUnit.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Units/LuminosityUnit.g.cs index 44cdfec58c..f15cfe1cef 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Units/LuminosityUnit.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Units/LuminosityUnit.g.cs @@ -36,7 +36,11 @@ public enum LuminosityUnit Nanowatt = 9, Petawatt = 10, Picowatt = 11, - /// https://www.britannica.com/science/luminosity + + /// + /// The IAU has defined a nominal solar luminosity of 3.828×10^26 W to promote publication of consistent and comparable values in units of the solar luminosity. + /// + /// https://en.wikipedia.org/wiki/Luminosity#Measurement SolarLuminosity = 12, Terawatt = 13, Watt = 14, diff --git a/UnitsNet.NanoFramework/GeneratedCode/Units/PowerUnit.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Units/PowerUnit.g.cs index e5b59a40ca..5c6283ec8d 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Units/PowerUnit.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Units/PowerUnit.g.cs @@ -25,23 +25,48 @@ namespace UnitsNet.Units public enum PowerUnit { + + /// + /// 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. + /// + /// https://en.wikipedia.org/wiki/Horsepower#Boiler_horsepower BoilerHorsepower = 1, BritishThermalUnitPerHour = 2, Decawatt = 3, Deciwatt = 4, + + /// + /// Nameplates on electrical motors show their power output, not the power input (the power delivered at the shaft, not the power consumed to drive the motor). This power output is ordinarily stated in watts or kilowatts. In the United States, the power output is stated in horsepower, which for this purpose is defined as exactly 746 W. + /// + /// https://en.wikipedia.org/wiki/Horsepower#Electrical_horsepower ElectricalHorsepower = 5, Femtowatt = 6, GigajoulePerHour = 7, Gigawatt = 8, + + /// + /// Hydraulic horsepower can represent the power available within hydraulic machinery, power through the down-hole nozzle of a drilling rig, or can be used to estimate the mechanical power needed to generate a known hydraulic flow rate. + /// + /// https://en.wikipedia.org/wiki/Horsepower#Hydraulic_horsepower HydraulicHorsepower = 9, JoulePerHour = 10, KilobritishThermalUnitPerHour = 11, KilojoulePerHour = 12, Kilowatt = 13, + + /// + /// Assuming the third CGPM (1901, CR 70) definition of standard gravity, gn = 9.80665 m/s2, is used to define the pound-force as well as the kilogram force, and the international avoirdupois pound (1959), one imperial horsepower is: 76.0402249 × 9.80665 kg⋅m2/s3 + /// + /// https://en.wikipedia.org/wiki/Horsepower#Imperial_horsepower MechanicalHorsepower = 14, MegabritishThermalUnitPerHour = 15, MegajoulePerHour = 16, Megawatt = 17, + + /// + /// DIN 66036 defines one metric horsepower as the power to raise a mass of 75 kilograms against the Earth's gravitational force over a distance of one metre in one second:[18] 75 kg × 9.80665 m/s2 × 1 m / 1 s = 75 kgf⋅m/s = 1 PS. This is equivalent to 735.49875 W, or 98.6% of an imperial horsepower. + /// + /// https://en.wikipedia.org/wiki/Horsepower#Metric_horsepower_(PS,_KM,_cv,_hk,_pk,_k,_ks,_ch) MetricHorsepower = 18, Microwatt = 19, MillijoulePerHour = 20, diff --git a/UnitsNet.NanoFramework/GeneratedCode/Units/PressureUnit.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Units/PressureUnit.g.cs index 69a642d708..175f6dbcc5 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Units/PressureUnit.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Units/PressureUnit.g.cs @@ -25,7 +25,17 @@ namespace UnitsNet.Units public enum PressureUnit { + + /// + /// The standard atmosphere (symbol: atm) is a unit of pressure defined as 101325 Pa. It is sometimes used as a reference pressure or standard pressure. It is approximately equal to Earth's average atmospheric pressure at sea level. + /// + /// https://en.wikipedia.org/wiki/Standard_atmosphere_(unit) Atmosphere = 1, + + /// + /// The bar is a metric unit of pressure defined as 100,000 Pa (100 kPa), though not part of the International System of Units (SI). A pressure of 1 bar is slightly less than the current average atmospheric pressure on Earth at sea level (approximately 1.013 bar). + /// + /// https://en.wikipedia.org/wiki/Bar_(unit) Bar = 2, Centibar = 3, CentimeterOfWaterColumn = 48, @@ -36,9 +46,24 @@ public enum PressureUnit FootOfHead = 8, Gigapascal = 9, Hectopascal = 10, + + /// + /// Inch of mercury (inHg and ″Hg) is a non-SI unit of measurement for pressure. It is used for barometric pressure in weather reports, refrigeration and aviation in the United States. It is the pressure exerted by a column of mercury 1 inch (25.4 mm) in height at the standard acceleration of gravity. + /// + /// https://en.wikipedia.org/wiki/Inch_of_mercury InchOfMercury = 11, + + /// + /// Inches of water is a non-SI unit for pressure. It is defined as the pressure exerted by a column of water of 1 inch in height at defined conditions. At a temperature of 4 °C (39.2 °F) pure water has its highest density (1000 kg/m3). At that temperature and assuming the standard acceleration of gravity, 1 inAq is approximately 249.082 pascals (0.0361263 psi). + /// + /// https://en.wikipedia.org/wiki/Inch_of_water InchOfWaterColumn = 12, Kilobar = 13, + + /// + /// A kilogram-force per centimetre square (kgf/cm2), often just kilogram per square centimetre (kg/cm2), or kilopond per centimetre square (kp/cm2) is a deprecated unit of pressure using metric units. It is not a part of the International System of Units (SI), the modern metric system. 1 kgf/cm2 equals 98.0665 kPa (kilopascals). It is also known as a technical atmosphere (symbol: at). + /// + /// https://en.wikipedia.org/wiki/Kilogram-force_per_square_centimetre KilogramForcePerSquareCentimeter = 14, KilogramForcePerSquareMeter = 15, KilogramForcePerSquareMillimeter = 16, @@ -54,10 +79,20 @@ public enum PressureUnit Megapascal = 26, MeterOfElevation = 27, MeterOfHead = 28, + + /// + /// A centimetre of water is defined as the pressure exerted by a column of water of 1 cm in height at 4 °C (temperature of maximum density) at the standard acceleration of gravity, so that 1 cmH2O (4°C) = 999.9720 kg/m3 × 9.80665 m/s2 × 1 cm = 98.063754138 Pa, but conventionally a nominal maximum water density of 1000 kg/m3 is used, giving 98.0665 Pa. + /// + /// https://en.wikipedia.org/wiki/Centimetre_or_millimetre_of_water MeterOfWaterColumn = 57, Microbar = 29, Micropascal = 30, Millibar = 31, + + /// + /// A millimetre of mercury is a manometric unit of pressure, formerly defined as the extra pressure generated by a column of mercury one millimetre high, and currently defined as exactly 133.322387415 pascals. + /// + /// https://en.wikipedia.org/wiki/Millimetre_of_mercury MillimeterOfMercury = 32, MillimeterOfWaterColumn = 33, Millipascal = 34, @@ -69,10 +104,20 @@ public enum PressureUnit PoundForcePerSquareInch = 40, PoundForcePerSquareMil = 41, PoundPerInchSecondSquared = 42, + + /// + /// A kilogram-force per centimetre square (kgf/cm2), often just kilogram per square centimetre (kg/cm2), or kilopond per centimetre square (kp/cm2) is a deprecated unit of pressure using metric units. It is not a part of the International System of Units (SI), the modern metric system. 1 kgf/cm2 equals 98.0665 kPa (kilopascals). It is also known as a technical atmosphere (symbol: at). + /// + /// https://en.wikipedia.org/wiki/Kilogram-force_per_square_centimetre TechnicalAtmosphere = 43, TonneForcePerSquareCentimeter = 44, TonneForcePerSquareMeter = 45, TonneForcePerSquareMillimeter = 46, + + /// + /// The torr (symbol: Torr) is a unit of pressure based on an absolute scale, defined as exactly 1/760 of a standard atmosphere (101325 Pa). Thus one torr is exactly 101325/760 pascals (≈ 133.32 Pa). + /// + /// https://en.wikipedia.org/wiki/Torr Torr = 47, } diff --git a/UnitsNet.Tests/CustomCode/HeatFluxTests.cs b/UnitsNet.Tests/CustomCode/HeatFluxTests.cs index 0c9b742538..7072323f2a 100644 --- a/UnitsNet.Tests/CustomCode/HeatFluxTests.cs +++ b/UnitsNet.Tests/CustomCode/HeatFluxTests.cs @@ -28,16 +28,15 @@ namespace UnitsNet.Tests.CustomCode { public class HeatFluxTests : HeatFluxTestsBase { - protected override bool SupportsSIUnitSystem => true; protected override double BtusPerHourSquareFootInOneWattPerSquareMeter => 3.16998331e-1; protected override double BtusPerMinuteSquareFootInOneWattPerSquareMeter => 5.28330551e-3; protected override double BtusPerSecondSquareFootInOneWattPerSquareMeter => 8.80550918e-5; protected override double BtusPerSecondSquareInchInOneWattPerSquareMeter => 6.11493693e-7; - protected override double CaloriesPerSecondSquareCentimeterInOneWattPerSquareMeter => 2.388458966e-5; + protected override double CaloriesPerSecondSquareCentimeterInOneWattPerSquareMeter => 2.390057361376673e-05; protected override double CentiwattsPerSquareMeterInOneWattPerSquareMeter => 1e2; protected override double DeciwattsPerSquareMeterInOneWattPerSquareMeter => 1e1; - protected override double KilocaloriesPerSecondSquareCentimeterInOneWattPerSquareMeter => 2.388458966e-8; - protected override double KilocaloriesPerHourSquareMeterInOneWattPerSquareMeter => 8.59845227859e-1; + protected override double KilocaloriesPerSecondSquareCentimeterInOneWattPerSquareMeter => 2.390057361376673e-8; + protected override double KilocaloriesPerHourSquareMeterInOneWattPerSquareMeter => 0.8604206500956023; protected override double KilowattsPerSquareMeterInOneWattPerSquareMeter => 1e-3; protected override double MicrowattsPerSquareMeterInOneWattPerSquareMeter => 1e6; protected override double MilliwattsPerSquareMeterInOneWattPerSquareMeter => 1e3; @@ -48,7 +47,7 @@ public class HeatFluxTests : HeatFluxTestsBase protected override double PoundsForcePerFootSecondInOneWattPerSquareMeter => 6.852176585679176e-2; protected override double PoundsPerSecondCubedInOneWattPerSquareMeter => 2.204622621848776; - [ Fact] + [Fact] public void PowerDividedByAreaEqualsHeatFlux() { HeatFlux heatFlux = Power.FromWatts(12) / Area.FromSquareMeters(3); diff --git a/UnitsNet.Tests/CustomCode/HeatTransferCoefficientTests.cs b/UnitsNet.Tests/CustomCode/HeatTransferCoefficientTests.cs index 1e67ece931..9cd3a2d471 100644 --- a/UnitsNet.Tests/CustomCode/HeatTransferCoefficientTests.cs +++ b/UnitsNet.Tests/CustomCode/HeatTransferCoefficientTests.cs @@ -27,11 +27,10 @@ namespace UnitsNet.Tests.CustomCode { public class HeatTransferCoefficientTests : HeatTransferCoefficientTestsBase { - protected override bool SupportsSIUnitSystem => false; protected override double WattsPerSquareMeterCelsiusInOneWattPerSquareMeterKelvin => 1; protected override double WattsPerSquareMeterKelvinInOneWattPerSquareMeterKelvin => 1; protected override double BtusPerHourSquareFootDegreeFahrenheitInOneWattPerSquareMeterKelvin => 1.7611018368230584e-1; - protected override double KilocaloriesPerHourSquareMeterDegreeCelsiusInOneWattPerSquareMeterKelvin => 0.859845227859; - protected override double CaloriesPerHourSquareMeterDegreeCelsiusInOneWattPerSquareMeterKelvin => 859.845227859; + protected override double KilocaloriesPerHourSquareMeterDegreeCelsiusInOneWattPerSquareMeterKelvin => 0.8604206500956023; + protected override double CaloriesPerHourSquareMeterDegreeCelsiusInOneWattPerSquareMeterKelvin => 860.4206500956023; } } diff --git a/UnitsNet.Tests/CustomCode/ImpulseTests.cs b/UnitsNet.Tests/CustomCode/ImpulseTests.cs index b4a4ed2c42..e42fab6b8c 100644 --- a/UnitsNet.Tests/CustomCode/ImpulseTests.cs +++ b/UnitsNet.Tests/CustomCode/ImpulseTests.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by \generate-code.bat. // @@ -23,7 +23,6 @@ namespace UnitsNet.Tests.CustomCode { public class ImpulseTests : ImpulseTestsBase { - protected override bool SupportsSIUnitSystem => false; protected override double CentinewtonSecondsInOneNewtonSecond => 100; protected override double DecanewtonSecondsInOneNewtonSecond => 0.1; protected override double DecinewtonSecondsInOneNewtonSecond => 10; @@ -34,8 +33,8 @@ public class ImpulseTests : ImpulseTestsBase protected override double MillinewtonSecondsInOneNewtonSecond => 1E3; protected override double NanonewtonSecondsInOneNewtonSecond => 1E9; protected override double NewtonSecondsInOneNewtonSecond => 1; - protected override double PoundFeetPerSecondInOneNewtonSecond => 7.230657989877; - protected override double PoundForceSecondsInOneNewtonSecond => 0.2248089430997; - protected override double SlugFeetPerSecondInOneNewtonSecond => 0.224735720691; + protected override double PoundFeetPerSecondInOneNewtonSecond => 7.233013851209894; + protected override double PoundForceSecondsInOneNewtonSecond => 0.2248089430997105; + protected override double SlugFeetPerSecondInOneNewtonSecond => 0.2248089330130927; } } diff --git a/UnitsNet.Tests/CustomCode/LuminosityTests.cs b/UnitsNet.Tests/CustomCode/LuminosityTests.cs index 02882c3f3c..3a96f3e111 100644 --- a/UnitsNet.Tests/CustomCode/LuminosityTests.cs +++ b/UnitsNet.Tests/CustomCode/LuminosityTests.cs @@ -23,7 +23,6 @@ namespace UnitsNet.Tests.CustomCode { public class LuminosityTests : LuminosityTestsBase { - protected override bool SupportsSIUnitSystem => false; protected override double FemtowattsInOneWatt => 1e15; protected override double PicowattsInOneWatt => 1e12; @@ -50,7 +49,7 @@ public class LuminosityTests : LuminosityTestsBase protected override double PetawattsInOneWatt => 1e-15; - protected override double SolarLuminositiesInOneWatt => 2.6001040041601700000000000E-27; + protected override double SolarLuminositiesInOneWatt => 2.612330198537095E-27; } } diff --git a/UnitsNet.Tests/CustomCode/PowerTests.cs b/UnitsNet.Tests/CustomCode/PowerTests.cs index 5f495de500..945031a401 100644 --- a/UnitsNet.Tests/CustomCode/PowerTests.cs +++ b/UnitsNet.Tests/CustomCode/PowerTests.cs @@ -8,8 +8,6 @@ namespace UnitsNet.Tests { public class PowerTests : PowerTestsBase { - protected override bool SupportsSIUnitSystem => true; - protected override double FemtowattsInOneWatt => 1e15; protected override double GigajoulesPerHourInOneWatt => 3600e-9; @@ -60,7 +58,7 @@ public class PowerTests : PowerTestsBase protected override double HydraulicHorsepowerInOneWatt => 0.00134102207184949258114167291719; - protected override double MechanicalHorsepowerInOneWatt => 0.00134103984229371454625916935992; + protected override double MechanicalHorsepowerInOneWatt => 0.001341022089714951; protected override double MetricHorsepowerInOneWatt => 0.00135962161730390432342679032425; diff --git a/UnitsNet.Tests/CustomCode/PressureTests.cs b/UnitsNet.Tests/CustomCode/PressureTests.cs index f369b61f9e..fc419dbbf9 100644 --- a/UnitsNet.Tests/CustomCode/PressureTests.cs +++ b/UnitsNet.Tests/CustomCode/PressureTests.cs @@ -2,7 +2,10 @@ // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet. using System; +using System.Collections.Generic; +using System.Linq; using UnitsNet.CustomCode.Units; +using UnitsNet.Units; using UnitsNet.Wrappers; using Xunit; @@ -10,7 +13,6 @@ namespace UnitsNet.Tests { public class PressureTests : PressureTestsBase { - protected override bool SupportsSIUnitSystem => true; protected override double AtmospheresInOnePascal => 9.8692 * 1E-6; protected override double BarsInOnePascal => 1E-5; @@ -55,7 +57,7 @@ public class PressureTests : PressureTestsBase protected override double PoundsForcePerSquareMilInOnePascal => 1.450377377302092e-10; - protected override double TechnicalAtmospheresInOnePascal => 1.0197 * 1E-5; + protected override double TechnicalAtmospheresInOnePascal => 1.019716212977928E-05; protected override double TonnesForcePerSquareCentimeterInOnePascal => 1.019716212977928e-8; @@ -70,7 +72,7 @@ public class PressureTests : PressureTestsBase protected override double DecapascalsInOnePascal => 1e-1; protected override double DecibarsInOnePascal => 1e-4; - protected override double FeetOfHeadInOnePascal => 0.000334552565551; + protected override double FeetOfHeadInOnePascal => 0.0003346382329391094; protected override double GigapascalsInOnePascal => 1e-9; @@ -157,6 +159,25 @@ public void Absolute_WithVacuumPressureReference_ThrowsArgumentOutOfRangeExcepti Assert.Throws(() => refPressure.Absolute.Atmospheres); } + [Fact] + public void ReferencePressure_WithInvalidPressureReference_ThrowsNotImplementedException() + { + var refPressure = new ReferencePressure(Pressure.FromAtmospheres(3), (PressureReference)(-1)); + Assert.Throws(() => refPressure.Absolute.Atmospheres); + Assert.Throws(() => refPressure.Gauge.Atmospheres); + Assert.Throws(() => refPressure.Vacuum.Atmospheres); + } + + [Fact] + public void ReferencePressureReferences_ReturnsTheExpectedEnumValues() + { + IEnumerable expectedValues = Enum.GetValues(typeof(PressureReference)).Cast(); + + PressureReference[] actualValues = ReferencePressure.References; + + Assert.Equal(expectedValues, actualValues); + } + [Fact] public void AreaTimesPressureEqualsForce() { @@ -257,7 +278,7 @@ public void PressureDividedByDurationEqualsPressureChangeRate() } [Fact] - public void PressureDividedByTimeSpanEqualsPressurechangeRate() + public void PressureDividedByTimeSpanEqualsPressureChangeRate() { PressureChangeRate pressureChangeRate = Pressure.FromPascals(50) / TimeSpan.FromSeconds(5); Assert.Equal(PressureChangeRate.FromPascalsPerSecond(10), pressureChangeRate); diff --git a/UnitsNet.Tests/CustomCode/SpecificFuelConsumptionTests.cs b/UnitsNet.Tests/CustomCode/SpecificFuelConsumptionTests.cs index ce48500cdb..1be50cf8c1 100644 --- a/UnitsNet.Tests/CustomCode/SpecificFuelConsumptionTests.cs +++ b/UnitsNet.Tests/CustomCode/SpecificFuelConsumptionTests.cs @@ -24,15 +24,12 @@ namespace UnitsNet.Tests.CustomCode { public class SpecificFuelConsumptionTests : SpecificFuelConsumptionTestsBase { - // Override properties in base class here - protected override bool SupportsSIUnitSystem => false; - protected override double GramsPerKilonewtonSecondInOneGramPerKilonewtonSecond => 1; protected override double KilogramsPerKilonewtonSecondInOneGramPerKilonewtonSecond => 1e-3; - protected override double PoundsMassPerPoundForceHourInOneGramPerKilonewtonSecond => 0.03529827; + protected override double PoundsMassPerPoundForceHourInOneGramPerKilonewtonSecond => 0.03530394; - protected override double KilogramsPerKilogramForceHourInOneGramPerKilonewtonSecond => 0.03529827; + protected override double KilogramsPerKilogramForceHourInOneGramPerKilonewtonSecond => 0.03530394; } } diff --git a/UnitsNet.Tests/CustomCode/ThermalInsulanceTests.cs b/UnitsNet.Tests/CustomCode/ThermalInsulanceTests.cs index 04ad2d5c2c..f40e9cbd70 100644 --- a/UnitsNet.Tests/CustomCode/ThermalInsulanceTests.cs +++ b/UnitsNet.Tests/CustomCode/ThermalInsulanceTests.cs @@ -24,18 +24,17 @@ namespace UnitsNet.Tests.CustomCode { public class ThermalInsulanceTests : ThermalInsulanceTestsBase { - protected override bool SupportsSIUnitSystem => false; - protected override double HourSquareFeetDegreesFahrenheitPerBtuInOneSquareMeterKelvinPerKilowatt => 0.0056782d; - protected override double SquareCentimeterHourDegreesCelsiusPerKilocalorieInOneSquareMeterKelvinPerKilowatt => 11.63088897992627d; - protected override double SquareCentimeterKelvinsPerWattInOneSquareMeterKelvinPerKilowatt => 10; - protected override double SquareMeterDegreesCelsiusPerWattInOneSquareMeterKelvinPerKilowatt => 1e-3; - protected override double SquareMeterKelvinsPerKilowattInOneSquareMeterKelvinPerKilowatt => 1; - protected override double SquareMeterKelvinsPerWattInOneSquareMeterKelvinPerKilowatt => 0.001; - - [Fact(Skip = "See about changing the BaseUnit to SquareMeterKelvinPerWatt")] - public override void BaseUnit_HasSIBase() - { - base.BaseUnit_HasSIBase(); - } + protected override double HourSquareFeetDegreesFahrenheitPerBtuInOneSquareMeterKelvinPerKilowatt => 0.005678263341113488; + protected override double SquareCentimeterHourDegreesCelsiusPerKilocalorieInOneSquareMeterKelvinPerKilowatt => 11.62222222222222; + protected override double SquareCentimeterKelvinsPerWattInOneSquareMeterKelvinPerKilowatt => 10; + protected override double SquareMeterDegreesCelsiusPerWattInOneSquareMeterKelvinPerKilowatt => 1e-3; + protected override double SquareMeterKelvinsPerKilowattInOneSquareMeterKelvinPerKilowatt => 1; + protected override double SquareMeterKelvinsPerWattInOneSquareMeterKelvinPerKilowatt => 0.001; + + [Fact(Skip = "See about changing the BaseUnit to SquareMeterKelvinPerWatt")] + public override void BaseUnit_HasSIBase() + { + base.BaseUnit_HasSIBase(); + } } } diff --git a/UnitsNet.Tests/CustomCode/VolumetricHeatCapacityTests.cs b/UnitsNet.Tests/CustomCode/VolumetricHeatCapacityTests.cs index 07ebe462ba..51392a43d9 100644 --- a/UnitsNet.Tests/CustomCode/VolumetricHeatCapacityTests.cs +++ b/UnitsNet.Tests/CustomCode/VolumetricHeatCapacityTests.cs @@ -23,16 +23,14 @@ namespace UnitsNet.Tests.CustomCode { public class VolumetricHeatCapacityTests : VolumetricHeatCapacityTestsBase { - protected override bool SupportsSIUnitSystem => false; - protected override double JoulesPerCubicMeterKelvinInOneJoulePerCubicMeterKelvin => 1; protected override double KilojoulesPerCubicMeterKelvinInOneJoulePerCubicMeterKelvin => 1E-3; protected override double MegajoulesPerCubicMeterKelvinInOneJoulePerCubicMeterKelvin => 1E-6; protected override double BtusPerCubicFootDegreeFahrenheitInOneJoulePerCubicMeterKelvin => 1.491066E-5; - protected override double CaloriesPerCubicCentimeterDegreeCelsiusInOneJoulePerCubicMeterKelvin => 2.388459E-7; - protected override double KilocaloriesPerCubicCentimeterDegreeCelsiusInOneJoulePerCubicMeterKelvin => 2.388459E-10; + protected override double CaloriesPerCubicCentimeterDegreeCelsiusInOneJoulePerCubicMeterKelvin => 2.390057361376673E-07; + protected override double KilocaloriesPerCubicCentimeterDegreeCelsiusInOneJoulePerCubicMeterKelvin => 2.390057361376673E-10; protected override double JoulesPerCubicMeterDegreeCelsiusInOneJoulePerCubicMeterKelvin => 1; protected override double KilojoulesPerCubicMeterDegreeCelsiusInOneJoulePerCubicMeterKelvin => 1E-3; diff --git a/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs index 1dffb89af8..9865e36c85 100644 --- a/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs @@ -978,42 +978,42 @@ private bool TryToUnit(HeatFluxUnit unit, [NotNullWhen(true)] out HeatFlux? conv HeatFlux? convertedOrNull = (Unit, unit) switch { // HeatFluxUnit -> BaseUnit - (HeatFluxUnit.BtuPerHourSquareFoot, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 3.15459075, HeatFluxUnit.WattPerSquareMeter), - (HeatFluxUnit.BtuPerMinuteSquareFoot, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1.89275445e2, HeatFluxUnit.WattPerSquareMeter), - (HeatFluxUnit.BtuPerSecondSquareFoot, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1.13565267e4, HeatFluxUnit.WattPerSquareMeter), - (HeatFluxUnit.BtuPerSecondSquareInch, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1.63533984e6, HeatFluxUnit.WattPerSquareMeter), - (HeatFluxUnit.CaloriePerSecondSquareCentimeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 4.1868e4, HeatFluxUnit.WattPerSquareMeter), + (HeatFluxUnit.BtuPerHourSquareFoot, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1055.05585262 / (0.3048 * 0.3048 * 3600), HeatFluxUnit.WattPerSquareMeter), + (HeatFluxUnit.BtuPerMinuteSquareFoot, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1055.05585262 / (0.3048 * 0.3048 * 60), HeatFluxUnit.WattPerSquareMeter), + (HeatFluxUnit.BtuPerSecondSquareFoot, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1055.05585262 / (0.3048 * 0.3048), HeatFluxUnit.WattPerSquareMeter), + (HeatFluxUnit.BtuPerSecondSquareInch, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1055.05585262 / (2.54e-2 * 2.54e-2), HeatFluxUnit.WattPerSquareMeter), + (HeatFluxUnit.CaloriePerSecondSquareCentimeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 4.184e4, HeatFluxUnit.WattPerSquareMeter), (HeatFluxUnit.CentiwattPerSquareMeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux((_value) * 1e-2d, HeatFluxUnit.WattPerSquareMeter), (HeatFluxUnit.DeciwattPerSquareMeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux((_value) * 1e-1d, HeatFluxUnit.WattPerSquareMeter), - (HeatFluxUnit.KilocaloriePerHourSquareMeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1.163, HeatFluxUnit.WattPerSquareMeter), - (HeatFluxUnit.KilocaloriePerSecondSquareCentimeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux((_value * 4.1868e4) * 1e3d, HeatFluxUnit.WattPerSquareMeter), + (HeatFluxUnit.KilocaloriePerHourSquareMeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 4.184e3 / 3600, HeatFluxUnit.WattPerSquareMeter), + (HeatFluxUnit.KilocaloriePerSecondSquareCentimeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux((_value * 4.184e4) * 1e3d, HeatFluxUnit.WattPerSquareMeter), (HeatFluxUnit.KilowattPerSquareMeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux((_value) * 1e3d, HeatFluxUnit.WattPerSquareMeter), (HeatFluxUnit.MicrowattPerSquareMeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux((_value) * 1e-6d, HeatFluxUnit.WattPerSquareMeter), (HeatFluxUnit.MilliwattPerSquareMeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux((_value) * 1e-3d, HeatFluxUnit.WattPerSquareMeter), (HeatFluxUnit.NanowattPerSquareMeter, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux((_value) * 1e-9d, HeatFluxUnit.WattPerSquareMeter), - (HeatFluxUnit.PoundForcePerFootSecond, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1.459390293720636e1, HeatFluxUnit.WattPerSquareMeter), + (HeatFluxUnit.PoundForcePerFootSecond, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1.3558179483314004 / 9.290304e-2, HeatFluxUnit.WattPerSquareMeter), (HeatFluxUnit.PoundPerSecondCubed, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 4.5359237e-1, HeatFluxUnit.WattPerSquareMeter), - (HeatFluxUnit.WattPerSquareFoot, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1.07639e1, HeatFluxUnit.WattPerSquareMeter), - (HeatFluxUnit.WattPerSquareInch, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value * 1.5500031e3, HeatFluxUnit.WattPerSquareMeter), + (HeatFluxUnit.WattPerSquareFoot, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value / (0.3048 * 0.3048), HeatFluxUnit.WattPerSquareMeter), + (HeatFluxUnit.WattPerSquareInch, HeatFluxUnit.WattPerSquareMeter) => new HeatFlux(_value / (2.54e-2 * 2.54e-2), HeatFluxUnit.WattPerSquareMeter), // BaseUnit -> HeatFluxUnit - (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.BtuPerHourSquareFoot) => new HeatFlux(_value / 3.15459075, HeatFluxUnit.BtuPerHourSquareFoot), - (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.BtuPerMinuteSquareFoot) => new HeatFlux(_value / 1.89275445e2, HeatFluxUnit.BtuPerMinuteSquareFoot), - (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.BtuPerSecondSquareFoot) => new HeatFlux(_value / 1.13565267e4, HeatFluxUnit.BtuPerSecondSquareFoot), - (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.BtuPerSecondSquareInch) => new HeatFlux(_value / 1.63533984e6, HeatFluxUnit.BtuPerSecondSquareInch), - (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.CaloriePerSecondSquareCentimeter) => new HeatFlux(_value / 4.1868e4, HeatFluxUnit.CaloriePerSecondSquareCentimeter), + (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.BtuPerHourSquareFoot) => new HeatFlux(_value * (0.3048 * 0.3048 * 3600) / 1055.05585262, HeatFluxUnit.BtuPerHourSquareFoot), + (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.BtuPerMinuteSquareFoot) => new HeatFlux(_value * (0.3048 * 0.3048 * 60) / 1055.05585262, HeatFluxUnit.BtuPerMinuteSquareFoot), + (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.BtuPerSecondSquareFoot) => new HeatFlux(_value * (0.3048 * 0.3048) / 1055.05585262, HeatFluxUnit.BtuPerSecondSquareFoot), + (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.BtuPerSecondSquareInch) => new HeatFlux(_value * (2.54e-2 * 2.54e-2) / 1055.05585262, HeatFluxUnit.BtuPerSecondSquareInch), + (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.CaloriePerSecondSquareCentimeter) => new HeatFlux(_value / 4.184e4, HeatFluxUnit.CaloriePerSecondSquareCentimeter), (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.CentiwattPerSquareMeter) => new HeatFlux((_value) / 1e-2d, HeatFluxUnit.CentiwattPerSquareMeter), (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.DeciwattPerSquareMeter) => new HeatFlux((_value) / 1e-1d, HeatFluxUnit.DeciwattPerSquareMeter), - (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.KilocaloriePerHourSquareMeter) => new HeatFlux(_value / 1.163, HeatFluxUnit.KilocaloriePerHourSquareMeter), - (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.KilocaloriePerSecondSquareCentimeter) => new HeatFlux((_value / 4.1868e4) / 1e3d, HeatFluxUnit.KilocaloriePerSecondSquareCentimeter), + (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.KilocaloriePerHourSquareMeter) => new HeatFlux(_value * 3600 / 4.184e3, HeatFluxUnit.KilocaloriePerHourSquareMeter), + (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.KilocaloriePerSecondSquareCentimeter) => new HeatFlux((_value / 4.184e4) / 1e3d, HeatFluxUnit.KilocaloriePerSecondSquareCentimeter), (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.KilowattPerSquareMeter) => new HeatFlux((_value) / 1e3d, HeatFluxUnit.KilowattPerSquareMeter), (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.MicrowattPerSquareMeter) => new HeatFlux((_value) / 1e-6d, HeatFluxUnit.MicrowattPerSquareMeter), (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.MilliwattPerSquareMeter) => new HeatFlux((_value) / 1e-3d, HeatFluxUnit.MilliwattPerSquareMeter), (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.NanowattPerSquareMeter) => new HeatFlux((_value) / 1e-9d, HeatFluxUnit.NanowattPerSquareMeter), - (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.PoundForcePerFootSecond) => new HeatFlux(_value / 1.459390293720636e1, HeatFluxUnit.PoundForcePerFootSecond), + (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.PoundForcePerFootSecond) => new HeatFlux(_value * 9.290304e-2 / 1.3558179483314004, HeatFluxUnit.PoundForcePerFootSecond), (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.PoundPerSecondCubed) => new HeatFlux(_value / 4.5359237e-1, HeatFluxUnit.PoundPerSecondCubed), - (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.WattPerSquareFoot) => new HeatFlux(_value / 1.07639e1, HeatFluxUnit.WattPerSquareFoot), - (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.WattPerSquareInch) => new HeatFlux(_value / 1.5500031e3, HeatFluxUnit.WattPerSquareInch), + (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.WattPerSquareFoot) => new HeatFlux(_value * (0.3048 * 0.3048), HeatFluxUnit.WattPerSquareFoot), + (HeatFluxUnit.WattPerSquareMeter, HeatFluxUnit.WattPerSquareInch) => new HeatFlux(_value * (2.54e-2 * 2.54e-2), HeatFluxUnit.WattPerSquareInch), _ => null }; diff --git a/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs b/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs index ddc7f7adeb..fb4ebf6926 100644 --- a/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs @@ -757,15 +757,15 @@ private bool TryToUnit(HeatTransferCoefficientUnit unit, [NotNullWhen(true)] out HeatTransferCoefficient? convertedOrNull = (Unit, unit) switch { // HeatTransferCoefficientUnit -> BaseUnit - (HeatTransferCoefficientUnit.BtuPerHourSquareFootDegreeFahrenheit, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin) => new HeatTransferCoefficient(_value * 5.6782633411134878, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin), - (HeatTransferCoefficientUnit.CaloriePerHourSquareMeterDegreeCelsius, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin) => new HeatTransferCoefficient((_value * 4.1868) / 3600, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin), - (HeatTransferCoefficientUnit.KilocaloriePerHourSquareMeterDegreeCelsius, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin) => new HeatTransferCoefficient(((_value * 4.1868) / 3600) * 1e3d, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin), + (HeatTransferCoefficientUnit.BtuPerHourSquareFootDegreeFahrenheit, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin) => new HeatTransferCoefficient(_value * ((1055.05585262 / (0.3048 * 0.3048 * 3600)) * 1.8), HeatTransferCoefficientUnit.WattPerSquareMeterKelvin), + (HeatTransferCoefficientUnit.CaloriePerHourSquareMeterDegreeCelsius, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin) => new HeatTransferCoefficient((_value * 4.184) / 3600, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin), + (HeatTransferCoefficientUnit.KilocaloriePerHourSquareMeterDegreeCelsius, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin) => new HeatTransferCoefficient(((_value * 4.184) / 3600) * 1e3d, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin), (HeatTransferCoefficientUnit.WattPerSquareMeterCelsius, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin) => new HeatTransferCoefficient(_value, HeatTransferCoefficientUnit.WattPerSquareMeterKelvin), // BaseUnit -> HeatTransferCoefficientUnit - (HeatTransferCoefficientUnit.WattPerSquareMeterKelvin, HeatTransferCoefficientUnit.BtuPerHourSquareFootDegreeFahrenheit) => new HeatTransferCoefficient(_value / 5.6782633411134878, HeatTransferCoefficientUnit.BtuPerHourSquareFootDegreeFahrenheit), - (HeatTransferCoefficientUnit.WattPerSquareMeterKelvin, HeatTransferCoefficientUnit.CaloriePerHourSquareMeterDegreeCelsius) => new HeatTransferCoefficient((_value / 4.1868) * 3600, HeatTransferCoefficientUnit.CaloriePerHourSquareMeterDegreeCelsius), - (HeatTransferCoefficientUnit.WattPerSquareMeterKelvin, HeatTransferCoefficientUnit.KilocaloriePerHourSquareMeterDegreeCelsius) => new HeatTransferCoefficient(((_value / 4.1868) * 3600) / 1e3d, HeatTransferCoefficientUnit.KilocaloriePerHourSquareMeterDegreeCelsius), + (HeatTransferCoefficientUnit.WattPerSquareMeterKelvin, HeatTransferCoefficientUnit.BtuPerHourSquareFootDegreeFahrenheit) => new HeatTransferCoefficient(_value / ((1055.05585262 / (0.3048 * 0.3048 * 3600)) * 1.8), HeatTransferCoefficientUnit.BtuPerHourSquareFootDegreeFahrenheit), + (HeatTransferCoefficientUnit.WattPerSquareMeterKelvin, HeatTransferCoefficientUnit.CaloriePerHourSquareMeterDegreeCelsius) => new HeatTransferCoefficient((_value / 4.184) * 3600, HeatTransferCoefficientUnit.CaloriePerHourSquareMeterDegreeCelsius), + (HeatTransferCoefficientUnit.WattPerSquareMeterKelvin, HeatTransferCoefficientUnit.KilocaloriePerHourSquareMeterDegreeCelsius) => new HeatTransferCoefficient(((_value / 4.184) * 3600) / 1e3d, HeatTransferCoefficientUnit.KilocaloriePerHourSquareMeterDegreeCelsius), (HeatTransferCoefficientUnit.WattPerSquareMeterKelvin, HeatTransferCoefficientUnit.WattPerSquareMeterCelsius) => new HeatTransferCoefficient(_value, HeatTransferCoefficientUnit.WattPerSquareMeterCelsius), _ => null diff --git a/UnitsNet/GeneratedCode/Quantities/Impulse.g.cs b/UnitsNet/GeneratedCode/Quantities/Impulse.g.cs index 18315af782..79a31157eb 100644 --- a/UnitsNet/GeneratedCode/Quantities/Impulse.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Impulse.g.cs @@ -894,9 +894,9 @@ private bool TryToUnit(ImpulseUnit unit, [NotNullWhen(true)] out Impulse? conver (ImpulseUnit.MicronewtonSecond, ImpulseUnit.NewtonSecond) => new Impulse((_value) * 1e-6d, ImpulseUnit.NewtonSecond), (ImpulseUnit.MillinewtonSecond, ImpulseUnit.NewtonSecond) => new Impulse((_value) * 1e-3d, ImpulseUnit.NewtonSecond), (ImpulseUnit.NanonewtonSecond, ImpulseUnit.NewtonSecond) => new Impulse((_value) * 1e-9d, ImpulseUnit.NewtonSecond), - (ImpulseUnit.PoundFootPerSecond, ImpulseUnit.NewtonSecond) => new Impulse(_value / 7.230657989877, ImpulseUnit.NewtonSecond), - (ImpulseUnit.PoundForceSecond, ImpulseUnit.NewtonSecond) => new Impulse(_value / 0.2248089430997, ImpulseUnit.NewtonSecond), - (ImpulseUnit.SlugFootPerSecond, ImpulseUnit.NewtonSecond) => new Impulse(_value / 0.224735720691, ImpulseUnit.NewtonSecond), + (ImpulseUnit.PoundFootPerSecond, ImpulseUnit.NewtonSecond) => new Impulse(_value * (0.45359237 * 0.3048), ImpulseUnit.NewtonSecond), + (ImpulseUnit.PoundForceSecond, ImpulseUnit.NewtonSecond) => new Impulse(_value * 0.45359237 * 9.80665, ImpulseUnit.NewtonSecond), + (ImpulseUnit.SlugFootPerSecond, ImpulseUnit.NewtonSecond) => new Impulse(_value * (0.45359237 * 9.80665), ImpulseUnit.NewtonSecond), // BaseUnit -> ImpulseUnit (ImpulseUnit.NewtonSecond, ImpulseUnit.CentinewtonSecond) => new Impulse((_value) / 1e-2d, ImpulseUnit.CentinewtonSecond), @@ -908,9 +908,9 @@ private bool TryToUnit(ImpulseUnit unit, [NotNullWhen(true)] out Impulse? conver (ImpulseUnit.NewtonSecond, ImpulseUnit.MicronewtonSecond) => new Impulse((_value) / 1e-6d, ImpulseUnit.MicronewtonSecond), (ImpulseUnit.NewtonSecond, ImpulseUnit.MillinewtonSecond) => new Impulse((_value) / 1e-3d, ImpulseUnit.MillinewtonSecond), (ImpulseUnit.NewtonSecond, ImpulseUnit.NanonewtonSecond) => new Impulse((_value) / 1e-9d, ImpulseUnit.NanonewtonSecond), - (ImpulseUnit.NewtonSecond, ImpulseUnit.PoundFootPerSecond) => new Impulse(_value * 7.230657989877, ImpulseUnit.PoundFootPerSecond), - (ImpulseUnit.NewtonSecond, ImpulseUnit.PoundForceSecond) => new Impulse(_value * 0.2248089430997, ImpulseUnit.PoundForceSecond), - (ImpulseUnit.NewtonSecond, ImpulseUnit.SlugFootPerSecond) => new Impulse(_value * 0.224735720691, ImpulseUnit.SlugFootPerSecond), + (ImpulseUnit.NewtonSecond, ImpulseUnit.PoundFootPerSecond) => new Impulse(_value / (0.45359237 * 0.3048), ImpulseUnit.PoundFootPerSecond), + (ImpulseUnit.NewtonSecond, ImpulseUnit.PoundForceSecond) => new Impulse(_value / 4.4482216152605, ImpulseUnit.PoundForceSecond), + (ImpulseUnit.NewtonSecond, ImpulseUnit.SlugFootPerSecond) => new Impulse(_value / (0.45359237 * 9.80665), ImpulseUnit.SlugFootPerSecond), _ => null }; diff --git a/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs b/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs index dab7258716..1ad38df36f 100644 --- a/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs @@ -915,7 +915,7 @@ private bool TryToUnit(LuminosityUnit unit, [NotNullWhen(true)] out Luminosity? (LuminosityUnit.Nanowatt, LuminosityUnit.Watt) => new Luminosity((_value) * 1e-9d, LuminosityUnit.Watt), (LuminosityUnit.Petawatt, LuminosityUnit.Watt) => new Luminosity((_value) * 1e15d, LuminosityUnit.Watt), (LuminosityUnit.Picowatt, LuminosityUnit.Watt) => new Luminosity((_value) * 1e-12d, LuminosityUnit.Watt), - (LuminosityUnit.SolarLuminosity, LuminosityUnit.Watt) => new Luminosity(_value * 3.846e26, LuminosityUnit.Watt), + (LuminosityUnit.SolarLuminosity, LuminosityUnit.Watt) => new Luminosity(_value * 3.828e26, LuminosityUnit.Watt), (LuminosityUnit.Terawatt, LuminosityUnit.Watt) => new Luminosity((_value) * 1e12d, LuminosityUnit.Watt), // BaseUnit -> LuminosityUnit @@ -930,7 +930,7 @@ private bool TryToUnit(LuminosityUnit unit, [NotNullWhen(true)] out Luminosity? (LuminosityUnit.Watt, LuminosityUnit.Nanowatt) => new Luminosity((_value) / 1e-9d, LuminosityUnit.Nanowatt), (LuminosityUnit.Watt, LuminosityUnit.Petawatt) => new Luminosity((_value) / 1e15d, LuminosityUnit.Petawatt), (LuminosityUnit.Watt, LuminosityUnit.Picowatt) => new Luminosity((_value) / 1e-12d, LuminosityUnit.Picowatt), - (LuminosityUnit.Watt, LuminosityUnit.SolarLuminosity) => new Luminosity(_value / 3.846e26, LuminosityUnit.SolarLuminosity), + (LuminosityUnit.Watt, LuminosityUnit.SolarLuminosity) => new Luminosity(_value / 3.828e26, LuminosityUnit.SolarLuminosity), (LuminosityUnit.Watt, LuminosityUnit.Terawatt) => new Luminosity((_value) / 1e12d, LuminosityUnit.Terawatt), _ => null diff --git a/UnitsNet/GeneratedCode/Quantities/Power.g.cs b/UnitsNet/GeneratedCode/Quantities/Power.g.cs index 2b49b4d35b..08b52a0aff 100644 --- a/UnitsNet/GeneratedCode/Quantities/Power.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Power.g.cs @@ -1214,7 +1214,7 @@ private bool TryToUnit(PowerUnit unit, [NotNullWhen(true)] out Power? converted) { // PowerUnit -> BaseUnit (PowerUnit.BoilerHorsepower, PowerUnit.Watt) => new Power(_value * 9812.5, PowerUnit.Watt), - (PowerUnit.BritishThermalUnitPerHour, PowerUnit.Watt) => new Power(_value * 0.29307107017, PowerUnit.Watt), + (PowerUnit.BritishThermalUnitPerHour, PowerUnit.Watt) => new Power(_value * 1055.05585262 / 3600, PowerUnit.Watt), (PowerUnit.Decawatt, PowerUnit.Watt) => new Power((_value) * 1e1d, PowerUnit.Watt), (PowerUnit.Deciwatt, PowerUnit.Watt) => new Power((_value) * 1e-1d, PowerUnit.Watt), (PowerUnit.ElectricalHorsepower, PowerUnit.Watt) => new Power(_value * 746, PowerUnit.Watt), @@ -1223,11 +1223,11 @@ private bool TryToUnit(PowerUnit unit, [NotNullWhen(true)] out Power? converted) (PowerUnit.Gigawatt, PowerUnit.Watt) => new Power((_value) * 1e9d, PowerUnit.Watt), (PowerUnit.HydraulicHorsepower, PowerUnit.Watt) => new Power(_value * 745.69988145, PowerUnit.Watt), (PowerUnit.JoulePerHour, PowerUnit.Watt) => new Power(_value / 3600, PowerUnit.Watt), - (PowerUnit.KilobritishThermalUnitPerHour, PowerUnit.Watt) => new Power((_value * 0.29307107017) * 1e3d, PowerUnit.Watt), + (PowerUnit.KilobritishThermalUnitPerHour, PowerUnit.Watt) => new Power((_value * 1055.05585262 / 3600) * 1e3d, PowerUnit.Watt), (PowerUnit.KilojoulePerHour, PowerUnit.Watt) => new Power((_value / 3600) * 1e3d, PowerUnit.Watt), (PowerUnit.Kilowatt, PowerUnit.Watt) => new Power((_value) * 1e3d, PowerUnit.Watt), - (PowerUnit.MechanicalHorsepower, PowerUnit.Watt) => new Power(_value * 745.69, PowerUnit.Watt), - (PowerUnit.MegabritishThermalUnitPerHour, PowerUnit.Watt) => new Power((_value * 0.29307107017) * 1e6d, PowerUnit.Watt), + (PowerUnit.MechanicalHorsepower, PowerUnit.Watt) => new Power(_value * 76.0402249 * 9.80665, PowerUnit.Watt), + (PowerUnit.MegabritishThermalUnitPerHour, PowerUnit.Watt) => new Power((_value * 1055.05585262 / 3600) * 1e6d, PowerUnit.Watt), (PowerUnit.MegajoulePerHour, PowerUnit.Watt) => new Power((_value / 3600) * 1e6d, PowerUnit.Watt), (PowerUnit.Megawatt, PowerUnit.Watt) => new Power((_value) * 1e6d, PowerUnit.Watt), (PowerUnit.MetricHorsepower, PowerUnit.Watt) => new Power(_value * 735.49875, PowerUnit.Watt), @@ -1242,7 +1242,7 @@ private bool TryToUnit(PowerUnit unit, [NotNullWhen(true)] out Power? converted) // BaseUnit -> PowerUnit (PowerUnit.Watt, PowerUnit.BoilerHorsepower) => new Power(_value / 9812.5, PowerUnit.BoilerHorsepower), - (PowerUnit.Watt, PowerUnit.BritishThermalUnitPerHour) => new Power(_value / 0.29307107017, PowerUnit.BritishThermalUnitPerHour), + (PowerUnit.Watt, PowerUnit.BritishThermalUnitPerHour) => new Power(_value * 3600 / 1055.05585262, PowerUnit.BritishThermalUnitPerHour), (PowerUnit.Watt, PowerUnit.Decawatt) => new Power((_value) / 1e1d, PowerUnit.Decawatt), (PowerUnit.Watt, PowerUnit.Deciwatt) => new Power((_value) / 1e-1d, PowerUnit.Deciwatt), (PowerUnit.Watt, PowerUnit.ElectricalHorsepower) => new Power(_value / 746, PowerUnit.ElectricalHorsepower), @@ -1251,11 +1251,11 @@ private bool TryToUnit(PowerUnit unit, [NotNullWhen(true)] out Power? converted) (PowerUnit.Watt, PowerUnit.Gigawatt) => new Power((_value) / 1e9d, PowerUnit.Gigawatt), (PowerUnit.Watt, PowerUnit.HydraulicHorsepower) => new Power(_value / 745.69988145, PowerUnit.HydraulicHorsepower), (PowerUnit.Watt, PowerUnit.JoulePerHour) => new Power(_value * 3600, PowerUnit.JoulePerHour), - (PowerUnit.Watt, PowerUnit.KilobritishThermalUnitPerHour) => new Power((_value / 0.29307107017) / 1e3d, PowerUnit.KilobritishThermalUnitPerHour), + (PowerUnit.Watt, PowerUnit.KilobritishThermalUnitPerHour) => new Power((_value * 3600 / 1055.05585262) / 1e3d, PowerUnit.KilobritishThermalUnitPerHour), (PowerUnit.Watt, PowerUnit.KilojoulePerHour) => new Power((_value * 3600) / 1e3d, PowerUnit.KilojoulePerHour), (PowerUnit.Watt, PowerUnit.Kilowatt) => new Power((_value) / 1e3d, PowerUnit.Kilowatt), - (PowerUnit.Watt, PowerUnit.MechanicalHorsepower) => new Power(_value / 745.69, PowerUnit.MechanicalHorsepower), - (PowerUnit.Watt, PowerUnit.MegabritishThermalUnitPerHour) => new Power((_value / 0.29307107017) / 1e6d, PowerUnit.MegabritishThermalUnitPerHour), + (PowerUnit.Watt, PowerUnit.MechanicalHorsepower) => new Power(_value / (76.0402249 * 9.80665), PowerUnit.MechanicalHorsepower), + (PowerUnit.Watt, PowerUnit.MegabritishThermalUnitPerHour) => new Power((_value * 3600 / 1055.05585262) / 1e6d, PowerUnit.MegabritishThermalUnitPerHour), (PowerUnit.Watt, PowerUnit.MegajoulePerHour) => new Power((_value * 3600) / 1e6d, PowerUnit.MegajoulePerHour), (PowerUnit.Watt, PowerUnit.Megawatt) => new Power((_value) / 1e6d, PowerUnit.Megawatt), (PowerUnit.Watt, PowerUnit.MetricHorsepower) => new Power(_value / 735.49875, PowerUnit.MetricHorsepower), diff --git a/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs b/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs index f272a1051c..18abcc4988 100644 --- a/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs @@ -1540,101 +1540,101 @@ private bool TryToUnit(PressureUnit unit, [NotNullWhen(true)] out Pressure? conv (PressureUnit.Atmosphere, PressureUnit.Pascal) => new Pressure(_value * 1.01325 * 1e5, PressureUnit.Pascal), (PressureUnit.Bar, PressureUnit.Pascal) => new Pressure(_value * 1e5, PressureUnit.Pascal), (PressureUnit.Centibar, PressureUnit.Pascal) => new Pressure((_value * 1e5) * 1e-2d, PressureUnit.Pascal), - (PressureUnit.CentimeterOfWaterColumn, PressureUnit.Pascal) => new Pressure((_value * 9.806650000000272e3) * 1e-2d, PressureUnit.Pascal), + (PressureUnit.CentimeterOfWaterColumn, PressureUnit.Pascal) => new Pressure((_value * 9.80665e3) * 1e-2d, PressureUnit.Pascal), (PressureUnit.Decapascal, PressureUnit.Pascal) => new Pressure((_value) * 1e1d, PressureUnit.Pascal), (PressureUnit.Decibar, PressureUnit.Pascal) => new Pressure((_value * 1e5) * 1e-1d, PressureUnit.Pascal), (PressureUnit.DynePerSquareCentimeter, PressureUnit.Pascal) => new Pressure(_value * 1.0e-1, PressureUnit.Pascal), (PressureUnit.FootOfElevation, PressureUnit.Pascal) => new Pressure(Math.Pow(1.0 - (_value / 145366.45), 5.2553026003237266401799415610351) * 101325.0, PressureUnit.Pascal), - (PressureUnit.FootOfHead, PressureUnit.Pascal) => new Pressure(_value * 2989.0669, PressureUnit.Pascal), + (PressureUnit.FootOfHead, PressureUnit.Pascal) => new Pressure(_value * 9804.139432 * 0.3048, PressureUnit.Pascal), (PressureUnit.Gigapascal, PressureUnit.Pascal) => new Pressure((_value) * 1e9d, PressureUnit.Pascal), (PressureUnit.Hectopascal, PressureUnit.Pascal) => new Pressure((_value) * 1e2d, PressureUnit.Pascal), - (PressureUnit.InchOfMercury, PressureUnit.Pascal) => new Pressure(_value / 2.95299830714159e-4, PressureUnit.Pascal), - (PressureUnit.InchOfWaterColumn, PressureUnit.Pascal) => new Pressure(_value * 249.08890833333, PressureUnit.Pascal), + (PressureUnit.InchOfMercury, PressureUnit.Pascal) => new Pressure(_value * 2.54e1 * 133.322387415, PressureUnit.Pascal), + (PressureUnit.InchOfWaterColumn, PressureUnit.Pascal) => new Pressure(_value * 2.54e-2 * 9.80665e3, PressureUnit.Pascal), (PressureUnit.Kilobar, PressureUnit.Pascal) => new Pressure((_value * 1e5) * 1e3d, PressureUnit.Pascal), (PressureUnit.KilogramForcePerSquareCentimeter, PressureUnit.Pascal) => new Pressure(_value * 9.80665e4, PressureUnit.Pascal), - (PressureUnit.KilogramForcePerSquareMeter, PressureUnit.Pascal) => new Pressure(_value * 9.80665019960652, PressureUnit.Pascal), + (PressureUnit.KilogramForcePerSquareMeter, PressureUnit.Pascal) => new Pressure(_value * 9.80665, PressureUnit.Pascal), (PressureUnit.KilogramForcePerSquareMillimeter, PressureUnit.Pascal) => new Pressure(_value * 9.80665e6, PressureUnit.Pascal), (PressureUnit.KilonewtonPerSquareCentimeter, PressureUnit.Pascal) => new Pressure((_value * 1e4) * 1e3d, PressureUnit.Pascal), (PressureUnit.KilonewtonPerSquareMeter, PressureUnit.Pascal) => new Pressure((_value) * 1e3d, PressureUnit.Pascal), (PressureUnit.KilonewtonPerSquareMillimeter, PressureUnit.Pascal) => new Pressure((_value * 1e6) * 1e3d, PressureUnit.Pascal), (PressureUnit.Kilopascal, PressureUnit.Pascal) => new Pressure((_value) * 1e3d, PressureUnit.Pascal), - (PressureUnit.KilopoundForcePerSquareFoot, PressureUnit.Pascal) => new Pressure((_value * 4.788025898033584e1) * 1e3d, PressureUnit.Pascal), - (PressureUnit.KilopoundForcePerSquareInch, PressureUnit.Pascal) => new Pressure((_value * 6.894757293168361e3) * 1e3d, PressureUnit.Pascal), - (PressureUnit.KilopoundForcePerSquareMil, PressureUnit.Pascal) => new Pressure((_value * 6.894757293168361e9) * 1e3d, PressureUnit.Pascal), + (PressureUnit.KilopoundForcePerSquareFoot, PressureUnit.Pascal) => new Pressure((_value * 4.4482216152605 / 9.290304e-2) * 1e3d, PressureUnit.Pascal), + (PressureUnit.KilopoundForcePerSquareInch, PressureUnit.Pascal) => new Pressure((_value * 4.4482216152605 / 0.00064516) * 1e3d, PressureUnit.Pascal), + (PressureUnit.KilopoundForcePerSquareMil, PressureUnit.Pascal) => new Pressure((_value * 4.4482216152605 / (2.54e-5 * 2.54e-5)) * 1e3d, PressureUnit.Pascal), (PressureUnit.Megabar, PressureUnit.Pascal) => new Pressure((_value * 1e5) * 1e6d, PressureUnit.Pascal), (PressureUnit.MeganewtonPerSquareMeter, PressureUnit.Pascal) => new Pressure((_value) * 1e6d, PressureUnit.Pascal), (PressureUnit.Megapascal, PressureUnit.Pascal) => new Pressure((_value) * 1e6d, PressureUnit.Pascal), (PressureUnit.MeterOfElevation, PressureUnit.Pascal) => new Pressure(Math.Pow(1.0 - (_value / 44307.69396), 5.2553026003237266401799415610351) * 101325.0, PressureUnit.Pascal), (PressureUnit.MeterOfHead, PressureUnit.Pascal) => new Pressure(_value * 9804.139432, PressureUnit.Pascal), - (PressureUnit.MeterOfWaterColumn, PressureUnit.Pascal) => new Pressure(_value * 9.806650000000272e3, PressureUnit.Pascal), + (PressureUnit.MeterOfWaterColumn, PressureUnit.Pascal) => new Pressure(_value * 9.80665e3, PressureUnit.Pascal), (PressureUnit.Microbar, PressureUnit.Pascal) => new Pressure((_value * 1e5) * 1e-6d, PressureUnit.Pascal), (PressureUnit.Micropascal, PressureUnit.Pascal) => new Pressure((_value) * 1e-6d, PressureUnit.Pascal), (PressureUnit.Millibar, PressureUnit.Pascal) => new Pressure((_value * 1e5) * 1e-3d, PressureUnit.Pascal), - (PressureUnit.MillimeterOfMercury, PressureUnit.Pascal) => new Pressure(_value / 7.50061561302643e-3, PressureUnit.Pascal), - (PressureUnit.MillimeterOfWaterColumn, PressureUnit.Pascal) => new Pressure((_value * 9.806650000000272e3) * 1e-3d, PressureUnit.Pascal), + (PressureUnit.MillimeterOfMercury, PressureUnit.Pascal) => new Pressure(_value * 133.322387415, PressureUnit.Pascal), + (PressureUnit.MillimeterOfWaterColumn, PressureUnit.Pascal) => new Pressure((_value * 9.80665e3) * 1e-3d, PressureUnit.Pascal), (PressureUnit.Millipascal, PressureUnit.Pascal) => new Pressure((_value) * 1e-3d, PressureUnit.Pascal), (PressureUnit.NewtonPerSquareCentimeter, PressureUnit.Pascal) => new Pressure(_value * 1e4, PressureUnit.Pascal), (PressureUnit.NewtonPerSquareMeter, PressureUnit.Pascal) => new Pressure(_value, PressureUnit.Pascal), (PressureUnit.NewtonPerSquareMillimeter, PressureUnit.Pascal) => new Pressure(_value * 1e6, PressureUnit.Pascal), - (PressureUnit.PoundForcePerSquareFoot, PressureUnit.Pascal) => new Pressure(_value * 4.788025898033584e1, PressureUnit.Pascal), - (PressureUnit.PoundForcePerSquareInch, PressureUnit.Pascal) => new Pressure(_value * 6.894757293168361e3, PressureUnit.Pascal), - (PressureUnit.PoundForcePerSquareMil, PressureUnit.Pascal) => new Pressure(_value * 6.894757293168361e9, PressureUnit.Pascal), - (PressureUnit.PoundPerInchSecondSquared, PressureUnit.Pascal) => new Pressure(_value * 1.785796732283465e1, PressureUnit.Pascal), - (PressureUnit.TechnicalAtmosphere, PressureUnit.Pascal) => new Pressure(_value * 9.80680592331 * 1e4, PressureUnit.Pascal), + (PressureUnit.PoundForcePerSquareFoot, PressureUnit.Pascal) => new Pressure(_value * 4.4482216152605 / 9.290304e-2, PressureUnit.Pascal), + (PressureUnit.PoundForcePerSquareInch, PressureUnit.Pascal) => new Pressure(_value * 4.4482216152605 / 0.00064516, PressureUnit.Pascal), + (PressureUnit.PoundForcePerSquareMil, PressureUnit.Pascal) => new Pressure(_value * 4.4482216152605 / (2.54e-5 * 2.54e-5), PressureUnit.Pascal), + (PressureUnit.PoundPerInchSecondSquared, PressureUnit.Pascal) => new Pressure(_value * (4.4482216152605 / 0.00064516) / 386.0886, PressureUnit.Pascal), + (PressureUnit.TechnicalAtmosphere, PressureUnit.Pascal) => new Pressure(_value * 9.80665e4, PressureUnit.Pascal), (PressureUnit.TonneForcePerSquareCentimeter, PressureUnit.Pascal) => new Pressure(_value * 9.80665e7, PressureUnit.Pascal), (PressureUnit.TonneForcePerSquareMeter, PressureUnit.Pascal) => new Pressure(_value * 9.80665e3, PressureUnit.Pascal), (PressureUnit.TonneForcePerSquareMillimeter, PressureUnit.Pascal) => new Pressure(_value * 9.80665e9, PressureUnit.Pascal), - (PressureUnit.Torr, PressureUnit.Pascal) => new Pressure(_value * 1.3332266752 * 1e2, PressureUnit.Pascal), + (PressureUnit.Torr, PressureUnit.Pascal) => new Pressure(_value * 101325 / 760, PressureUnit.Pascal), // BaseUnit -> PressureUnit (PressureUnit.Pascal, PressureUnit.Atmosphere) => new Pressure(_value / (1.01325 * 1e5), PressureUnit.Atmosphere), (PressureUnit.Pascal, PressureUnit.Bar) => new Pressure(_value / 1e5, PressureUnit.Bar), (PressureUnit.Pascal, PressureUnit.Centibar) => new Pressure((_value / 1e5) / 1e-2d, PressureUnit.Centibar), - (PressureUnit.Pascal, PressureUnit.CentimeterOfWaterColumn) => new Pressure((_value / 9.806650000000272e3) / 1e-2d, PressureUnit.CentimeterOfWaterColumn), + (PressureUnit.Pascal, PressureUnit.CentimeterOfWaterColumn) => new Pressure((_value / 9.80665e3) / 1e-2d, PressureUnit.CentimeterOfWaterColumn), (PressureUnit.Pascal, PressureUnit.Decapascal) => new Pressure((_value) / 1e1d, PressureUnit.Decapascal), (PressureUnit.Pascal, PressureUnit.Decibar) => new Pressure((_value / 1e5) / 1e-1d, PressureUnit.Decibar), (PressureUnit.Pascal, PressureUnit.DynePerSquareCentimeter) => new Pressure(_value / 1.0e-1, PressureUnit.DynePerSquareCentimeter), (PressureUnit.Pascal, PressureUnit.FootOfElevation) => new Pressure((1.0 - Math.Pow(_value / 101325.0, 0.190284)) * 145366.45, PressureUnit.FootOfElevation), - (PressureUnit.Pascal, PressureUnit.FootOfHead) => new Pressure(_value * 0.000334552565551, PressureUnit.FootOfHead), + (PressureUnit.Pascal, PressureUnit.FootOfHead) => new Pressure(_value / (9804.139432 * 0.3048), PressureUnit.FootOfHead), (PressureUnit.Pascal, PressureUnit.Gigapascal) => new Pressure((_value) / 1e9d, PressureUnit.Gigapascal), (PressureUnit.Pascal, PressureUnit.Hectopascal) => new Pressure((_value) / 1e2d, PressureUnit.Hectopascal), - (PressureUnit.Pascal, PressureUnit.InchOfMercury) => new Pressure(_value * 2.95299830714159e-4, PressureUnit.InchOfMercury), - (PressureUnit.Pascal, PressureUnit.InchOfWaterColumn) => new Pressure(_value / 249.08890833333, PressureUnit.InchOfWaterColumn), + (PressureUnit.Pascal, PressureUnit.InchOfMercury) => new Pressure(_value / (2.54e1 * 133.322387415), PressureUnit.InchOfMercury), + (PressureUnit.Pascal, PressureUnit.InchOfWaterColumn) => new Pressure(_value / (2.54e-2 * 9.80665e3), PressureUnit.InchOfWaterColumn), (PressureUnit.Pascal, PressureUnit.Kilobar) => new Pressure((_value / 1e5) / 1e3d, PressureUnit.Kilobar), (PressureUnit.Pascal, PressureUnit.KilogramForcePerSquareCentimeter) => new Pressure(_value / 9.80665e4, PressureUnit.KilogramForcePerSquareCentimeter), - (PressureUnit.Pascal, PressureUnit.KilogramForcePerSquareMeter) => new Pressure(_value * 0.101971619222242, PressureUnit.KilogramForcePerSquareMeter), + (PressureUnit.Pascal, PressureUnit.KilogramForcePerSquareMeter) => new Pressure(_value / 9.80665, PressureUnit.KilogramForcePerSquareMeter), (PressureUnit.Pascal, PressureUnit.KilogramForcePerSquareMillimeter) => new Pressure(_value / 9.80665e6, PressureUnit.KilogramForcePerSquareMillimeter), (PressureUnit.Pascal, PressureUnit.KilonewtonPerSquareCentimeter) => new Pressure((_value / 1e4) / 1e3d, PressureUnit.KilonewtonPerSquareCentimeter), (PressureUnit.Pascal, PressureUnit.KilonewtonPerSquareMeter) => new Pressure((_value) / 1e3d, PressureUnit.KilonewtonPerSquareMeter), (PressureUnit.Pascal, PressureUnit.KilonewtonPerSquareMillimeter) => new Pressure((_value / 1e6) / 1e3d, PressureUnit.KilonewtonPerSquareMillimeter), (PressureUnit.Pascal, PressureUnit.Kilopascal) => new Pressure((_value) / 1e3d, PressureUnit.Kilopascal), - (PressureUnit.Pascal, PressureUnit.KilopoundForcePerSquareFoot) => new Pressure((_value / 4.788025898033584e1) / 1e3d, PressureUnit.KilopoundForcePerSquareFoot), - (PressureUnit.Pascal, PressureUnit.KilopoundForcePerSquareInch) => new Pressure((_value / 6.894757293168361e3) / 1e3d, PressureUnit.KilopoundForcePerSquareInch), - (PressureUnit.Pascal, PressureUnit.KilopoundForcePerSquareMil) => new Pressure((_value / 6.894757293168361e9) / 1e3d, PressureUnit.KilopoundForcePerSquareMil), + (PressureUnit.Pascal, PressureUnit.KilopoundForcePerSquareFoot) => new Pressure((_value * 9.290304e-2 / 4.4482216152605) / 1e3d, PressureUnit.KilopoundForcePerSquareFoot), + (PressureUnit.Pascal, PressureUnit.KilopoundForcePerSquareInch) => new Pressure((_value * 0.00064516 / 4.4482216152605) / 1e3d, PressureUnit.KilopoundForcePerSquareInch), + (PressureUnit.Pascal, PressureUnit.KilopoundForcePerSquareMil) => new Pressure((_value * (2.54e-5 * 2.54e-5) / 4.4482216152605) / 1e3d, PressureUnit.KilopoundForcePerSquareMil), (PressureUnit.Pascal, PressureUnit.Megabar) => new Pressure((_value / 1e5) / 1e6d, PressureUnit.Megabar), (PressureUnit.Pascal, PressureUnit.MeganewtonPerSquareMeter) => new Pressure((_value) / 1e6d, PressureUnit.MeganewtonPerSquareMeter), (PressureUnit.Pascal, PressureUnit.Megapascal) => new Pressure((_value) / 1e6d, PressureUnit.Megapascal), (PressureUnit.Pascal, PressureUnit.MeterOfElevation) => new Pressure((1.0 - Math.Pow(_value / 101325.0, 0.190284)) * 44307.69396, PressureUnit.MeterOfElevation), - (PressureUnit.Pascal, PressureUnit.MeterOfHead) => new Pressure(_value * 0.0001019977334, PressureUnit.MeterOfHead), - (PressureUnit.Pascal, PressureUnit.MeterOfWaterColumn) => new Pressure(_value / 9.806650000000272e3, PressureUnit.MeterOfWaterColumn), + (PressureUnit.Pascal, PressureUnit.MeterOfHead) => new Pressure(_value / 9804.139432, PressureUnit.MeterOfHead), + (PressureUnit.Pascal, PressureUnit.MeterOfWaterColumn) => new Pressure(_value / 9.80665e3, PressureUnit.MeterOfWaterColumn), (PressureUnit.Pascal, PressureUnit.Microbar) => new Pressure((_value / 1e5) / 1e-6d, PressureUnit.Microbar), (PressureUnit.Pascal, PressureUnit.Micropascal) => new Pressure((_value) / 1e-6d, PressureUnit.Micropascal), (PressureUnit.Pascal, PressureUnit.Millibar) => new Pressure((_value / 1e5) / 1e-3d, PressureUnit.Millibar), - (PressureUnit.Pascal, PressureUnit.MillimeterOfMercury) => new Pressure(_value * 7.50061561302643e-3, PressureUnit.MillimeterOfMercury), - (PressureUnit.Pascal, PressureUnit.MillimeterOfWaterColumn) => new Pressure((_value / 9.806650000000272e3) / 1e-3d, PressureUnit.MillimeterOfWaterColumn), + (PressureUnit.Pascal, PressureUnit.MillimeterOfMercury) => new Pressure(_value / 133.322387415, PressureUnit.MillimeterOfMercury), + (PressureUnit.Pascal, PressureUnit.MillimeterOfWaterColumn) => new Pressure((_value / 9.80665e3) / 1e-3d, PressureUnit.MillimeterOfWaterColumn), (PressureUnit.Pascal, PressureUnit.Millipascal) => new Pressure((_value) / 1e-3d, PressureUnit.Millipascal), (PressureUnit.Pascal, PressureUnit.NewtonPerSquareCentimeter) => new Pressure(_value / 1e4, PressureUnit.NewtonPerSquareCentimeter), (PressureUnit.Pascal, PressureUnit.NewtonPerSquareMeter) => new Pressure(_value, PressureUnit.NewtonPerSquareMeter), (PressureUnit.Pascal, PressureUnit.NewtonPerSquareMillimeter) => new Pressure(_value / 1e6, PressureUnit.NewtonPerSquareMillimeter), - (PressureUnit.Pascal, PressureUnit.PoundForcePerSquareFoot) => new Pressure(_value / 4.788025898033584e1, PressureUnit.PoundForcePerSquareFoot), - (PressureUnit.Pascal, PressureUnit.PoundForcePerSquareInch) => new Pressure(_value / 6.894757293168361e3, PressureUnit.PoundForcePerSquareInch), - (PressureUnit.Pascal, PressureUnit.PoundForcePerSquareMil) => new Pressure(_value / 6.894757293168361e9, PressureUnit.PoundForcePerSquareMil), - (PressureUnit.Pascal, PressureUnit.PoundPerInchSecondSquared) => new Pressure(_value / 1.785796732283465e1, PressureUnit.PoundPerInchSecondSquared), - (PressureUnit.Pascal, PressureUnit.TechnicalAtmosphere) => new Pressure(_value / (9.80680592331 * 1e4), PressureUnit.TechnicalAtmosphere), + (PressureUnit.Pascal, PressureUnit.PoundForcePerSquareFoot) => new Pressure(_value * 9.290304e-2 / 4.4482216152605, PressureUnit.PoundForcePerSquareFoot), + (PressureUnit.Pascal, PressureUnit.PoundForcePerSquareInch) => new Pressure(_value * 0.00064516 / 4.4482216152605, PressureUnit.PoundForcePerSquareInch), + (PressureUnit.Pascal, PressureUnit.PoundForcePerSquareMil) => new Pressure(_value * (2.54e-5 * 2.54e-5) / 4.4482216152605, PressureUnit.PoundForcePerSquareMil), + (PressureUnit.Pascal, PressureUnit.PoundPerInchSecondSquared) => new Pressure(_value * 386.0886 / (4.4482216152605 / 0.00064516), PressureUnit.PoundPerInchSecondSquared), + (PressureUnit.Pascal, PressureUnit.TechnicalAtmosphere) => new Pressure(_value / 9.80665e4, PressureUnit.TechnicalAtmosphere), (PressureUnit.Pascal, PressureUnit.TonneForcePerSquareCentimeter) => new Pressure(_value / 9.80665e7, PressureUnit.TonneForcePerSquareCentimeter), (PressureUnit.Pascal, PressureUnit.TonneForcePerSquareMeter) => new Pressure(_value / 9.80665e3, PressureUnit.TonneForcePerSquareMeter), (PressureUnit.Pascal, PressureUnit.TonneForcePerSquareMillimeter) => new Pressure(_value / 9.80665e9, PressureUnit.TonneForcePerSquareMillimeter), - (PressureUnit.Pascal, PressureUnit.Torr) => new Pressure(_value / (1.3332266752 * 1e2), PressureUnit.Torr), + (PressureUnit.Pascal, PressureUnit.Torr) => new Pressure(_value * 760 / 101325, PressureUnit.Torr), _ => null }; diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs index 901c4578d1..cdf0e56dab 100644 --- a/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs @@ -744,14 +744,14 @@ private bool TryToUnit(SpecificFuelConsumptionUnit unit, [NotNullWhen(true)] out SpecificFuelConsumption? convertedOrNull = (Unit, unit) switch { // SpecificFuelConsumptionUnit -> BaseUnit - (SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond) => new SpecificFuelConsumption(_value * 28.33, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond), + (SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond) => new SpecificFuelConsumption(_value * 453.59237 / (0.0044482216152605 * 3600), SpecificFuelConsumptionUnit.GramPerKilonewtonSecond), (SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond) => new SpecificFuelConsumption((_value) * 1e3d, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond), - (SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond) => new SpecificFuelConsumption(_value * 28.33, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond), + (SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond) => new SpecificFuelConsumption(_value * 453.59237 / (0.0044482216152605 * 3600), SpecificFuelConsumptionUnit.GramPerKilonewtonSecond), // BaseUnit -> SpecificFuelConsumptionUnit - (SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour) => new SpecificFuelConsumption(_value / 28.33, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour), + (SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour) => new SpecificFuelConsumption(_value * (0.0044482216152605 * 3600) / 453.59237, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour), (SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond) => new SpecificFuelConsumption((_value) / 1e3d, SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond), - (SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour) => new SpecificFuelConsumption(_value / 28.33, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour), + (SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour) => new SpecificFuelConsumption(_value * (0.0044482216152605 * 3600) / 453.59237, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour), _ => null }; diff --git a/UnitsNet/GeneratedCode/Quantities/ThermalInsulance.g.cs b/UnitsNet/GeneratedCode/Quantities/ThermalInsulance.g.cs index 4ffbf0ee5c..98cb82a981 100644 --- a/UnitsNet/GeneratedCode/Quantities/ThermalInsulance.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ThermalInsulance.g.cs @@ -773,15 +773,15 @@ private bool TryToUnit(ThermalInsulanceUnit unit, [NotNullWhen(true)] out Therma ThermalInsulance? convertedOrNull = (Unit, unit) switch { // ThermalInsulanceUnit -> BaseUnit - (ThermalInsulanceUnit.HourSquareFeetDegreeFahrenheitPerBtu, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt) => new ThermalInsulance(_value * 176.1121482159839, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt), - (ThermalInsulanceUnit.SquareCentimeterHourDegreeCelsiusPerKilocalorie, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt) => new ThermalInsulance(_value * 0.0859779507590433, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt), + (ThermalInsulanceUnit.HourSquareFeetDegreeFahrenheitPerBtu, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt) => new ThermalInsulance(_value * (1000 * 0.3048 * 0.3048 * 3600) / (1055.05585262 * 1.8), ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt), + (ThermalInsulanceUnit.SquareCentimeterHourDegreeCelsiusPerKilocalorie, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt) => new ThermalInsulance(_value * (0.0001 * 3600) / 4.184, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt), (ThermalInsulanceUnit.SquareCentimeterKelvinPerWatt, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt) => new ThermalInsulance(_value * 0.1, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt), (ThermalInsulanceUnit.SquareMeterDegreeCelsiusPerWatt, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt) => new ThermalInsulance(_value * 1000.0, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt), (ThermalInsulanceUnit.SquareMeterKelvinPerWatt, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt) => new ThermalInsulance(_value * 1000, ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt), // BaseUnit -> ThermalInsulanceUnit - (ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt, ThermalInsulanceUnit.HourSquareFeetDegreeFahrenheitPerBtu) => new ThermalInsulance(_value / 176.1121482159839, ThermalInsulanceUnit.HourSquareFeetDegreeFahrenheitPerBtu), - (ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt, ThermalInsulanceUnit.SquareCentimeterHourDegreeCelsiusPerKilocalorie) => new ThermalInsulance(_value / 0.0859779507590433, ThermalInsulanceUnit.SquareCentimeterHourDegreeCelsiusPerKilocalorie), + (ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt, ThermalInsulanceUnit.HourSquareFeetDegreeFahrenheitPerBtu) => new ThermalInsulance(_value * (1055.05585262 * 1.8) / (1000 * 0.3048 * 0.3048 * 3600), ThermalInsulanceUnit.HourSquareFeetDegreeFahrenheitPerBtu), + (ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt, ThermalInsulanceUnit.SquareCentimeterHourDegreeCelsiusPerKilocalorie) => new ThermalInsulance(_value * 4.184 / (0.0001 * 3600), ThermalInsulanceUnit.SquareCentimeterHourDegreeCelsiusPerKilocalorie), (ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt, ThermalInsulanceUnit.SquareCentimeterKelvinPerWatt) => new ThermalInsulance(_value / 0.1, ThermalInsulanceUnit.SquareCentimeterKelvinPerWatt), (ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt, ThermalInsulanceUnit.SquareMeterDegreeCelsiusPerWatt) => new ThermalInsulance(_value / 1000.0, ThermalInsulanceUnit.SquareMeterDegreeCelsiusPerWatt), (ThermalInsulanceUnit.SquareMeterKelvinPerKilowatt, ThermalInsulanceUnit.SquareMeterKelvinPerWatt) => new ThermalInsulance(_value / 1000, ThermalInsulanceUnit.SquareMeterKelvinPerWatt), diff --git a/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs index 5ae0b34c50..f7c82f84b4 100644 --- a/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs @@ -824,20 +824,20 @@ private bool TryToUnit(VolumetricHeatCapacityUnit unit, [NotNullWhen(true)] out VolumetricHeatCapacity? convertedOrNull = (Unit, unit) switch { // VolumetricHeatCapacityUnit -> BaseUnit - (VolumetricHeatCapacityUnit.BtuPerCubicFootDegreeFahrenheit, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin) => new VolumetricHeatCapacity(_value / 1.4910660e-5, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin), - (VolumetricHeatCapacityUnit.CaloriePerCubicCentimeterDegreeCelsius, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin) => new VolumetricHeatCapacity(_value / 2.388459e-7, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin), + (VolumetricHeatCapacityUnit.BtuPerCubicFootDegreeFahrenheit, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin) => new VolumetricHeatCapacity(_value * (1055.05585262 / 0.028316846592) * 1.8, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin), + (VolumetricHeatCapacityUnit.CaloriePerCubicCentimeterDegreeCelsius, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin) => new VolumetricHeatCapacity(_value * 4.184e6, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin), (VolumetricHeatCapacityUnit.JoulePerCubicMeterDegreeCelsius, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin) => new VolumetricHeatCapacity(_value, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin), - (VolumetricHeatCapacityUnit.KilocaloriePerCubicCentimeterDegreeCelsius, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin) => new VolumetricHeatCapacity((_value / 2.388459e-7) * 1e3d, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin), + (VolumetricHeatCapacityUnit.KilocaloriePerCubicCentimeterDegreeCelsius, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin) => new VolumetricHeatCapacity((_value * 4.184e6) * 1e3d, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin), (VolumetricHeatCapacityUnit.KilojoulePerCubicMeterDegreeCelsius, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin) => new VolumetricHeatCapacity((_value) * 1e3d, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin), (VolumetricHeatCapacityUnit.KilojoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin) => new VolumetricHeatCapacity((_value) * 1e3d, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin), (VolumetricHeatCapacityUnit.MegajoulePerCubicMeterDegreeCelsius, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin) => new VolumetricHeatCapacity((_value) * 1e6d, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin), (VolumetricHeatCapacityUnit.MegajoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin) => new VolumetricHeatCapacity((_value) * 1e6d, VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin), // BaseUnit -> VolumetricHeatCapacityUnit - (VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.BtuPerCubicFootDegreeFahrenheit) => new VolumetricHeatCapacity(_value * 1.4910660e-5, VolumetricHeatCapacityUnit.BtuPerCubicFootDegreeFahrenheit), - (VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.CaloriePerCubicCentimeterDegreeCelsius) => new VolumetricHeatCapacity(_value * 2.388459e-7, VolumetricHeatCapacityUnit.CaloriePerCubicCentimeterDegreeCelsius), + (VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.BtuPerCubicFootDegreeFahrenheit) => new VolumetricHeatCapacity(_value / ((1055.05585262 / 0.028316846592) * 1.8), VolumetricHeatCapacityUnit.BtuPerCubicFootDegreeFahrenheit), + (VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.CaloriePerCubicCentimeterDegreeCelsius) => new VolumetricHeatCapacity(_value / 4.184e6, VolumetricHeatCapacityUnit.CaloriePerCubicCentimeterDegreeCelsius), (VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.JoulePerCubicMeterDegreeCelsius) => new VolumetricHeatCapacity(_value, VolumetricHeatCapacityUnit.JoulePerCubicMeterDegreeCelsius), - (VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.KilocaloriePerCubicCentimeterDegreeCelsius) => new VolumetricHeatCapacity((_value * 2.388459e-7) / 1e3d, VolumetricHeatCapacityUnit.KilocaloriePerCubicCentimeterDegreeCelsius), + (VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.KilocaloriePerCubicCentimeterDegreeCelsius) => new VolumetricHeatCapacity((_value / 4.184e6) / 1e3d, VolumetricHeatCapacityUnit.KilocaloriePerCubicCentimeterDegreeCelsius), (VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.KilojoulePerCubicMeterDegreeCelsius) => new VolumetricHeatCapacity((_value) / 1e3d, VolumetricHeatCapacityUnit.KilojoulePerCubicMeterDegreeCelsius), (VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.KilojoulePerCubicMeterKelvin) => new VolumetricHeatCapacity((_value) / 1e3d, VolumetricHeatCapacityUnit.KilojoulePerCubicMeterKelvin), (VolumetricHeatCapacityUnit.JoulePerCubicMeterKelvin, VolumetricHeatCapacityUnit.MegajoulePerCubicMeterDegreeCelsius) => new VolumetricHeatCapacity((_value) / 1e6d, VolumetricHeatCapacityUnit.MegajoulePerCubicMeterDegreeCelsius), diff --git a/UnitsNet/GeneratedCode/Units/LuminosityUnit.g.cs b/UnitsNet/GeneratedCode/Units/LuminosityUnit.g.cs index 44cdfec58c..f15cfe1cef 100644 --- a/UnitsNet/GeneratedCode/Units/LuminosityUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/LuminosityUnit.g.cs @@ -36,7 +36,11 @@ public enum LuminosityUnit Nanowatt = 9, Petawatt = 10, Picowatt = 11, - /// https://www.britannica.com/science/luminosity + + /// + /// The IAU has defined a nominal solar luminosity of 3.828×10^26 W to promote publication of consistent and comparable values in units of the solar luminosity. + /// + /// https://en.wikipedia.org/wiki/Luminosity#Measurement SolarLuminosity = 12, Terawatt = 13, Watt = 14, diff --git a/UnitsNet/GeneratedCode/Units/PowerUnit.g.cs b/UnitsNet/GeneratedCode/Units/PowerUnit.g.cs index e5b59a40ca..5c6283ec8d 100644 --- a/UnitsNet/GeneratedCode/Units/PowerUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/PowerUnit.g.cs @@ -25,23 +25,48 @@ namespace UnitsNet.Units public enum PowerUnit { + + /// + /// 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. + /// + /// https://en.wikipedia.org/wiki/Horsepower#Boiler_horsepower BoilerHorsepower = 1, BritishThermalUnitPerHour = 2, Decawatt = 3, Deciwatt = 4, + + /// + /// Nameplates on electrical motors show their power output, not the power input (the power delivered at the shaft, not the power consumed to drive the motor). This power output is ordinarily stated in watts or kilowatts. In the United States, the power output is stated in horsepower, which for this purpose is defined as exactly 746 W. + /// + /// https://en.wikipedia.org/wiki/Horsepower#Electrical_horsepower ElectricalHorsepower = 5, Femtowatt = 6, GigajoulePerHour = 7, Gigawatt = 8, + + /// + /// Hydraulic horsepower can represent the power available within hydraulic machinery, power through the down-hole nozzle of a drilling rig, or can be used to estimate the mechanical power needed to generate a known hydraulic flow rate. + /// + /// https://en.wikipedia.org/wiki/Horsepower#Hydraulic_horsepower HydraulicHorsepower = 9, JoulePerHour = 10, KilobritishThermalUnitPerHour = 11, KilojoulePerHour = 12, Kilowatt = 13, + + /// + /// Assuming the third CGPM (1901, CR 70) definition of standard gravity, gn = 9.80665 m/s2, is used to define the pound-force as well as the kilogram force, and the international avoirdupois pound (1959), one imperial horsepower is: 76.0402249 × 9.80665 kg⋅m2/s3 + /// + /// https://en.wikipedia.org/wiki/Horsepower#Imperial_horsepower MechanicalHorsepower = 14, MegabritishThermalUnitPerHour = 15, MegajoulePerHour = 16, Megawatt = 17, + + /// + /// DIN 66036 defines one metric horsepower as the power to raise a mass of 75 kilograms against the Earth's gravitational force over a distance of one metre in one second:[18] 75 kg × 9.80665 m/s2 × 1 m / 1 s = 75 kgf⋅m/s = 1 PS. This is equivalent to 735.49875 W, or 98.6% of an imperial horsepower. + /// + /// https://en.wikipedia.org/wiki/Horsepower#Metric_horsepower_(PS,_KM,_cv,_hk,_pk,_k,_ks,_ch) MetricHorsepower = 18, Microwatt = 19, MillijoulePerHour = 20, diff --git a/UnitsNet/GeneratedCode/Units/PressureUnit.g.cs b/UnitsNet/GeneratedCode/Units/PressureUnit.g.cs index 69a642d708..175f6dbcc5 100644 --- a/UnitsNet/GeneratedCode/Units/PressureUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/PressureUnit.g.cs @@ -25,7 +25,17 @@ namespace UnitsNet.Units public enum PressureUnit { + + /// + /// The standard atmosphere (symbol: atm) is a unit of pressure defined as 101325 Pa. It is sometimes used as a reference pressure or standard pressure. It is approximately equal to Earth's average atmospheric pressure at sea level. + /// + /// https://en.wikipedia.org/wiki/Standard_atmosphere_(unit) Atmosphere = 1, + + /// + /// The bar is a metric unit of pressure defined as 100,000 Pa (100 kPa), though not part of the International System of Units (SI). A pressure of 1 bar is slightly less than the current average atmospheric pressure on Earth at sea level (approximately 1.013 bar). + /// + /// https://en.wikipedia.org/wiki/Bar_(unit) Bar = 2, Centibar = 3, CentimeterOfWaterColumn = 48, @@ -36,9 +46,24 @@ public enum PressureUnit FootOfHead = 8, Gigapascal = 9, Hectopascal = 10, + + /// + /// Inch of mercury (inHg and ″Hg) is a non-SI unit of measurement for pressure. It is used for barometric pressure in weather reports, refrigeration and aviation in the United States. It is the pressure exerted by a column of mercury 1 inch (25.4 mm) in height at the standard acceleration of gravity. + /// + /// https://en.wikipedia.org/wiki/Inch_of_mercury InchOfMercury = 11, + + /// + /// Inches of water is a non-SI unit for pressure. It is defined as the pressure exerted by a column of water of 1 inch in height at defined conditions. At a temperature of 4 °C (39.2 °F) pure water has its highest density (1000 kg/m3). At that temperature and assuming the standard acceleration of gravity, 1 inAq is approximately 249.082 pascals (0.0361263 psi). + /// + /// https://en.wikipedia.org/wiki/Inch_of_water InchOfWaterColumn = 12, Kilobar = 13, + + /// + /// A kilogram-force per centimetre square (kgf/cm2), often just kilogram per square centimetre (kg/cm2), or kilopond per centimetre square (kp/cm2) is a deprecated unit of pressure using metric units. It is not a part of the International System of Units (SI), the modern metric system. 1 kgf/cm2 equals 98.0665 kPa (kilopascals). It is also known as a technical atmosphere (symbol: at). + /// + /// https://en.wikipedia.org/wiki/Kilogram-force_per_square_centimetre KilogramForcePerSquareCentimeter = 14, KilogramForcePerSquareMeter = 15, KilogramForcePerSquareMillimeter = 16, @@ -54,10 +79,20 @@ public enum PressureUnit Megapascal = 26, MeterOfElevation = 27, MeterOfHead = 28, + + /// + /// A centimetre of water is defined as the pressure exerted by a column of water of 1 cm in height at 4 °C (temperature of maximum density) at the standard acceleration of gravity, so that 1 cmH2O (4°C) = 999.9720 kg/m3 × 9.80665 m/s2 × 1 cm = 98.063754138 Pa, but conventionally a nominal maximum water density of 1000 kg/m3 is used, giving 98.0665 Pa. + /// + /// https://en.wikipedia.org/wiki/Centimetre_or_millimetre_of_water MeterOfWaterColumn = 57, Microbar = 29, Micropascal = 30, Millibar = 31, + + /// + /// A millimetre of mercury is a manometric unit of pressure, formerly defined as the extra pressure generated by a column of mercury one millimetre high, and currently defined as exactly 133.322387415 pascals. + /// + /// https://en.wikipedia.org/wiki/Millimetre_of_mercury MillimeterOfMercury = 32, MillimeterOfWaterColumn = 33, Millipascal = 34, @@ -69,10 +104,20 @@ public enum PressureUnit PoundForcePerSquareInch = 40, PoundForcePerSquareMil = 41, PoundPerInchSecondSquared = 42, + + /// + /// A kilogram-force per centimetre square (kgf/cm2), often just kilogram per square centimetre (kg/cm2), or kilopond per centimetre square (kp/cm2) is a deprecated unit of pressure using metric units. It is not a part of the International System of Units (SI), the modern metric system. 1 kgf/cm2 equals 98.0665 kPa (kilopascals). It is also known as a technical atmosphere (symbol: at). + /// + /// https://en.wikipedia.org/wiki/Kilogram-force_per_square_centimetre TechnicalAtmosphere = 43, TonneForcePerSquareCentimeter = 44, TonneForcePerSquareMeter = 45, TonneForcePerSquareMillimeter = 46, + + /// + /// The torr (symbol: Torr) is a unit of pressure based on an absolute scale, defined as exactly 1/760 of a standard atmosphere (101325 Pa). Thus one torr is exactly 101325/760 pascals (≈ 133.32 Pa). + /// + /// https://en.wikipedia.org/wiki/Torr Torr = 47, }