Bindings for custom BSDF definitions added.

Author: vidanovic

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.5.2"
+    GIT_TAG "v2.5.1"
 
     UPDATE_COMMAND ""
     PATCH_COMMAND ""

pywincalc/__init__.py

@@ -2,7 +2,7 @@
 import deprecation
 
 from wincalcbindings import (
-    AirHorizontalDirection, BSDF, BSDFBasisType, BSDFDirection, BSDFDirections, BSDFHemisphere,
+    AirHorizontalDirection, BSDF, BSDFBasisType, BSDFDirection, BSDFDirections, BSDFDefinition, BSDFHemisphere,
     BSDFIntegrator, BoundaryConditionsCoefficientModelType, CMABestWorstUFactors, CMAResult, CMAWindow,
     CMAWindowDualVisionHorizontal, CMAWindowDualVisionVertical, CMAWindowSingleVision, Layers, CellSpacingType, PolygonType, pillar_cell_area,
     PillarData, CylindricalPillar, SphericalPillar, RectangularPillar, TriangularPillar, PentagonPillar, HexagonPillar, LinearBearingPillar, TruncatedConePillar, Glass, PillarMeasurement,
@@ -21,7 +21,7 @@
     ProductDataOpticalDualBandBSDF, ProductDataOpticalDualBandHemispheric, ProductDataOpticalNBand,
     ProductDataOpticalPerforatedScreen, ProductDataOpticalVenetian, ProductDataOpticalWithMaterial,
     ProductDataOpticalWovenShade, ProductDataThermal, ProductGeometry, PropertySimple, RGB, Side,
-    SpectalDataWavelengthRangeMethodType, Spectrum, SpectrumType, SquareMatrix, TarcogSystemType, TarcogEnvironmentType,
+    SpectalDataWavelengthRangeMethodType, Spectrum, SpectrumType, SquareMatrix, TarcogSystemType,
     ThermalIRResults, ThmxBoundaryCondition, ThmxBoundaryConditionPolygon, ThmxCMABestWorstOption, ThmxCMAOptions,
     ThmxFileContents, ThmxMaterial, ThmxMeshParameters, ThmxPolygon, ThmxPolygonPoint, ThmxRGB, ThmxResult,
     ThmxUFactorProjectionResult, ThmxUFactorResults, Trichromatic, VenetianGeometry, WavelengthBSDFs,

src/wincalcbindings.cpp

@@ -1121,20 +1121,26 @@ PYBIND11_MODULE(wincalcbindings, m) {
       .value("HALF", SingleLayerOptics::BSDFBasis::Half)
       .value("FULL", SingleLayerOptics::BSDFBasis::Full);
 
+  py::class_<SingleLayerOptics::BSDFDefinition>(m, "BSDFDefinition")
+      .def(py::init<double, size_t>(),
+           py::arg("theta"), py::arg("number_of_phis"))
+      .def("theta", &SingleLayerOptics::BSDFDefinition::theta)
+      .def("num_of_phis", &SingleLayerOptics::BSDFDefinition::numOfPhis);
+
   py::class_<SingleLayerOptics::BSDFHemisphere>(m, "BSDFHemisphere")
       .def_static("create",
                   py::overload_cast<SingleLayerOptics::BSDFBasis>(
                       &SingleLayerOptics::BSDFHemisphere::create),
                   py::arg("bsdf_basis"))
+      .def_static("create", 
+                  py::overload_cast<std::vector<SingleLayerOptics::BSDFDefinition> const &>(
+                      &SingleLayerOptics::BSDFHemisphere::create), 
+                  py::arg("bsdf_definitions"))
       .def("get_directions", &SingleLayerOptics::BSDFHemisphere::getDirections);
 
   py::enum_<Tarcog::ISO15099::System>(m, "TarcogSystemType", py::arithmetic())
       .value("U", Tarcog::ISO15099::System::Uvalue)
       .value("SHGC", Tarcog::ISO15099::System::SHGC);
-	  
-  py::enum_<Tarcog::ISO15099::Environment>(m, "TarcogEnvironmentType", py::arithmetic())
-      .value("Indoor", Tarcog::ISO15099::Environment::Indoor)
-      .value("Outdoor", Tarcog::ISO15099::Environment::Outdoor);
 
   py::enum_<wincalc::Spectal_Data_Wavelength_Range_Method>(
       m, "SpectalDataWavelengthRangeMethodType", py::arithmetic())
@@ -1250,15 +1256,6 @@ PYBIND11_MODULE(wincalcbindings, m) {
            py::arg("system_type"), py::arg("theta") = 0, py::arg("phi") = 0)
       .def("relative_heat_gain", &wincalc::Glazing_System::relative_heat_gain,
            py::arg("theta") = 0, py::arg("phi") = 0)
-	  .def("heat_flow",
-           &wincalc::Glazing_System::heat_flow,
-           py::arg("system_type"), py::arg("environment_type"), py::arg("theta") = 0, py::arg("phi") = 0)
-	  .def("h",
-           &wincalc::Glazing_System::h,
-           py::arg("system_type"), py::arg("environment_type"), py::arg("theta") = 0, py::arg("phi") = 0)
-	  .def("radiosities",
-           &wincalc::Glazing_System::radiosities,
-           py::arg("system_type"), py::arg("theta") = 0, py::arg("phi") = 0)
       .def("environments",
            py::overload_cast<wincalc::Environments const &>(
                &wincalc::Glazing_System::environments),
@@ -1733,8 +1730,9 @@ PYBIND11_MODULE(wincalcbindings, m) {
 
   py::class_<SingleLayerOptics::BSDFDirections>(m, "BSDFDirections")
       .def(py::init<>())
-      .def(py::init<std::vector<SingleLayerOptics::BSDFDefinition> const &>(),
-           py::arg("definitions"))
+      .def(py::init<std::vector<SingleLayerOptics::BSDFDefinition> const &,
+                    SingleLayerOptics::BSDFDirection>(),
+           py::arg("definitions"), py::arg("side"))
       .def("lambda_vector", &SingleLayerOptics::BSDFDirections::lambdaVector)
       .def("profile_angles", &SingleLayerOptics::BSDFDirections::profileAngles)
       .def("lambda_matrix", &SingleLayerOptics::BSDFDirections::lambdaMatrix)