From 48a4093e2e2d8cfc273980b6724a9def6b7495e1 Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Mon, 4 Sep 2023 15:49:53 +0100 Subject: [PATCH 01/25] Changed Celsius to Kelvin --- Psychrometrics_Engine/Compute/FromHumidityRatio.cs | 8 ++++---- Psychrometrics_Engine/Compute/FromRelativeHumidity.cs | 8 ++++---- Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs index b6f1edc..01fcb06 100644 --- a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs @@ -34,16 +34,16 @@ namespace BH.Engine.Psychrometrics { public static partial class Compute { - [Description("Calculates density, enthalpy, dew-point temperature, relative humidity, specific volume and wet-bulb temperature from dry-bulb temperature, pressure and humidity ratio.")] - [Input("dryBulbTemperature", "Dry-bulb temperature (C).")] + [Description("Calculates density (kg/m3), enthalpy (J/kg), dew-point temperature (K), relative humidity (%), specific volume (m3/kg) and wet-bulb temperature (K) from dry-bulb temperature (K), pressure (Pa) and humidity ratio (kg_water/kg_dryair).")] + [Input("dryBulbTemperature", "Dry-bulb temperature (K).")] [Input("humidityRatio", "Humidity ratio (kg_water/kg_dryair).")] [Input("pressure", "Air pressure (Pa), defaults to sea level air pressure (101,325 Pa).")] [MultiOutput(0, "density", "Density (kg/m3).")] [MultiOutput(1, "enthalpy", "Enthalpy (J/kg).")] - [MultiOutput(2, "dewPoint", "Dew-point temperature (C).")] + [MultiOutput(2, "dewPoint", "Dew-point temperature (K).")] [MultiOutput(3, "relativeHumidity", "Relative humidity (%).")] [MultiOutput(4, "specificVolume", "Specific Volume (m3/kg).")] - [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature (C).")] + [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature (K).")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DensityHumidityRatio(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.EnthalpyHumidityRatio(System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DewPointHumidityRatio(System.Double, System.Double, System.Double)")] diff --git a/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs b/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs index 4e28d0f..ca752a9 100644 --- a/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs +++ b/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs @@ -34,16 +34,16 @@ namespace BH.Engine.Psychrometrics { public static partial class Compute { - [Description("Calculates density, enthalpy, dew-point temperature, humidity ratio, specific volume and wet-bulb temperature from dry-bulb temperature, pressure and relative humidity.")] - [Input("dryBulbTemperature", "Dry-bulb temperature (C).")] + [Description("Calculates density (kg/m3), enthalpy (J/kg), dew-point temperature (K), humidity ratio (%), specific volume (m3/kg) and wet-bulb temperature (K) from dry-bulb temperature (K), pressure (Pa) and relative humidity (%).")] + [Input("dryBulbTemperature", "Dry-bulb temperature (K).")] [Input("relativeHumidity", "Relative humidity (%).")] [Input("pressure", "Air pressure (Pa), defaults to sea level air pressure (101,325 Pa).")] [MultiOutput(0, "density", "Density (kg/m3).")] [MultiOutput(1, "enthalpy", "Enthalpy (J/kg).")] - [MultiOutput(2, "dewPoint", "Dew-point temperature (C).")] + [MultiOutput(2, "dewPoint", "Dew-point temperature (K).")] [MultiOutput(3, "humidityRatio", "Humidity ratio (kg_water/kg_dryair).")] [MultiOutput(4, "specificVolume", "Specific Volume (m3/kg).")] - [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature (C).")] + [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature (K).")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DensityRelativeHumidity(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.EnthalpyRelativeHumidity(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DewPointRelativeHumidity(System.Double, System.Double, System.Double)")] diff --git a/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs b/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs index 123aff7..1174cb7 100644 --- a/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs +++ b/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs @@ -34,13 +34,13 @@ namespace BH.Engine.Psychrometrics { public static partial class Compute { - [Description("Calculates density, enthalpy, dew-point temperature, humidity ratio, relative humidity and specific volume from dry-bulb temperature, pressure and wet-bulb temperature.")] - [Input("dryBulbTemperature", "Dry-bulb temperature (C).")] - [Input("wetBulbTemperature", "Wet-bulb temperature (C).")] + [Description("Calculates density (kg/m3), enthalpy (J/kg), dew-point temperature (K), humidity ratio (kg_water/kg_dryair), relative humidity (%) and specific volume (m3/kg) from dry-bulb temperature (K), pressure (Pa) and wet-bulb temperature (K).")] + [Input("dryBulbTemperature", "Dry-bulb temperature (K).")] + [Input("wetBulbTemperature", "Wet-bulb temperature (K).")] [Input("pressure", "Air pressure (Pa), defaults to sea level air pressure (101,325 Pa).")] [MultiOutput(0, "density", "Density (kg/m3).")] [MultiOutput(1, "enthalpy", "Enthalpy (J/kg).")] - [MultiOutput(2, "dewPoint", "Dew-point temperature (C).")] + [MultiOutput(2, "dewPoint", "Dew-point temperature (K).")] [MultiOutput(3, "humidityRatio", "Humidity ratio (kg_water/kg_dryair).")] [MultiOutput(4, "relativeHumidity", "Relative humidity (%).")] [MultiOutput(5, "specificVolume", "Specific Volume (m3/kg).")] From 0c59e965abf7fa4e6abfa0da17386f8d40b7ff39 Mon Sep 17 00:00:00 2001 From: Thomas Edward Kingstone Date: Mon, 4 Sep 2023 15:45:29 +0100 Subject: [PATCH 02/25] added notes for places to add unit conversion --- Psychrometrics_Engine/Compute/DensityWater.cs | 3 ++- Psychrometrics_Engine/Compute/PartialVapourPressure.cs | 5 +++-- .../Compute/SaturatedVapourPressureWater.cs | 3 ++- Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs | 3 ++- Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs | 4 ++-- .../Compute/TemperatureEnthalpyHumidityRatio.cs | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Psychrometrics_Engine/Compute/DensityWater.cs b/Psychrometrics_Engine/Compute/DensityWater.cs index 43fb3eb..0cd4ee6 100644 --- a/Psychrometrics_Engine/Compute/DensityWater.cs +++ b/Psychrometrics_Engine/Compute/DensityWater.cs @@ -35,11 +35,12 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates water density from temperature.")] - [Input("temperature", "temperature (C).")] + [Input("temperature", "temperature (K).")] [Output("density", "Density (kg/m3).")] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.DensityWater(System.Double)")] public static double DensityWater(double temperature) { + //add temperature conversion here double t = temperature; if (t < 0 || t > 150) { diff --git a/Psychrometrics_Engine/Compute/PartialVapourPressure.cs b/Psychrometrics_Engine/Compute/PartialVapourPressure.cs index da1cfb3..716506b 100644 --- a/Psychrometrics_Engine/Compute/PartialVapourPressure.cs +++ b/Psychrometrics_Engine/Compute/PartialVapourPressure.cs @@ -32,11 +32,12 @@ namespace BH.Engine.Psychrometrics { public static partial class Compute { - [Description("Calculates saturation pressure over liquid water for the temperature range -100C to 200C.")] - [Input("dryBulbTemperature", "dry-bulb temperature (C)")] + [Description("Calculates saturation pressure over liquid water for the temperature range 173.15K to 473.15K.")] + [Input("dryBulbTemperature", "dry-bulb temperature (K)")] [Output("saturationPressure", "saturation pressure (Pa)")] public static double PartialVapourPressure(double dryBulbTemperature) { + // add unit conversion here PsychroLib.Psychrometrics psy = new PsychroLib.Psychrometrics(PsychroLib.UnitSystem.SI); return psy.GetSatVapPres(dryBulbTemperature); } diff --git a/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs b/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs index d4fd414..d59e9eb 100644 --- a/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs +++ b/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs @@ -35,12 +35,13 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates water SaturatedVapourPressure from temperature.")] - [Input("temperature", "temperature (degC).")] + [Input("temperature", "temperature (K).")] [Output("saturatedVapourPressure", "Saturated Vapour Pressure (Pa).")] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.SaturatedVapourPressureWater(System.Double)")] public static double SaturatedVapourPressureWater(double temperature) { BH.Engine.Base.Compute.RecordWarning("This method has not been thoroughly tested. The output may be incorrect. Use at own risk."); + // add temperature conversion here double t = temperature; if (t < 0 || t > 150) diff --git a/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs b/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs index 2637e57..17089c1 100644 --- a/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs +++ b/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs @@ -35,11 +35,12 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates Water SpecificHeatCapacity from temperature.")] - [Input("temperature", "temperature (C).")] + [Input("temperature", "temperature (K).")] [Output("specificHeatCapacity", "Specific Heat Capacity (kJ/kgK).")] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.SpecificHeatCapacityWater(System.Double)")] public static double SpecificHeatCapacityWater(double temperature) { + // add temperature conversion here double t = temperature; if (t < 0 || t > 150) { diff --git a/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs b/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs index ca6c582..5b39ca3 100644 --- a/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs +++ b/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs @@ -34,11 +34,11 @@ public static partial class Compute { [Description("Calculates temperature as a function of altitude.")] [Input("altitude", "altitude (m)")] - [Output("temperature", "temperature (C)")] + [Output("temperature", "temperature (K)")] public static double TemperatureAtAltitude(double altitude) { PsychroLib.Psychrometrics psy = new PsychroLib.Psychrometrics(PsychroLib.UnitSystem.SI); - return psy.GetStandardAtmTemperature(altitude); + return psy.GetStandardAtmTemperature(altitude); // add temperature conversion here } } } diff --git a/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs b/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs index d046f95..5ab2163 100644 --- a/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs @@ -39,7 +39,7 @@ public static partial class Compute public static double TemperatureEnthalpyHumidityRatio(double enthalpy, double humidityRatio) { PsychroLib.Psychrometrics psy = new PsychroLib.Psychrometrics(PsychroLib.UnitSystem.SI); - return psy.GetTDryBulbFromEnthalpyAndHumRatio(enthalpy, humidityRatio); + return psy.GetTDryBulbFromEnthalpyAndHumRatio(enthalpy, humidityRatio); // add temperature conversion here } } } From d21b6bcb63fa02dacad4db811793b39dc65862f8 Mon Sep 17 00:00:00 2001 From: Thomas Edward Kingstone Date: Mon, 4 Sep 2023 15:55:10 +0100 Subject: [PATCH 03/25] added dependency to units_engine --- Psychrometrics_Engine/Psychrometrics_Engine.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Psychrometrics_Engine/Psychrometrics_Engine.csproj b/Psychrometrics_Engine/Psychrometrics_Engine.csproj index 612dbfc..aea36a7 100644 --- a/Psychrometrics_Engine/Psychrometrics_Engine.csproj +++ b/Psychrometrics_Engine/Psychrometrics_Engine.csproj @@ -25,6 +25,11 @@ False False + + $(ProgramData)\BHoM\Assemblies\Units_Engine.dll + False + False + From 612af87bef704fc80d8477880284086437b534b7 Mon Sep 17 00:00:00 2001 From: Thomas Edward Kingstone Date: Mon, 4 Sep 2023 16:16:06 +0100 Subject: [PATCH 04/25] added some unit conversions --- Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs | 3 ++- .../Compute/TemperatureEnthalpyHumidityRatio.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs b/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs index 5b39ca3..a2df3f2 100644 --- a/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs +++ b/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs @@ -27,6 +27,7 @@ using System.Threading.Tasks; using System.ComponentModel; using BH.oM.Base.Attributes; +using BH.Engine.Units; namespace BH.Engine.Psychrometrics { @@ -38,7 +39,7 @@ public static partial class Compute public static double TemperatureAtAltitude(double altitude) { PsychroLib.Psychrometrics psy = new PsychroLib.Psychrometrics(PsychroLib.UnitSystem.SI); - return psy.GetStandardAtmTemperature(altitude); // add temperature conversion here + return Units.Convert.FromDegreeCelsius(psy.GetStandardAtmTemperature(altitude)); } } } diff --git a/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs b/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs index 5ab2163..48d9085 100644 --- a/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs @@ -27,6 +27,7 @@ using System.Threading.Tasks; using System.ComponentModel; using BH.oM.Base.Attributes; +using BH.Engine.Units; namespace BH.Engine.Psychrometrics { @@ -39,7 +40,7 @@ public static partial class Compute public static double TemperatureEnthalpyHumidityRatio(double enthalpy, double humidityRatio) { PsychroLib.Psychrometrics psy = new PsychroLib.Psychrometrics(PsychroLib.UnitSystem.SI); - return psy.GetTDryBulbFromEnthalpyAndHumRatio(enthalpy, humidityRatio); // add temperature conversion here + return Units.Convert.FromDegreeCelsius(psy.GetTDryBulbFromEnthalpyAndHumRatio(enthalpy, humidityRatio)); } } } From 55ef7e3f16d0b95ac33f28e05e02798b72fddbc6 Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Mon, 4 Sep 2023 16:16:02 +0100 Subject: [PATCH 05/25] Converting to and from degree celsius --- Psychrometrics_Engine/Compute/FromHumidityRatio.cs | 6 ++++++ Psychrometrics_Engine/Compute/FromRelativeHumidity.cs | 6 ++++++ Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs index 01fcb06..6aa1bb7 100644 --- 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,6 +56,8 @@ public static Output 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); @@ -62,6 +65,9 @@ public static Output FromHumidit 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 { Item1 = Density, diff --git a/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs b/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs index ca752a9..9e58430 100644 --- 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,6 +56,8 @@ public static Output 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); @@ -62,6 +65,9 @@ public static Output FromRelativ 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 { Item1 = Density, diff --git a/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs b/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs index 1174cb7..63b069a 100644 --- 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,6 +56,9 @@ public static Output 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); @@ -62,6 +66,8 @@ public static Output FromWetBulb double RelativeHumidity = RelativeHumidityWetBulbTemperature(dryBulbTemperature, wetBulbTemperature, pressure); double SpecificVolume = SpecificVolumeWetBulbTemperature(dryBulbTemperature, wetBulbTemperature, pressure); + DewPoint = BH.Engine.Units.Convert.FromDegreeCelsius(DewPoint); + return new Output { Item1 = Density, From 341b7b755a8cb8c757c1eb86b04055f73906391f Mon Sep 17 00:00:00 2001 From: Thomas Edward Kingstone Date: Mon, 4 Sep 2023 16:23:29 +0100 Subject: [PATCH 06/25] finished adding temp conversions --- Psychrometrics_Engine/Compute/DensityWater.cs | 4 ++-- Psychrometrics_Engine/Compute/PartialVapourPressure.cs | 3 ++- Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs | 4 ++-- Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Psychrometrics_Engine/Compute/DensityWater.cs b/Psychrometrics_Engine/Compute/DensityWater.cs index 0cd4ee6..fa1b4c0 100644 --- a/Psychrometrics_Engine/Compute/DensityWater.cs +++ b/Psychrometrics_Engine/Compute/DensityWater.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 { @@ -40,8 +41,7 @@ public static partial class Compute [PreviousVersion("6.3", "BH.Engine.Climate.Compute.DensityWater(System.Double)")] public static double DensityWater(double temperature) { - //add temperature conversion here - double t = temperature; + double t = Units.Convert.ToDegreeCelsius(temperature); if (t < 0 || t > 150) { BH.Engine.Base.Compute.RecordError("Temperature must be greater than 0 and less than 150 degC."); diff --git a/Psychrometrics_Engine/Compute/PartialVapourPressure.cs b/Psychrometrics_Engine/Compute/PartialVapourPressure.cs index 716506b..223c103 100644 --- a/Psychrometrics_Engine/Compute/PartialVapourPressure.cs +++ b/Psychrometrics_Engine/Compute/PartialVapourPressure.cs @@ -38,8 +38,9 @@ public static partial class Compute public static double PartialVapourPressure(double dryBulbTemperature) { // add unit conversion here + PsychroLib.Psychrometrics psy = new PsychroLib.Psychrometrics(PsychroLib.UnitSystem.SI); - return psy.GetSatVapPres(dryBulbTemperature); + return psy.GetSatVapPres(Units.Convert.ToDegreeCelsius(dryBulbTemperature)); } } } diff --git a/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs b/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs index d59e9eb..0acd9c8 100644 --- a/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs +++ b/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs @@ -43,13 +43,13 @@ public static double SaturatedVapourPressureWater(double temperature) BH.Engine.Base.Compute.RecordWarning("This method has not been thoroughly tested. The output may be incorrect. Use at own risk."); // add temperature conversion here - double t = temperature; + double t = Units.Convert.ToDegreeCelsius(temperature); if (t < 0 || t > 150) { BH.Engine.Base.Compute.RecordError("Temperature must be greater than 0 and less than 150 degC."); return double.NaN; } - else if (temperature < 21) + else if (Units.Convert.ToDegreeCelsius(temperature) < 21) { return 6.10830198582769e-03 + 3.69554702125838e-04 * t + 2.4671509929139e-05 * Math.Pow(t, 2); } diff --git a/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs b/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs index 17089c1..b51a5ea 100644 --- a/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs +++ b/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs @@ -41,10 +41,10 @@ public static partial class Compute public static double SpecificHeatCapacityWater(double temperature) { // add temperature conversion here - double t = temperature; + double t = Units.Convert.ToDegreeCelsius(temperature); if (t < 0 || t > 150) { - BH.Engine.Base.Compute.RecordError("Temperature must be greater than 0 and less than 150 degC."); + BH.Engine.Base.Compute.RecordError("Temperature must be greater than 273.15 K and less than 423.15 K."); return double.NaN; } else From 5f496055f5db23dd88a609c4f1e2bbc79cbd51f6 Mon Sep 17 00:00:00 2001 From: Thomas Edward Kingstone Date: Mon, 4 Sep 2023 16:55:25 +0100 Subject: [PATCH 07/25] fixed dependencies.txt and added Quantities_oM dependency --- Psychrometrics_Engine/Psychrometrics_Engine.csproj | 7 ++++++- dependencies.txt | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Psychrometrics_Engine/Psychrometrics_Engine.csproj b/Psychrometrics_Engine/Psychrometrics_Engine.csproj index aea36a7..8377d47 100644 --- a/Psychrometrics_Engine/Psychrometrics_Engine.csproj +++ b/Psychrometrics_Engine/Psychrometrics_Engine.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -25,6 +25,11 @@ False False + + $(ProgramData)\BHoM\Assemblies\Quantities_oM.dll + False + False + $(ProgramData)\BHoM\Assemblies\Units_Engine.dll False diff --git a/dependencies.txt b/dependencies.txt index 77b41ce..ac4c5d7 100644 --- a/dependencies.txt +++ b/dependencies.txt @@ -1,2 +1,4 @@ BHoM/BHoM -BHoM/BHoM_Engine \ No newline at end of file +BHoM/BHoM_Engine +BHoM/Units_Engine +BHoM/Quantities_oM \ No newline at end of file From 3b63355152801262d8f3ce3b3326002f12394f58 Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Mon, 4 Sep 2023 17:30:52 +0100 Subject: [PATCH 08/25] CHanged brackets to typeof --- .../Compute/FromHumidityRatio.cs | 19 ++++++++++--------- .../Compute/FromRelativeHumidity.cs | 19 ++++++++++--------- .../Compute/FromWetBulbTemperature.cs | 19 ++++++++++--------- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs index 6aa1bb7..0036f67 100644 --- a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs @@ -30,21 +30,22 @@ using BH.oM.Base; using BH.Engine.Base; using BH.Engine.Units; +using BH.oM.Quantities.Attributes; namespace BH.Engine.Psychrometrics { public static partial class Compute { - [Description("Calculates density (kg/m3), enthalpy (J/kg), dew-point temperature (K), relative humidity (%), specific volume (m3/kg) and wet-bulb temperature (K) from dry-bulb temperature (K), pressure (Pa) and humidity ratio (kg_water/kg_dryair).")] - [Input("dryBulbTemperature", "Dry-bulb temperature (K).")] - [Input("humidityRatio", "Humidity ratio (kg_water/kg_dryair).")] - [Input("pressure", "Air pressure (Pa), defaults to sea level air pressure (101,325 Pa).")] - [MultiOutput(0, "density", "Density (kg/m3).")] - [MultiOutput(1, "enthalpy", "Enthalpy (J/kg).")] - [MultiOutput(2, "dewPoint", "Dew-point temperature (K).")] + [Description("Calculates density, enthalpy, dew-point temperature, relative humidity, specific volume and wet-bulb temperature from dry-bulb temperature, pressure and humidity ratio.")] + [Input("dryBulbTemperature", "Dry-bulb temperature.",typeof(Temperature))] + [Input("humidityRatio", "Humidity ratio (kg_water/kg_dryair).",typeof(Ratio))] + [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).",typeof(Pressure))] + [MultiOutput(0, "density", "Density.",typeof(Density))] + [MultiOutput(1, "enthalpy", "Enthalpy.",typeof(SpecificEnergy))] + [MultiOutput(2, "dewPoint", "Dew-point temperature.",typeof(Temperature))] [MultiOutput(3, "relativeHumidity", "Relative humidity (%).")] - [MultiOutput(4, "specificVolume", "Specific Volume (m3/kg).")] - [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature (K).")] + [MultiOutput(4, "specificVolume", "Specific Volume.",typeof(VolumePerQuantity))] + [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature.",typeof(Temperature))] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DensityHumidityRatio(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.EnthalpyHumidityRatio(System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DewPointHumidityRatio(System.Double, System.Double, System.Double)")] diff --git a/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs b/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs index 9e58430..09799bd 100644 --- a/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs +++ b/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs @@ -30,21 +30,22 @@ using BH.oM.Base; using BH.Engine.Base; using BH.Engine.Units; +using BH.oM.Quantities.Attributes; namespace BH.Engine.Psychrometrics { public static partial class Compute { - [Description("Calculates density (kg/m3), enthalpy (J/kg), dew-point temperature (K), humidity ratio (%), specific volume (m3/kg) and wet-bulb temperature (K) from dry-bulb temperature (K), pressure (Pa) and relative humidity (%).")] - [Input("dryBulbTemperature", "Dry-bulb temperature (K).")] + [Description("Calculates density, enthalpy, dew-point temperature, humidity ratio, specific volume and wet-bulb temperature from dry-bulb temperature, pressure and relative humidity.")] + [Input("dryBulbTemperature", "Dry-bulb temperature.",typeof(Temperature))] [Input("relativeHumidity", "Relative humidity (%).")] - [Input("pressure", "Air pressure (Pa), defaults to sea level air pressure (101,325 Pa).")] - [MultiOutput(0, "density", "Density (kg/m3).")] - [MultiOutput(1, "enthalpy", "Enthalpy (J/kg).")] - [MultiOutput(2, "dewPoint", "Dew-point temperature (K).")] - [MultiOutput(3, "humidityRatio", "Humidity ratio (kg_water/kg_dryair).")] - [MultiOutput(4, "specificVolume", "Specific Volume (m3/kg).")] - [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature (K).")] + [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).",typeof(Pressure))] + [MultiOutput(0, "density", "Density.",typeof(Density))] + [MultiOutput(1, "enthalpy", "Enthalpy.",typeof(SpecificEnergy))] + [MultiOutput(2, "dewPoint", "Dew-point temperature.",typeof(Temperature))] + [MultiOutput(3, "humidityRatio", "Humidity ratio (kg_water/kg_dryair).",typeof(Ratio))] + [MultiOutput(4, "specificVolume", "Specific Volume.",typeof(VolumePerQuantity))] + [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature.",typeof(Temperature))] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DensityRelativeHumidity(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.EnthalpyRelativeHumidity(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DewPointRelativeHumidity(System.Double, System.Double, System.Double)")] diff --git a/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs b/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs index 63b069a..70debba 100644 --- a/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs +++ b/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs @@ -30,21 +30,22 @@ using BH.oM.Base; using BH.Engine.Base; using BH.Engine.Units; +using BH.oM.Quantities.Attributes; namespace BH.Engine.Psychrometrics { public static partial class Compute { - [Description("Calculates density (kg/m3), enthalpy (J/kg), dew-point temperature (K), humidity ratio (kg_water/kg_dryair), relative humidity (%) and specific volume (m3/kg) from dry-bulb temperature (K), pressure (Pa) and wet-bulb temperature (K).")] - [Input("dryBulbTemperature", "Dry-bulb temperature (K).")] - [Input("wetBulbTemperature", "Wet-bulb temperature (K).")] - [Input("pressure", "Air pressure (Pa), defaults to sea level air pressure (101,325 Pa).")] - [MultiOutput(0, "density", "Density (kg/m3).")] - [MultiOutput(1, "enthalpy", "Enthalpy (J/kg).")] - [MultiOutput(2, "dewPoint", "Dew-point temperature (K).")] - [MultiOutput(3, "humidityRatio", "Humidity ratio (kg_water/kg_dryair).")] + [Description("Calculates density, enthalpy, dew-point temperature, humidity ratio, relative humidity and specific volume from dry-bulb temperature, pressure and wet-bulb temperature.")] + [Input("dryBulbTemperature", "Dry-bulb temperature.",typeof(Temperature))] + [Input("wetBulbTemperature", "Wet-bulb temperature.",typeof(Temperature))] + [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).",typeof(Pressure))] + [MultiOutput(0, "density", "Density.",typeof(Density))] + [MultiOutput(1, "enthalpy", "Enthalpy.",typeof(SpecificEnergy))] + [MultiOutput(2, "dewPoint", "Dew-point temperature.",typeof(Temperature))] + [MultiOutput(3, "humidityRatio", "Humidity ratio (kg_water/kg_dryair).",typeof(Ratio))] [MultiOutput(4, "relativeHumidity", "Relative humidity (%).")] - [MultiOutput(5, "specificVolume", "Specific Volume (m3/kg).")] + [MultiOutput(5, "specificVolume", "Specific Volume.",typeof(VolumePerQuantity))] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DensityWetBulbTemperature(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.EnthalpyWetBulbTemperature(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DewPointWetBulbTemperature(System.Double, System.Double, System.Double)")] From 7bd6c112b0aa09194ec97d65eaf00d2bd68a57db Mon Sep 17 00:00:00 2001 From: Thomas Edward Kingstone Date: Tue, 5 Sep 2023 08:46:57 +0100 Subject: [PATCH 09/25] added types to attributes that will remain --- Psychrometrics_Engine/Compute/DensityWater.cs | 5 +++-- Psychrometrics_Engine/Compute/PartialVapourPressure.cs | 7 +++---- Psychrometrics_Engine/Compute/PressureAtAltitude.cs | 5 +++-- .../Compute/SaturatedVapourPressureWater.cs | 6 +++--- Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs | 3 ++- Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs | 5 +++-- .../Compute/TemperatureEnthalpyHumidityRatio.cs | 7 ++++--- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Psychrometrics_Engine/Compute/DensityWater.cs b/Psychrometrics_Engine/Compute/DensityWater.cs index fa1b4c0..770aba7 100644 --- a/Psychrometrics_Engine/Compute/DensityWater.cs +++ b/Psychrometrics_Engine/Compute/DensityWater.cs @@ -30,14 +30,15 @@ using BH.oM.Base; using BH.Engine.Base; using BH.Engine.Units; +using BH.oM.Quantities.Attributes; namespace BH.Engine.Psychrometrics { public static partial class Compute { [Description("Calculates water density from temperature.")] - [Input("temperature", "temperature (K).")] - [Output("density", "Density (kg/m3).")] + [Input("temperature", "Temperature.", typeof(Temperature))] + [Output("density", "Density.", typeof(Density))] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.DensityWater(System.Double)")] public static double DensityWater(double temperature) { diff --git a/Psychrometrics_Engine/Compute/PartialVapourPressure.cs b/Psychrometrics_Engine/Compute/PartialVapourPressure.cs index 223c103..cc23c79 100644 --- a/Psychrometrics_Engine/Compute/PartialVapourPressure.cs +++ b/Psychrometrics_Engine/Compute/PartialVapourPressure.cs @@ -27,18 +27,17 @@ using System.Threading.Tasks; using System.ComponentModel; using BH.oM.Base.Attributes; +using BH.oM.Quantities.Attributes; namespace BH.Engine.Psychrometrics { public static partial class Compute { [Description("Calculates saturation pressure over liquid water for the temperature range 173.15K to 473.15K.")] - [Input("dryBulbTemperature", "dry-bulb temperature (K)")] - [Output("saturationPressure", "saturation pressure (Pa)")] + [Input("dryBulbTemperature", "Dry-bulb temperature.", typeof(Temperature))] + [Output("saturationPressure", "Saturation pressure.", typeof(Pressure))] public static double PartialVapourPressure(double dryBulbTemperature) { - // add unit conversion here - PsychroLib.Psychrometrics psy = new PsychroLib.Psychrometrics(PsychroLib.UnitSystem.SI); return psy.GetSatVapPres(Units.Convert.ToDegreeCelsius(dryBulbTemperature)); } diff --git a/Psychrometrics_Engine/Compute/PressureAtAltitude.cs b/Psychrometrics_Engine/Compute/PressureAtAltitude.cs index 38ab297..fd40a7f 100644 --- a/Psychrometrics_Engine/Compute/PressureAtAltitude.cs +++ b/Psychrometrics_Engine/Compute/PressureAtAltitude.cs @@ -27,14 +27,15 @@ using System.Threading.Tasks; using System.ComponentModel; using BH.oM.Base.Attributes; +using BH.oM.Quantities.Attributes; namespace BH.Engine.Psychrometrics { public static partial class Compute { [Description("Calculates atmospheric pressure as a function of altitude.")] - [Input("altitude", "altitude (m)")] - [Output("atmosphericPressure", "atmospheric pressure (Pa)")] + [Input("altitude", "Altitude", typeof(Length))] + [Output("atmosphericPressure", "Atmospheric pressure.", typeof(Pressure))] public static double PressureAtAltitude(double altitude) { PsychroLib.Psychrometrics psy = new PsychroLib.Psychrometrics(PsychroLib.UnitSystem.SI); diff --git a/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs b/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs index 0acd9c8..ea7b312 100644 --- a/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs +++ b/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs @@ -29,19 +29,19 @@ using BH.oM.Base.Attributes; using BH.oM.Base; using BH.Engine.Base; +using BH.oM.Quantities.Attributes; namespace BH.Engine.Psychrometrics { public static partial class Compute { [Description("Calculates water SaturatedVapourPressure from temperature.")] - [Input("temperature", "temperature (K).")] - [Output("saturatedVapourPressure", "Saturated Vapour Pressure (Pa).")] + [Input("temperature", "Temperature.", typeof(Temperature))] + [Output("saturatedVapourPressure", "Saturated Vapour Pressure.", typeof(Pressure))] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.SaturatedVapourPressureWater(System.Double)")] public static double SaturatedVapourPressureWater(double temperature) { BH.Engine.Base.Compute.RecordWarning("This method has not been thoroughly tested. The output may be incorrect. Use at own risk."); - // add temperature conversion here double t = Units.Convert.ToDegreeCelsius(temperature); if (t < 0 || t > 150) diff --git a/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs b/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs index b51a5ea..24cfe61 100644 --- a/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs +++ b/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs @@ -29,13 +29,14 @@ using BH.oM.Base.Attributes; using BH.oM.Base; using BH.Engine.Base; +using BH.oM.Quantities.Attributes; namespace BH.Engine.Psychrometrics { public static partial class Compute { [Description("Calculates Water SpecificHeatCapacity from temperature.")] - [Input("temperature", "temperature (K).")] + [Input("temperature", "Temperature.", typeof(Temperature))] [Output("specificHeatCapacity", "Specific Heat Capacity (kJ/kgK).")] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.SpecificHeatCapacityWater(System.Double)")] public static double SpecificHeatCapacityWater(double temperature) diff --git a/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs b/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs index a2df3f2..5928812 100644 --- a/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs +++ b/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs @@ -28,14 +28,15 @@ using System.ComponentModel; using BH.oM.Base.Attributes; using BH.Engine.Units; +using BH.oM.Quantities.Attributes; namespace BH.Engine.Psychrometrics { public static partial class Compute { [Description("Calculates temperature as a function of altitude.")] - [Input("altitude", "altitude (m)")] - [Output("temperature", "temperature (K)")] + [Input("altitude", "Altitude.", typeof(Length))] + [Output("temperature", "Temperature.", typeof(Temperature))] public static double TemperatureAtAltitude(double altitude) { PsychroLib.Psychrometrics psy = new PsychroLib.Psychrometrics(PsychroLib.UnitSystem.SI); diff --git a/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs b/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs index 48d9085..77e5de4 100644 --- a/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/TemperatureEnthalpyHumidityRatio.cs @@ -28,15 +28,16 @@ using System.ComponentModel; using BH.oM.Base.Attributes; using BH.Engine.Units; +using BH.oM.Quantities.Attributes; namespace BH.Engine.Psychrometrics { public static partial class Compute { [Description("Calculates temperature as a function of enthalpy.")] - [Input("enthalpy", "enthalpy (J/kg)")] - [Input("humidityRatio", "humidity ratio (g/g)")] - [Output("temperature", "temperature (C)")] + [Input("enthalpy", "Enthalpy.", typeof(SpecificEnergy))] + [Input("humidityRatio", "Humidity ratio (kg_water/kg_dryair).", typeof(Ratio))] + [Output("temperature", "Temperature.", typeof(Temperature))] public static double TemperatureEnthalpyHumidityRatio(double enthalpy, double humidityRatio) { PsychroLib.Psychrometrics psy = new PsychroLib.Psychrometrics(PsychroLib.UnitSystem.SI); From a00d8686e03b2f82723531a7e85925efdecd943f Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Tue, 5 Sep 2023 12:12:33 +0100 Subject: [PATCH 10/25] Update Psychrometrics_Engine/Compute/FromHumidityRatio.cs Co-authored-by: Fraser Greenroyd --- Psychrometrics_Engine/Compute/FromHumidityRatio.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs index 0036f67..05265e3 100644 --- a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs @@ -42,7 +42,7 @@ public static partial class Compute [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).",typeof(Pressure))] [MultiOutput(0, "density", "Density.",typeof(Density))] [MultiOutput(1, "enthalpy", "Enthalpy.",typeof(SpecificEnergy))] - [MultiOutput(2, "dewPoint", "Dew-point temperature.",typeof(Temperature))] + [MultiOutput(2, "dewPoint", "Dew-point temperature.", typeof(Temperature))] [MultiOutput(3, "relativeHumidity", "Relative humidity (%).")] [MultiOutput(4, "specificVolume", "Specific Volume.",typeof(VolumePerQuantity))] [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature.",typeof(Temperature))] From 0d446320503129ded7e448292bc7c316a566e819 Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Tue, 5 Sep 2023 12:12:46 +0100 Subject: [PATCH 11/25] Update Psychrometrics_Engine/Compute/FromHumidityRatio.cs Co-authored-by: Fraser Greenroyd --- Psychrometrics_Engine/Compute/FromHumidityRatio.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs index 05265e3..c3b499a 100644 --- a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs @@ -45,7 +45,7 @@ public static partial class Compute [MultiOutput(2, "dewPoint", "Dew-point temperature.", typeof(Temperature))] [MultiOutput(3, "relativeHumidity", "Relative humidity (%).")] [MultiOutput(4, "specificVolume", "Specific Volume.",typeof(VolumePerQuantity))] - [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature.",typeof(Temperature))] + [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature.", typeof(Temperature))] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DensityHumidityRatio(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.EnthalpyHumidityRatio(System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DewPointHumidityRatio(System.Double, System.Double, System.Double)")] From 180508db775a2b3def25ccd06aa4bfdd8fb0a28e Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Tue, 5 Sep 2023 12:12:55 +0100 Subject: [PATCH 12/25] Update Psychrometrics_Engine/Compute/FromHumidityRatio.cs Co-authored-by: Fraser Greenroyd --- Psychrometrics_Engine/Compute/FromHumidityRatio.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs index c3b499a..590db56 100644 --- a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs @@ -37,7 +37,7 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates density, enthalpy, dew-point temperature, relative humidity, specific volume and wet-bulb temperature from dry-bulb temperature, pressure and humidity ratio.")] - [Input("dryBulbTemperature", "Dry-bulb temperature.",typeof(Temperature))] + [Input("dryBulbTemperature", "Dry-bulb temperature.", typeof(Temperature))] [Input("humidityRatio", "Humidity ratio (kg_water/kg_dryair).",typeof(Ratio))] [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).",typeof(Pressure))] [MultiOutput(0, "density", "Density.",typeof(Density))] From b44c911002b2cf2e2fe54a1bbd2b0560e4b90c09 Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Tue, 5 Sep 2023 12:13:03 +0100 Subject: [PATCH 13/25] Update Psychrometrics_Engine/Compute/FromHumidityRatio.cs Co-authored-by: Fraser Greenroyd --- Psychrometrics_Engine/Compute/FromHumidityRatio.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs index 590db56..3bad068 100644 --- a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs @@ -38,7 +38,7 @@ public static partial class Compute { [Description("Calculates density, enthalpy, dew-point temperature, relative humidity, specific volume and wet-bulb temperature from dry-bulb temperature, pressure and humidity ratio.")] [Input("dryBulbTemperature", "Dry-bulb temperature.", typeof(Temperature))] - [Input("humidityRatio", "Humidity ratio (kg_water/kg_dryair).",typeof(Ratio))] + [Input("humidityRatio", "Humidity ratio (kg_water/kg_dryair).", typeof(Ratio))] [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).",typeof(Pressure))] [MultiOutput(0, "density", "Density.",typeof(Density))] [MultiOutput(1, "enthalpy", "Enthalpy.",typeof(SpecificEnergy))] From 66cd3ece6185902bb2373ec0e63f44ed47a5edd9 Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Tue, 5 Sep 2023 12:13:12 +0100 Subject: [PATCH 14/25] Update Psychrometrics_Engine/Compute/FromHumidityRatio.cs Co-authored-by: Fraser Greenroyd --- Psychrometrics_Engine/Compute/FromHumidityRatio.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs index 3bad068..552b89a 100644 --- a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs @@ -40,7 +40,7 @@ public static partial class Compute [Input("dryBulbTemperature", "Dry-bulb temperature.", typeof(Temperature))] [Input("humidityRatio", "Humidity ratio (kg_water/kg_dryair).", typeof(Ratio))] [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).",typeof(Pressure))] - [MultiOutput(0, "density", "Density.",typeof(Density))] + [MultiOutput(0, "density", "Density.", typeof(Density))] [MultiOutput(1, "enthalpy", "Enthalpy.",typeof(SpecificEnergy))] [MultiOutput(2, "dewPoint", "Dew-point temperature.", typeof(Temperature))] [MultiOutput(3, "relativeHumidity", "Relative humidity (%).")] From e45d0d81f8202bae17aba52ea22f8fbc823b3976 Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Tue, 5 Sep 2023 12:13:20 +0100 Subject: [PATCH 15/25] Update Psychrometrics_Engine/Compute/FromHumidityRatio.cs Co-authored-by: Fraser Greenroyd --- Psychrometrics_Engine/Compute/FromHumidityRatio.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs index 552b89a..ed89eec 100644 --- a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs @@ -39,7 +39,7 @@ public static partial class Compute [Description("Calculates density, enthalpy, dew-point temperature, relative humidity, specific volume and wet-bulb temperature from dry-bulb temperature, pressure and humidity ratio.")] [Input("dryBulbTemperature", "Dry-bulb temperature.", typeof(Temperature))] [Input("humidityRatio", "Humidity ratio (kg_water/kg_dryair).", typeof(Ratio))] - [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).",typeof(Pressure))] + [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).", typeof(Pressure))] [MultiOutput(0, "density", "Density.", typeof(Density))] [MultiOutput(1, "enthalpy", "Enthalpy.",typeof(SpecificEnergy))] [MultiOutput(2, "dewPoint", "Dew-point temperature.", typeof(Temperature))] From f621ebbc96ddfed078bc197acdcafb986efeb158 Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Tue, 5 Sep 2023 12:13:28 +0100 Subject: [PATCH 16/25] Update Psychrometrics_Engine/Compute/FromHumidityRatio.cs Co-authored-by: Fraser Greenroyd --- Psychrometrics_Engine/Compute/FromHumidityRatio.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs index ed89eec..eb03feb 100644 --- a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs @@ -41,7 +41,7 @@ public static partial class Compute [Input("humidityRatio", "Humidity ratio (kg_water/kg_dryair).", typeof(Ratio))] [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).", typeof(Pressure))] [MultiOutput(0, "density", "Density.", typeof(Density))] - [MultiOutput(1, "enthalpy", "Enthalpy.",typeof(SpecificEnergy))] + [MultiOutput(1, "enthalpy", "Enthalpy.", typeof(SpecificEnergy))] [MultiOutput(2, "dewPoint", "Dew-point temperature.", typeof(Temperature))] [MultiOutput(3, "relativeHumidity", "Relative humidity (%).")] [MultiOutput(4, "specificVolume", "Specific Volume.",typeof(VolumePerQuantity))] From cd15a9a5ad354f729fcdc787666a54905f588567 Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Tue, 5 Sep 2023 12:13:35 +0100 Subject: [PATCH 17/25] Update Psychrometrics_Engine/Compute/FromHumidityRatio.cs Co-authored-by: Fraser Greenroyd --- Psychrometrics_Engine/Compute/FromHumidityRatio.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs index eb03feb..738898b 100644 --- a/Psychrometrics_Engine/Compute/FromHumidityRatio.cs +++ b/Psychrometrics_Engine/Compute/FromHumidityRatio.cs @@ -44,7 +44,7 @@ public static partial class Compute [MultiOutput(1, "enthalpy", "Enthalpy.", typeof(SpecificEnergy))] [MultiOutput(2, "dewPoint", "Dew-point temperature.", typeof(Temperature))] [MultiOutput(3, "relativeHumidity", "Relative humidity (%).")] - [MultiOutput(4, "specificVolume", "Specific Volume.",typeof(VolumePerQuantity))] + [MultiOutput(4, "specificVolume", "Specific Volume.", typeof(VolumePerQuantity))] [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature.", typeof(Temperature))] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DensityHumidityRatio(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.EnthalpyHumidityRatio(System.Double, System.Double)")] From 3311155a0dced9e4239719784871c99d70b301ac Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Tue, 5 Sep 2023 12:17:57 +0100 Subject: [PATCH 18/25] Added space after , --- .../Compute/FromRelativeHumidity.cs | 16 ++++++++-------- .../Compute/FromWetBulbTemperature.cs | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs b/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs index 09799bd..105cc45 100644 --- a/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs +++ b/Psychrometrics_Engine/Compute/FromRelativeHumidity.cs @@ -37,15 +37,15 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates density, enthalpy, dew-point temperature, humidity ratio, specific volume and wet-bulb temperature from dry-bulb temperature, pressure and relative humidity.")] - [Input("dryBulbTemperature", "Dry-bulb temperature.",typeof(Temperature))] + [Input("dryBulbTemperature", "Dry-bulb temperature.", typeof(Temperature))] [Input("relativeHumidity", "Relative humidity (%).")] - [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).",typeof(Pressure))] - [MultiOutput(0, "density", "Density.",typeof(Density))] - [MultiOutput(1, "enthalpy", "Enthalpy.",typeof(SpecificEnergy))] - [MultiOutput(2, "dewPoint", "Dew-point temperature.",typeof(Temperature))] - [MultiOutput(3, "humidityRatio", "Humidity ratio (kg_water/kg_dryair).",typeof(Ratio))] - [MultiOutput(4, "specificVolume", "Specific Volume.",typeof(VolumePerQuantity))] - [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature.",typeof(Temperature))] + [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).", typeof(Pressure))] + [MultiOutput(0, "density", "Density.", typeof(Density))] + [MultiOutput(1, "enthalpy", "Enthalpy.", typeof(SpecificEnergy))] + [MultiOutput(2, "dewPoint", "Dew-point temperature.", typeof(Temperature))] + [MultiOutput(3, "humidityRatio", "Humidity ratio (kg_water/kg_dryair).", typeof(Ratio))] + [MultiOutput(4, "specificVolume", "Specific Volume.", typeof(VolumePerQuantity))] + [MultiOutput(5, "wetBulbTemperature", "Wet-bulb temperature.", typeof(Temperature))] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DensityRelativeHumidity(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.EnthalpyRelativeHumidity(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DewPointRelativeHumidity(System.Double, System.Double, System.Double)")] diff --git a/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs b/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs index 70debba..009e546 100644 --- a/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs +++ b/Psychrometrics_Engine/Compute/FromWetBulbTemperature.cs @@ -37,15 +37,15 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates density, enthalpy, dew-point temperature, humidity ratio, relative humidity and specific volume from dry-bulb temperature, pressure and wet-bulb temperature.")] - [Input("dryBulbTemperature", "Dry-bulb temperature.",typeof(Temperature))] - [Input("wetBulbTemperature", "Wet-bulb temperature.",typeof(Temperature))] - [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).",typeof(Pressure))] - [MultiOutput(0, "density", "Density.",typeof(Density))] - [MultiOutput(1, "enthalpy", "Enthalpy.",typeof(SpecificEnergy))] - [MultiOutput(2, "dewPoint", "Dew-point temperature.",typeof(Temperature))] - [MultiOutput(3, "humidityRatio", "Humidity ratio (kg_water/kg_dryair).",typeof(Ratio))] + [Input("dryBulbTemperature", "Dry-bulb temperature.", typeof(Temperature))] + [Input("wetBulbTemperature", "Wet-bulb temperature.", typeof(Temperature))] + [Input("pressure", "Air pressure, defaults to sea level air pressure (101,325).", typeof(Pressure))] + [MultiOutput(0, "density", "Density.", typeof(Density))] + [MultiOutput(1, "enthalpy", "Enthalpy.", typeof(SpecificEnergy))] + [MultiOutput(2, "dewPoint", "Dew-point temperature.", typeof(Temperature))] + [MultiOutput(3, "humidityRatio", "Humidity ratio (kg_water/kg_dryair).", typeof(Ratio))] [MultiOutput(4, "relativeHumidity", "Relative humidity (%).")] - [MultiOutput(5, "specificVolume", "Specific Volume.",typeof(VolumePerQuantity))] + [MultiOutput(5, "specificVolume", "Specific Volume.", typeof(VolumePerQuantity))] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DensityWetBulbTemperature(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.EnthalpyWetBulbTemperature(System.Double, System.Double, System.Double)")] [PreviousVersion("6.3", "BH.Engine.Psychrometrics.Compute.DewPointWetBulbTemperature(System.Double, System.Double, System.Double)")] From 4e5543b00fb8eea4cd68531872fc5d2fbad8dfb4 Mon Sep 17 00:00:00 2001 From: Albin Bergh Date: Tue, 5 Sep 2023 15:39:43 +0100 Subject: [PATCH 19/25] Bananas is hopefully replaced --- Psychrometrics_Engine/Compute/DensityWater.cs | 4 ++-- .../Compute/SaturatedVapourPressureWater.cs | 4 ++-- Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs | 6 +++--- Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Psychrometrics_Engine/Compute/DensityWater.cs b/Psychrometrics_Engine/Compute/DensityWater.cs index 770aba7..91bf298 100644 --- a/Psychrometrics_Engine/Compute/DensityWater.cs +++ b/Psychrometrics_Engine/Compute/DensityWater.cs @@ -37,7 +37,7 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates water density from temperature.")] - [Input("temperature", "Temperature.", typeof(Temperature))] + [Input("water temperature", "Water Temperature.", typeof(Temperature))] [Output("density", "Density.", typeof(Density))] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.DensityWater(System.Double)")] public static double DensityWater(double temperature) @@ -45,7 +45,7 @@ public static double DensityWater(double temperature) double t = Units.Convert.ToDegreeCelsius(temperature); if (t < 0 || t > 150) { - BH.Engine.Base.Compute.RecordError("Temperature must be greater than 0 and less than 150 degC."); + BH.Engine.Base.Compute.RecordError("Water temperature must be greater than 273.15 and less than 423.15 K."); return double.NaN; } else diff --git a/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs b/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs index ea7b312..78a9387 100644 --- a/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs +++ b/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs @@ -36,7 +36,7 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates water SaturatedVapourPressure from temperature.")] - [Input("temperature", "Temperature.", typeof(Temperature))] + [Input("water temperature", "Water Temperature.", typeof(Temperature))] [Output("saturatedVapourPressure", "Saturated Vapour Pressure.", typeof(Pressure))] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.SaturatedVapourPressureWater(System.Double)")] public static double SaturatedVapourPressureWater(double temperature) @@ -46,7 +46,7 @@ public static double SaturatedVapourPressureWater(double temperature) double t = Units.Convert.ToDegreeCelsius(temperature); if (t < 0 || t > 150) { - BH.Engine.Base.Compute.RecordError("Temperature must be greater than 0 and less than 150 degC."); + BH.Engine.Base.Compute.RecordError("Water temperature must be greater than 273.15 and less than 423.15 K."); return double.NaN; } else if (Units.Convert.ToDegreeCelsius(temperature) < 21) diff --git a/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs b/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs index 24cfe61..aee627a 100644 --- a/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs +++ b/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs @@ -35,8 +35,8 @@ namespace BH.Engine.Psychrometrics { public static partial class Compute { - [Description("Calculates Water SpecificHeatCapacity from temperature.")] - [Input("temperature", "Temperature.", typeof(Temperature))] + [Description("Calculates Water SpecificHeatCapacity from water temperature.")] + [Input("water temperature", "Water Temperature.", typeof(Temperature))] [Output("specificHeatCapacity", "Specific Heat Capacity (kJ/kgK).")] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.SpecificHeatCapacityWater(System.Double)")] public static double SpecificHeatCapacityWater(double temperature) @@ -45,7 +45,7 @@ public static double SpecificHeatCapacityWater(double temperature) double t = Units.Convert.ToDegreeCelsius(temperature); if (t < 0 || t > 150) { - BH.Engine.Base.Compute.RecordError("Temperature must be greater than 273.15 K and less than 423.15 K."); + BH.Engine.Base.Compute.RecordError("Water temperature must be greater than 273.15 K and less than 423.15 K."); return double.NaN; } else diff --git a/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs b/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs index 5928812..e75c203 100644 --- a/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs +++ b/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs @@ -34,9 +34,9 @@ namespace BH.Engine.Psychrometrics { public static partial class Compute { - [Description("Calculates temperature as a function of altitude.")] - [Input("altitude", "Altitude.", typeof(Length))] - [Output("temperature", "Temperature.", typeof(Temperature))] + [Description("Calculates air temperature as a function of altitude above sea level.")] + [Input("altitude above sea level", "Altitude above sea level.", typeof(Length))] + [Output("air temperature", "Air Temperature.", typeof(Temperature))] public static double TemperatureAtAltitude(double altitude) { PsychroLib.Psychrometrics psy = new PsychroLib.Psychrometrics(PsychroLib.UnitSystem.SI); From 5a54bbc5c8cb233de0581773659d733392e55ec7 Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Tue, 5 Sep 2023 19:05:21 +0100 Subject: [PATCH 20/25] Update Psychrometrics_Engine/Compute/DensityWater.cs --- Psychrometrics_Engine/Compute/DensityWater.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/DensityWater.cs b/Psychrometrics_Engine/Compute/DensityWater.cs index 91bf298..5d52ff4 100644 --- a/Psychrometrics_Engine/Compute/DensityWater.cs +++ b/Psychrometrics_Engine/Compute/DensityWater.cs @@ -37,7 +37,7 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates water density from temperature.")] - [Input("water temperature", "Water Temperature.", typeof(Temperature))] + [Input("temperature", "Water Temperature.", typeof(Temperature))] [Output("density", "Density.", typeof(Density))] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.DensityWater(System.Double)")] public static double DensityWater(double temperature) From 663a3bc810acdc2aca0d80148c727da38e174e14 Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Tue, 5 Sep 2023 19:05:29 +0100 Subject: [PATCH 21/25] Update Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs --- Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs b/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs index 78a9387..66595ba 100644 --- a/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs +++ b/Psychrometrics_Engine/Compute/SaturatedVapourPressureWater.cs @@ -36,7 +36,7 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates water SaturatedVapourPressure from temperature.")] - [Input("water temperature", "Water Temperature.", typeof(Temperature))] + [Input("temperature", "Water Temperature.", typeof(Temperature))] [Output("saturatedVapourPressure", "Saturated Vapour Pressure.", typeof(Pressure))] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.SaturatedVapourPressureWater(System.Double)")] public static double SaturatedVapourPressureWater(double temperature) From de1b12d30fa9cf6bb1976c66fb74866da31f6505 Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Tue, 5 Sep 2023 19:05:35 +0100 Subject: [PATCH 22/25] Update Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs --- Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs b/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs index aee627a..1ed28c1 100644 --- a/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs +++ b/Psychrometrics_Engine/Compute/SpecificHeatCapacityWater.cs @@ -36,7 +36,7 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates Water SpecificHeatCapacity from water temperature.")] - [Input("water temperature", "Water Temperature.", typeof(Temperature))] + [Input("temperature", "Water Temperature.", typeof(Temperature))] [Output("specificHeatCapacity", "Specific Heat Capacity (kJ/kgK).")] [PreviousVersion("6.3", "BH.Engine.Climate.Compute.SpecificHeatCapacityWater(System.Double)")] public static double SpecificHeatCapacityWater(double temperature) From e0ca37fd61dab910d1851008d0c0f78edd177f67 Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Tue, 5 Sep 2023 19:05:41 +0100 Subject: [PATCH 23/25] Update Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs --- Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs b/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs index e75c203..10782ec 100644 --- a/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs +++ b/Psychrometrics_Engine/Compute/TemperatureAtAltitude.cs @@ -35,7 +35,7 @@ namespace BH.Engine.Psychrometrics public static partial class Compute { [Description("Calculates air temperature as a function of altitude above sea level.")] - [Input("altitude above sea level", "Altitude above sea level.", typeof(Length))] + [Input("altitude", "Altitude above sea level.", typeof(Length))] [Output("air temperature", "Air Temperature.", typeof(Temperature))] public static double TemperatureAtAltitude(double altitude) { From 3b0ef569ab2a70fe7ba75a4fce34dcd6e2ea4992 Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Wed, 6 Sep 2023 09:33:38 +0100 Subject: [PATCH 24/25] Update dependencies.txt --- dependencies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.txt b/dependencies.txt index ac4c5d7..e9d07b7 100644 --- a/dependencies.txt +++ b/dependencies.txt @@ -1,4 +1,4 @@ BHoM/BHoM BHoM/BHoM_Engine BHoM/Units_Engine -BHoM/Quantities_oM \ No newline at end of file +BHoM/Localisation_Toolkit \ No newline at end of file From 9ce8b6d10b1339d1a865245295e7dc25ebcef3ea Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Wed, 6 Sep 2023 10:25:41 +0100 Subject: [PATCH 25/25] Update dependencies.txt --- dependencies.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/dependencies.txt b/dependencies.txt index e9d07b7..289f313 100644 --- a/dependencies.txt +++ b/dependencies.txt @@ -1,4 +1,3 @@ BHoM/BHoM BHoM/BHoM_Engine -BHoM/Units_Engine BHoM/Localisation_Toolkit \ No newline at end of file