#90 Skylight Support

tt-acm · Jun 4, 2015 · 04ba618 · 04ba618
1 parent 105ac9f
commit 04ba618
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/exampleFiles/EnergyAnalysisForDynamo_ex1b_CreateEnergyModelAndSetSurfaceParams.dyn b/exampleFiles/EnergyAnalysisForDynamo_ex1b_CreateEnergyModelAndSetSurfaceParams.dyn
@@ -1,4 +1,4 @@
-<Workspace Version="0.8.0.950" X="-466.538580410639" Y="-138.398242005557" zoom="0.840560985106336" Name="Home" RunType="Automatic" RunPeriod="100" HasRunWithoutCrash="True">
+<Workspace Version="0.8.0.950" X="-384.45682614284" Y="-122.775000428584" zoom="0.706913213877679" Name="Home" RunType="Automatic" RunPeriod="100" HasRunWithoutCrash="True">
   <NamespaceResolutionMap />
   <Elements>
     <DSRevitNodesUI.Levels guid="709e9346-2a23-48aa-8000-42d54f27ee54" type="DSRevitNodesUI.Levels" nickname="Levels" x="675.410141199108" y="465.180763180918" isVisible="true" isUpstreamVisible="true" lacing="Disabled" index="0:Level 1" />
@@ -28,7 +28,7 @@
     <Dynamo.Nodes.DSFunction guid="56d79c96-4bb7-4822-9683-70db774ff22a" type="Dynamo.Nodes.DSFunction" nickname="PrepareEnergyModel.CreateByMassLevels" x="980.447951970478" y="383.090451478389" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="..\src\EnergyAnalysisForDynamo\bin\EnergyAnalysisForDynamo.dll" function="EnergyAnalysisForDynamo.PrepareEnergyModel.CreateByMassLevels@Revit.Elements.AbstractFamilyInstance,Revit.Elements.Element[]" />
     <Dynamo.Nodes.CodeBlockNodeModel guid="d47f0ad9-ee9a-4fa3-8f1a-f8414f21e349" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="1448.90538427329" y="414.010036641195" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="x[1];" ShouldFocus="false" />
     <Dynamo.Nodes.CodeBlockNodeModel guid="98cb8c9e-8cdd-488a-9e8f-02fb9d84d721" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="1855.40010455791" y="416.742603216496" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="x[0];" ShouldFocus="false" />
-    <EnergyAnalysisForDynamo_UI.ConcWallConstTypeDropdown guid="ec6be07c-326a-46d3-b949-62d25ed8dd64" type="EnergyAnalysisForDynamo_UI.ConcWallConstTypeDropdown" nickname="Conceptual Wall Construction Types Dropdown" x="1817.06869263643" y="931.406733730944" isVisible="true" isUpstreamVisible="true" lacing="Disabled" index="0:LightweightConstructionHighInsulation" />
+    <EnergyAnalysisForDynamo_UI.ConcWallConstTypeDropdown guid="ec6be07c-326a-46d3-b949-62d25ed8dd64" type="EnergyAnalysisForDynamo_UI.ConcWallConstTypeDropdown" nickname="Conceptual Wall Construction Types Dropdown" x="1817.06869263643" y="931.406733730944" isVisible="true" isUpstreamVisible="true" lacing="Disabled" index="-1" />
   </Elements>
   <Connectors>
     <Dynamo.Models.ConnectorModel start="709e9346-2a23-48aa-8000-42d54f27ee54" start_index="0" end="56d79c96-4bb7-4822-9683-70db774ff22a" end_index="1" portType="0" />

diff --git a/exampleFiles/EnergyAnalysisForDynamo_ex1c_CreateEnergyModelAndSetZoneParams.dyn b/exampleFiles/EnergyAnalysisForDynamo_ex1c_CreateEnergyModelAndSetZoneParams.dyn
@@ -1,4 +1,4 @@
-<Workspace Version="0.8.0.950" X="-250.684338142606" Y="-59.2308614262861" zoom="0.89085998767321" Name="Home" RunType="Automatic" RunPeriod="100" HasRunWithoutCrash="True">
+<Workspace Version="0.8.0.950" X="-357.542081408454" Y="-50.2520228633932" zoom="1.0265840208158" Name="Home" RunType="Automatic" RunPeriod="100" HasRunWithoutCrash="True">
   <NamespaceResolutionMap />
   <Elements>
     <DSRevitNodesUI.Levels guid="709e9346-2a23-48aa-8000-42d54f27ee54" type="DSRevitNodesUI.Levels" nickname="Levels" x="495.818256117659" y="383.633194891336" isVisible="true" isUpstreamVisible="true" lacing="Disabled" index="0:Level 1" />
