Merge branch 'Psychrometrics_Toolkit-#39-UnitCompliance' of https://g…

…ithub.com/BHoM/Psychrometrics_Toolkit into Psychrometrics_Toolkit-#39-UnitCompliance
BHoM · Sep 4, 2023 · 41fb92b · 41fb92b
2 parents 8c9fa30 + 906ca65
commit 41fb92b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs
@@ -29,6 +29,7 @@
 using BH.oM.Base.Attributes;
 using BH.oM.Base;
 using BH.Engine.Base;
+using BH.Engine.Units;
 
 namespace BH.Engine.Psychrometrics
 {
@@ -55,13 +56,18 @@ public static Output<double, double, double, double, double, double> FromHumidit
             double humidityRatio,
             double pressure = 101325)
         {
+            dryBulbTemperature = BH.Engine.Units.Convert.ToDegreeCelsius(dryBulbTemperature);
+
             double Density = DensityHumidityRatio(dryBulbTemperature, humidityRatio, pressure);
             double Enthalpy = EnthalpyHumidityRatio(dryBulbTemperature, humidityRatio);
             double DewPoint = DewPointHumidityRatio(dryBulbTemperature, humidityRatio, pressure);
             double RelativeHumidity = RelativeHumidityHumidityRatio(dryBulbTemperature, humidityRatio, pressure);
             double SpecificVolume = SpecificVolumeHumidityRatio(dryBulbTemperature, humidityRatio, pressure);
             double WetBulbTemperature = WetBulbHumidityRatio(dryBulbTemperature, humidityRatio, pressure);
 
+            DewPoint = BH.Engine.Units.Convert.FromDegreeCelsius(DewPoint);
+            WetBulbTemperature = BH.Engine.Units.Convert.FromDegreeCelsius(WetBulbTemperature);
+
             return new Output<double, double, double, double, double, double>
             {
                 Item1 = Density,

diff --git a/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs b/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs
@@ -29,6 +29,7 @@
 using BH.oM.Base.Attributes;
 using BH.oM.Base;
 using BH.Engine.Base;
+using BH.Engine.Units;
 
 namespace BH.Engine.Psychrometrics
 {
@@ -55,13 +56,18 @@ public static Output<double, double, double, double, double, double> FromRelativ
             double relativeHumidity,
             double pressure = 101325)
         {
+            dryBulbTemperature = BH.Engine.Units.Convert.ToDegreeCelsius(dryBulbTemperature);
+
             double Density = DensityRelativeHumidity(dryBulbTemperature, relativeHumidity, pressure);
             double Enthalpy = EnthalpyRelativeHumidity(dryBulbTemperature, relativeHumidity, pressure);
             double DewPoint = DewPointRelativeHumidity(dryBulbTemperature, relativeHumidity, pressure);
             double HumidityRatio = HumidityRatioRelativeHumidity(dryBulbTemperature, relativeHumidity, pressure);
             double SpecificVolume = SpecificVolumeRelativeHumidity(dryBulbTemperature, relativeHumidity, pressure);
             double WetBulbTemperature = WetBulbTemperatureRelativeHumidity(dryBulbTemperature, relativeHumidity, pressure);
 
+            DewPoint = BH.Engine.Units.Convert.FromDegreeCelsius(DewPoint);
+            WetBulbTemperature = BH.Engine.Units.Convert.FromDegreeCelsius(WetBulbTemperature);
+
             return new Output<double, double, double, double, double, double>
             {
                 Item1 = Density,

diff --git a/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs b/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs
@@ -29,6 +29,7 @@
 using BH.oM.Base.Attributes;
 using BH.oM.Base;
 using BH.Engine.Base;
+using BH.Engine.Units;
 
 namespace BH.Engine.Psychrometrics
 {
@@ -55,13 +56,18 @@ public static Output<double, double, double, double, double, double> FromWetBulb
             double wetBulbTemperature,
             double pressure = 101325)
         {
+            dryBulbTemperature = BH.Engine.Units.Convert.ToDegreeCelsius(dryBulbTemperature);
+            wetBulbTemperature = BH.Engine.Units.Convert.ToDegreeCelsius(wetBulbTemperature);
+
             double Density = DensityWetBulbTemperature(dryBulbTemperature, wetBulbTemperature, pressure);
             double Enthalpy = EnthalpyWetBulbTemperature(dryBulbTemperature, wetBulbTemperature, pressure);
             double DewPoint = DewPointWetBulbTemperature(dryBulbTemperature, wetBulbTemperature, pressure);
             double HumidityRatio = HumidityRatioWetBulbTemperature(dryBulbTemperature, wetBulbTemperature, pressure);
             double RelativeHumidity = RelativeHumidityWetBulbTemperature(dryBulbTemperature, wetBulbTemperature, pressure);
             double SpecificVolume = SpecificVolumeWetBulbTemperature(dryBulbTemperature, wetBulbTemperature, pressure);
 
+            DewPoint = BH.Engine.Units.Convert.FromDegreeCelsius(DewPoint);
+
             return new Output<double, double, double, double, double, double>
             {
                 Item1 = Density,