Updating name of some deflection results. Updated and added results i…

…n deflection.py example

examples/deflection.py

@@ -42,8 +42,8 @@
 # example for simplicity.
 deflection_results = glazing_system.calc_deflection_properties(pywincalc.TarcogSystemType.SHGC)
 print("Initial results")
-print("\tdeflection max: {val}".format(val=deflection_results.deflection_max))
-print("\tdeflection mean: {val}".format(val=deflection_results.deflection_mean))
+print("\tdeflection max: {val}".format(val=deflection_results.layer_deflection_max))
+print("\tdeflection mean: {val}".format(val=deflection_results.layer_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()))
@@ -57,8 +57,8 @@
 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))
-print("\tdeflection mean: {val}".format(val=deflection_results.deflection_mean))
+print("\tdeflection max: {val}".format(val=deflection_results.layer_deflection_max))
+print("\tdeflection mean: {val}".format(val=deflection_results.layer_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()))
@@ -73,8 +73,8 @@
 
 print("")
 print("Set tilt")
-print("\tdeflection max: {val}".format(val=deflection_results.deflection_max))
-print("\tdeflection mean: {val}".format(val=deflection_results.deflection_mean))
+print("\tdeflection max: {val}".format(val=deflection_results.layer_deflection_max))
+print("\tdeflection mean: {val}".format(val=deflection_results.layer_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()))
@@ -91,8 +91,8 @@
 
 print("")
 print("Set applied loads")
-print("\tdeflection max: {val}".format(val=deflection_results.deflection_max))
-print("\tdeflection mean: {val}".format(val=deflection_results.deflection_mean))
+print("\tdeflection max: {val}".format(val=deflection_results.layer_deflection_max))
+print("\tdeflection mean: {val}".format(val=deflection_results.layer_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()))
@@ -152,8 +152,8 @@
 
 print("")
 print("Set custom environmental conditions 1")
-print("\tdeflection max: {val}".format(val=deflection_results.deflection_max))
-print("\tdeflection mean: {val}".format(val=deflection_results.deflection_mean))
+print("\tdeflection max: {val}".format(val=deflection_results.layer_deflection_max))
+print("\tdeflection mean: {val}".format(val=deflection_results.layer_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()))
@@ -179,8 +179,8 @@
 
 print("")
 print("Set custom environmental conditions 2")
-print("\tdeflection max: {val}".format(val=deflection_results.deflection_max))
-print("\tdeflection mean: {val}".format(val=deflection_results.deflection_mean))
+print("\tdeflection max: {val}".format(val=deflection_results.layer_deflection_max))
+print("\tdeflection mean: {val}".format(val=deflection_results.layer_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()))
@@ -209,9 +209,11 @@
 
 print("")
 print("Set density and Young's modulus")
-print("\tdeflection max: {val}".format(val=deflection_results.deflection_max))
-print("\tdeflection mean: {val}".format(val=deflection_results.deflection_mean))
+print("\tdeflection max: {val}".format(val=deflection_results.layer_deflection_max))
+print("\tdeflection mean: {val}".format(val=deflection_results.layer_deflection_mean))
 print("\tpanes load: {val}".format(val=deflection_results.panes_load))
+print("\tgap width max: {val}".format(val=deflection_results.gap_width_max))
+print("\tgap width mean: {val}".format(val=deflection_results.gap_width_mean))
 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)))
@@ -228,9 +230,11 @@
 
 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("\tdeflection max: {val}".format(val=deflection_results.layer_deflection_max))
+print("\tdeflection mean: {val}".format(val=deflection_results.layer_deflection_mean))
 print("\tpanes load: {val}".format(val=deflection_results.panes_load))
+print("\tgap width max: {val}".format(val=deflection_results.gap_width_max))
+print("\tgap width mean: {val}".format(val=deflection_results.gap_width_mean))
 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)))

src/wincalcbindings.cpp

@@ -912,9 +912,9 @@ PYBIND11_MODULE(wincalcbindings, m) {
   m.def("nfrc_shgc_environments", &wincalc::nfrc_shgc_environments);
 
   py::class_<wincalc::Deflection_Results>(m, "DeflectionResults")
-      .def_readwrite("deflection_max",
+      .def_readwrite("layer_deflection_max",
                      &wincalc::Deflection_Results::layer_deflection_max)
-      .def_readwrite("deflection_mean",
+      .def_readwrite("layer_deflection_mean",
                      &wincalc::Deflection_Results::layer_deflection_mean)
       .def_readwrite("panes_load", &wincalc::Deflection_Results::panes_load)
       .def_readwrite("gap_width_max",