@@ -11,15 +11,15 @@
       <Range min="0" max="10" step="1" />
     </DSCoreNodesUI.Input.IntegerSlider>
     <Dynamo.Nodes.DSFunction guid="02e7da6b-cb74-43be-b8d5-1b33a3282eed" type="Dynamo.Nodes.DSFunction" nickname="PrepareEnergyModel.DecomposeZone" x="1583.4170633695" y="395.806417154478" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="..\src\EnergyAnalysisForDynamo\bin\EnergyAnalysisForDynamo.dll" function="EnergyAnalysisForDynamo.PrepareEnergyModel.DecomposeZone@EnergyAnalysisForDynamo.ElementId" />
-    <Dynamo.Nodes.DSFunction guid="8730d5d3-e6f2-429b-9d6a-14fd3c83bedb" type="Dynamo.Nodes.DSFunction" nickname="PrepareEnergyModel.DrawAnalysisSurface" x="1892.03141090302" y="391.554596797366" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="..\src\EnergyAnalysisForDynamo\bin\EnergyAnalysisForDynamo.dll" function="EnergyAnalysisForDynamo.PrepareEnergyModel.DrawAnalysisSurface@EnergyAnalysisForDynamo.ElementId" />
+    <Dynamo.Nodes.DSFunction guid="8730d5d3-e6f2-429b-9d6a-14fd3c83bedb" type="Dynamo.Nodes.DSFunction" nickname="PrepareEnergyModel.DrawAnalysisSurface" x="1900.74992935833" y="395.913856025022" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="..\src\EnergyAnalysisForDynamo\bin\EnergyAnalysisForDynamo.dll" function="EnergyAnalysisForDynamo.PrepareEnergyModel.DrawAnalysisSurface@EnergyAnalysisForDynamo.ElementId" />
     <Dynamo.Nodes.DSFunction guid="4b48e487-5be4-4e8b-bf5b-004ba21f30a2" type="Dynamo.Nodes.DSFunction" nickname="PrepareEnergyModel.SetZoneParameters" x="1578.00817564911" y="748.808712773124" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="..\src\EnergyAnalysisForDynamo\bin\EnergyAnalysisForDynamo.dll" function="EnergyAnalysisForDynamo.PrepareEnergyModel.SetZoneParameters@EnergyAnalysisForDynamo.ElementId,string,string">
       <PortInfo index="1" default="True" />
       <PortInfo index="2" default="True" />
     </Dynamo.Nodes.DSFunction>
     <Dynamo.Nodes.DSFunction guid="6e3fe115-8bcf-412e-af6a-b98616b2b316" type="Dynamo.Nodes.DSFunction" nickname="PrepareEnergyModel.DrawAnalysisZone" x="1580.52316550444" y="305.975501045455" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="..\src\EnergyAnalysisForDynamo\bin\EnergyAnalysisForDynamo.dll" function="EnergyAnalysisForDynamo.PrepareEnergyModel.DrawAnalysisZone@EnergyAnalysisForDynamo.ElementId" />
     <Dynamo.Nodes.DSFunction guid="92452b63-41b1-45e5-9fd1-c2e263a27e77" type="Dynamo.Nodes.DSFunction" nickname="PrepareEnergyModel.CreateByMassLevels" x="778.280357050919" y="278.421074090215" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="..\src\EnergyAnalysisForDynamo\bin\EnergyAnalysisForDynamo.dll" function="EnergyAnalysisForDynamo.PrepareEnergyModel.CreateByMassLevels@Revit.Elements.AbstractFamilyInstance,Revit.Elements.Element[]" />
