Merge pull request #42 from LBNL-ETA/develop

Develop

Author: StephenCzarnecki

CMakeLists-WinCalc.txt.in

@@ -4,7 +4,7 @@ include(ExternalProject)
 
 ExternalProject_Add(wincalc
     GIT_REPOSITORY https://github.com/LBNL-ETA/WinCalc.git
-    GIT_TAG "v2.3.0"
+    GIT_TAG "v2.4.0"
 
     UPDATE_COMMAND ""
     PATCH_COMMAND ""

examples/deflection.py

@@ -36,7 +36,7 @@
 glazing_system.enable_deflection(True)
 
 # Set initial temperature and pressure.  Values just chosen for example purposes
-glazing_system.set_deflection_properties(temperature_initial=273, pressure_initial=101320)
+glazing_system.set_deflection_properties(temperature_at_construction=273, pressure_at_construction=101320)
 
 # Density can be calculated using either U or SHGC TARCOG system types.  Just using SHGC for this
 # example for simplicity.
@@ -54,7 +54,7 @@
 print("\tVT: {val}".format(val=visible_results.system_results.front.transmittance.direct_hemispherical))
 
 # Change initial temperature and pressure.  Values just chosen for example purposes
-glazing_system.set_deflection_properties(temperature_initial=290, pressure_initial=101450)
+glazing_system.set_deflection_properties(temperature_at_construction=290, pressure_at_construction=101450)
 print("")
 print("Changed initial temperature and pressure")
 print("\tdeflection max: {val}".format(val=deflection_results.deflection_max))
@@ -174,7 +174,7 @@
 
 glazing_system.environments(custom_env_2)
 
-glazing_system.set_deflection_properties(temperature_initial=273, pressure_initial=101320)
+glazing_system.set_deflection_properties(temperature_at_construction=273, pressure_at_construction=101320)
 deflection_results = glazing_system.calc_deflection_properties(pywincalc.TarcogSystemType.SHGC)
 
 print("")
@@ -204,7 +204,7 @@
                                                  height_meters=height, tilt_degrees=tilt, environment=custom_env_2)
 
 glazing_system.enable_deflection(True)
-glazing_system.set_deflection_properties(temperature_initial=273, pressure_initial=101320)
+glazing_system.set_deflection_properties(temperature_at_construction=273, pressure_at_construction=101320)
 deflection_results = glazing_system.calc_deflection_properties(pywincalc.TarcogSystemType.SHGC)
 
 print("")
@@ -219,3 +219,22 @@
     "\tLayer temperatures (SHGC): {val}".format(val=glazing_system.layer_temperatures(pywincalc.TarcogSystemType.SHGC)))
 visible_results = glazing_system.optical_method_results("PHOTOPIC")
 print("\tVT: {val}".format(val=visible_results.system_results.front.transmittance.direct_hemispherical))
+
+
+# If the deflection of the solid layers has been measured it can be used instead of temperature and pressure
+# to calculate other properties
+glazing_system.set_deflection_properties(measured_deflected_gaps=[.01, .015])
+deflection_results = glazing_system.calc_deflection_properties(pywincalc.TarcogSystemType.SHGC)
+
+print("")
+print("Set measured gap widths")
+print("\tdeflection max: {val}".format(val=deflection_results.deflection_max))
+print("\tdeflection mean: {val}".format(val=deflection_results.deflection_mean))
+print("\tpanes load: {val}".format(val=deflection_results.panes_load))
+print("\tU: {val}".format(val=glazing_system.u()))
+print("\tSHGC: {val}".format(val=glazing_system.shgc()))
+print("\tLayer temperatures (U): {val}".format(val=glazing_system.layer_temperatures(pywincalc.TarcogSystemType.U)))
+print(
+    "\tLayer temperatures (SHGC): {val}".format(val=glazing_system.layer_temperatures(pywincalc.TarcogSystemType.SHGC)))
+visible_results = glazing_system.optical_method_results("PHOTOPIC")
+print("\tVT: {val}".format(val=visible_results.system_results.front.transmittance.direct_hemispherical))

examples/gaps_and_gases.py

@@ -73,11 +73,16 @@
 # Add circular pillars to the gap
 gap_6 = pywincalc.Layers.add_circular_pillar(gap_6, conductivity=999, spacing=0.03, radius=0.0002)
 
-gaps = [gap_1, gap_2, gap_3, gap_4, gap_5, gap_6]
+# Gaps can now have forced ventilation.  To create one first create a regular gap and then convert
+# to a forced ventilated gap.  The gap that will be converted can be any of the above.
+gap_7 = pywincalc.Layers.gap(thickness=.0127)  # .0127 is gap thickness in meters
+gap_7 = pywincalc.forced_ventilation_gap(gap=gap_7, forced_ventilation_air_speed=0.3, forced_ventilation_air_temperature=295)
+
+gaps = [gap_1, gap_2, gap_3, gap_4, gap_5, gap_6, gap_7]
 
 clear_3_path = "products/CLEAR_3.DAT"
 clear_3 = pywincalc.parse_optics_file(clear_3_path)
-solid_layers = [clear_3] * 7
+solid_layers = [clear_3] * 8
 
 # Create a glazing system.  This only shows an example of getting one result from a glazing system
 # created using default environmental conditions.
@@ -87,4 +92,4 @@
 # For more on environmental conditions see environmental_conditions_user_defined.py
 glazing_system = pywincalc.GlazingSystem(solid_layers=solid_layers, gap_layers=gaps)
 u_value = glazing_system.u()
-print("U-value for six-layer system of various gases: {v}".format(v=u_value))
+print("U-value for seven-layer system of various gases: {v}".format(v=u_value))

pywincalc/__init__.py

@@ -37,7 +37,7 @@
     OpticalResultLayer, OpticalResultSide, OpticalResultSideColor, OpticalResultSide_Layer, OpticalResultTransmission, \
     OpticalResultTransmissionColor, OpticalResults, OpticalResultsColor, OpticalStandard, OpticalStandardMethod, \
     PVPowerProperty, PVWavelengthData, ParsedPerforatedGeometry, ParsedVenetianGeometry, ParsedWovenGeometry, \
-    PerforatedGeometry, PredefinedGasConverter, PredefinedGasType, ProductComposistionData, ProductData, \
+    PerforatedGeometry, PredefinedGasType, ProductComposistionData, ProductData, \
     ProductDataOptical, ProductDataOpticalAndThermal, ProductDataOpticalDualBand, \
     ProductDataOpticalDualBandBSDF, ProductDataOpticalDualBandHemispheric, ProductDataOpticalNBand, \
     ProductDataOpticalPerforatedScreen, ProductDataOpticalVenetian, ProductDataOpticalWithMaterial, \
@@ -51,7 +51,9 @@
     create_best_worst_u_factor_option, create_gas, create_perforated_screen, create_venetian_blind, create_woven_shade, \
     get_cma_window_double_vision_horizontal, get_cma_window_double_vision_vertical, get_cma_window_single_vision, \
     get_spacer_keff, nfrc_shgc_environments, nfrc_u_environments, parse_bsdf_xml_file, parse_bsdf_xml_string, \
-    parse_json, parse_json_file, parse_optics_file, parse_thmx_file, parse_thmx_string
+    parse_json, parse_json_file, parse_optics_file, parse_thmx_file, parse_thmx_string, IGUVentilatedGapLayer, \
+	forced_ventilation_gap
+	
 
 
 @deprecation.deprecated(deprecated_in="3.0.0", removed_in="4.0.0",