Updated objects to ensure names match corresponding objects in Python to avoid failure in passing data between languages

Author: tg359

LadybugTools_Engine/Compute/ExternalComfort.cs

@@ -30,6 +30,7 @@
 using BH.oM.LadybugTools;
 using BH.Engine.Serialiser;
 using BH.Engine.Geometry;
+using BH.Engine.Base;
 
 namespace BH.Engine.LadybugTools
 {
@@ -86,6 +87,12 @@ public static ExternalComfort ExternalComfort(SimulationResult simulationResult,
 
             string output = env.RunPythonString(pythonScript).Trim().Split(new string[] { "\r\n", "\r", "\n" }, StringSplitOptions.None).Last();
 
+            if (output.Substring(0, 12).Contains("error"))
+            {
+                BH.Engine.Base.Compute.RecordError(Serialiser.Convert.FromJson(output).PropertyValue("error").ToString());
+                return null;
+            }
+            
             // reload from Python results
             return (ExternalComfort)Serialiser.Convert.FromJson(output);
         }

LadybugTools_Engine/Compute/SimulationResult.cs

@@ -30,6 +30,7 @@
 using System.IO;
 using BH.oM.LadybugTools;
 using BH.Engine.Serialiser;
+using BH.Engine.Base;
 
 namespace BH.Engine.LadybugTools
 {
@@ -91,6 +92,12 @@ public static SimulationResult SimulationResult(string epwFile, ILadybugToolsMat
             });
             string output = env.RunPythonString(pythonScript).Trim().Split(new string[] { "\r\n", "\r", "\n" }, StringSplitOptions.None).Last();
 
+            if (output.Substring(0, 12).Contains("error"))
+            {
+                BH.Engine.Base.Compute.RecordError(Serialiser.Convert.FromJson(output).PropertyValue("error").ToString());
+                return null;
+            }
+            
             // reload from Python results
             return (SimulationResult)Serialiser.Convert.FromJson(output);
         }

LadybugTools_Engine/Create/Typology.cs

@@ -77,7 +77,7 @@ public static Typology Typology(List<Shelter> shelters = null, string name = "",
 
             return new Typology()
             {
-                Name = name,
+                Name = rtnName,
                 Shelters = shelters.Where(s => s != null).ToList(),
                 EvaporativeCoolingEffect = Enumerable.Repeat(evaporativeCoolingEffect, 8760).ToList(),
                 WindSpeedMultiplier = Enumerable.Repeat(windSpeedMultiplier, 8760).ToList(),

LadybugTools_oM/SimulationResult.cs

@@ -39,47 +39,27 @@ public class SimulationResult : BHoMObject
 
         // simulated properties
         [Description("The simulated property from this object.")]
-        public virtual CustomObject ShadedDownDirectIrradiance { get; set; } = new CustomObject();
-        [Description("The simulated property from this object.")]
-        public virtual CustomObject ShadedDownDiffuseIrradiance { get; set; } = new CustomObject();
-        [Description("The simulated property from this object.")]
-        public virtual CustomObject ShadedDownTotalIrradiance { get; set; } = new CustomObject();
-        [Description("The simulated property from this object.")]
         public virtual CustomObject ShadedDownTemperature { get; set; } = new CustomObject();
         [Description("The simulated property from this object.")]
-        public virtual CustomObject ShadedUpDiffuseIrradiance { get; set; } = new CustomObject();
-        [Description("The simulated property from this object.")]
-        public virtual CustomObject ShadedUpDirectIrradiance { get; set; } = new CustomObject();
-        [Description("The simulated property from this object.")]
-        public virtual CustomObject ShadedUpTotalIrradiance { get; set; } = new CustomObject();
-        [Description("The simulated property from this object.")]
         public virtual CustomObject ShadedUpTemperature { get; set; } = new CustomObject();
         [Description("The simulated property from this object.")]
-        public virtual CustomObject ShadedLongwaveMeanRadiantTemperature { get; set; } = new CustomObject();
-        [Description("The simulated property from this object.")]
-        public virtual CustomObject ShadedShortwaveMeanRadiantTemperature { get; set; } = new CustomObject();
+        public virtual CustomObject ShadedRadiantTemperature { get; set; } = new CustomObject();
         [Description("The simulated property from this object.")]
-        public virtual CustomObject ShadedMeanRadiantTemperature { get; set; } = new CustomObject();
-        [Description("The simulated property from this object.")]
-        public virtual CustomObject UnshadedDownDiffuseIrradiance { get; set; } = new CustomObject();
+        public virtual CustomObject ShadedLongwaveMeanRadiantTemperatureDelta { get; set; } = new CustomObject();
         [Description("The simulated property from this object.")]
-        public virtual CustomObject UnshadedDownDirectIrradiance { get; set; } = new CustomObject();
+        public virtual CustomObject ShadedShortwaveMeanRadiantTemperatureDelta { get; set; } = new CustomObject();
         [Description("The simulated property from this object.")]
-        public virtual CustomObject UnshadedDownTotalIrradiance { get; set; } = new CustomObject();
+        public virtual CustomObject ShadedMeanRadiantTemperature { get; set; } = new CustomObject();
         [Description("The simulated property from this object.")]
         public virtual CustomObject UnshadedDownTemperature { get; set; } = new CustomObject();
         [Description("The simulated property from this object.")]
-        public virtual CustomObject UnshadedUpDiffuseIrradiance { get; set; } = new CustomObject();
-        [Description("The simulated property from this object.")]
-        public virtual CustomObject UnshadedUpDirectIrradiance { get; set; } = new CustomObject();
-        [Description("The simulated property from this object.")]
-        public virtual CustomObject UnshadedUpTotalIrradiance { get; set; } = new CustomObject();
-        [Description("The simulated property from this object.")]
         public virtual CustomObject UnshadedUpTemperature { get; set; } = new CustomObject();
         [Description("The simulated property from this object.")]
-        public virtual CustomObject UnshadedLongwaveMeanRadiantTemperature { get; set; } = new CustomObject();
+        public virtual CustomObject UnshadedRadiantTemperature { get; set; } = new CustomObject();
+        [Description("The simulated property from this object.")]
+        public virtual CustomObject UnshadedLongwaveMeanRadiantTemperatureDelta { get; set; } = new CustomObject();
         [Description("The simulated property from this object.")]
-        public virtual CustomObject UnshadedShortwaveMeanRadiantTemperature { get; set; } = new CustomObject();
+        public virtual CustomObject UnshadedShortwaveMeanRadiantTemperatureDelta { get; set; } = new CustomObject();
         [Description("The simulated property from this object.")]
         public virtual CustomObject UnshadedMeanRadiantTemperature { get; set; } = new CustomObject();
     }