-    <EnergyAnalysisForDynamo_UI.SpaceTypeDropdown guid="b2b32e02-b709-498d-9fdd-aa5f6c8278a8" type="EnergyAnalysisForDynamo_UI.SpaceTypeDropdown" nickname="Space Types Dropdown" x="1194.91382348499" y="719.980569755075" isVisible="true" isUpstreamVisible="true" lacing="Disabled" index="0:ActiveStorage" />
-    <EnergyAnalysisForDynamo_UI.ConditionType guid="a348e0e5-49db-4262-892e-921e982a0446" type="EnergyAnalysisForDynamo_UI.ConditionType" nickname="Condition Types Dropdown" x="1193.51315735919" y="804.020537302872" isVisible="true" isUpstreamVisible="true" lacing="Disabled" index="0:Heated" />
+    <EnergyAnalysisForDynamo_UI.SpaceTypeDropdown guid="b2b32e02-b709-498d-9fdd-aa5f6c8278a8" type="EnergyAnalysisForDynamo_UI.SpaceTypeDropdown" nickname="Space Types Dropdown" x="1194.91382348499" y="719.980569755075" isVisible="true" isUpstreamVisible="true" lacing="Disabled" index="-1" />
+    <EnergyAnalysisForDynamo_UI.ConditionType guid="a348e0e5-49db-4262-892e-921e982a0446" type="EnergyAnalysisForDynamo_UI.ConditionType" nickname="Condition Types Dropdown" x="1193.51315735919" y="804.020537302872" isVisible="true" isUpstreamVisible="true" lacing="Disabled" index="-1" />
   </Elements>
   <Connectors>
     <Dynamo.Models.ConnectorModel start="709e9346-2a23-48aa-8000-42d54f27ee54" start_index="0" end="92452b63-41b1-45e5-9fd1-c2e263a27e77" end_index="1" portType="0" />

diff --git a/src/EnergyAnalysisForDynamo/PrepareEnergyModel.cs b/src/EnergyAnalysisForDynamo/PrepareEnergyModel.cs
@@ -277,7 +277,7 @@ public static Dictionary<string, object> CreateByMass(AbstractFamilyInstance Mas
         /// </summary>
         /// <param name="ZoneId">The ElementId of the zone to inspect.  Get this from the PrepareEnergyModel > CreateFrom* > ZoneIds output list</param>
         /// <returns></returns>
-        [MultiReturn("WallSurfaceIds", "IntWallSurfaceIds", "GlazingSurfaceIds", "FloorSurfaceIds", "RoofSurfaceIds", "SpaceType", "conditionType")]
+        [MultiReturn("WallSurfaceIds", "IntWallSurfaceIds", "GlazingSurfaceIds", "FloorSurfaceIds", "RoofSurfaceIds", "SkylightSurfaceIds", "SpaceType", "conditionType")]
         public static Dictionary<string, object> DecomposeZone(ElementId ZoneId)
         {
             // local variables
@@ -304,6 +304,7 @@ public static Dictionary<string, object> DecomposeZone(ElementId ZoneId)
             List<EnergyAnalysisForDynamo.ElementId> outGlazingSurfaceIds = Helper.GetSurfaceIdsFromZoneBasedOnType(zone, "Mass Glazing");
             List<EnergyAnalysisForDynamo.ElementId> outFloorSurfaceIds = Helper.GetSurfaceIdsFromZoneBasedOnType(zone, "Mass Floor");
             List<EnergyAnalysisForDynamo.ElementId> outRoofSurfaceIds = Helper.GetSurfaceIdsFromZoneBasedOnType(zone, "Mass Roof");
+            List<EnergyAnalysisForDynamo.ElementId> outSkylightSurfaceIds = Helper.GetSurfaceIdsFromZoneBasedOnType(zone, "Mass Skylight");
             // Revit consider both floor and ceiling and floor so this one is out!
             // List<EnergyAnalysisForDynamo.ElementId> outCeilingSurfaceIds = Helper.GetSurfaceIdsFromZoneBasedOnType(zone, "Mass Interior Ceiling");
 
@@ -321,6 +322,7 @@ public static Dictionary<string, object> DecomposeZone(ElementId ZoneId)
                 {"GlazingSurfaceIds", outGlazingSurfaceIds},
                 {"FloorSurfaceIds", outFloorSurfaceIds},
                 {"RoofSurfaceIds", outRoofSurfaceIds},
+                {"SkylightSurfaceIds", outSkylightSurfaceIds},
                 {"SpaceType", spaceType},
                 {"conditionType", conditionType}
             };