Merge pull request #40 from LBNL-ETA/develop

Develop
LBNL-ETA · Apr 28, 2023 · c675f05 · c675f05
2 parents f9b08e0 + c93c050
commit c675f05
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists-WinCalc.txt.in b/CMakeLists-WinCalc.txt.in
@@ -4,7 +4,7 @@ include(ExternalProject)
 
 ExternalProject_Add(wincalc
     GIT_REPOSITORY https://github.com/LBNL-ETA/WinCalc.git
-    GIT_TAG "develop"
+    GIT_TAG "v2.3.0"
 
     UPDATE_COMMAND ""
     PATCH_COMMAND ""

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = pywincalc
-version = 3.0.0
+version = 3.1.0
 description = A Python library for calculating thermal and optical properties of glazing systems
 long_description = file: README.md
 long_description_content_type = text/markdown; charset=UTF-8

diff --git a/src/wincalcbindings.cpp b/src/wincalcbindings.cpp
@@ -341,9 +341,12 @@ PYBIND11_MODULE(wincalcbindings, m) {
              std::shared_ptr<OpticsParser::ProductData>>(m, "ProductData")
       .def_readwrite("product_name", &OpticsParser::ProductData::productName)
       .def_readwrite("product_type", &OpticsParser::ProductData::productType)
+      .def_readwrite("product_subtype", &OpticsParser::ProductData::productSubtype)
       .def_readwrite("nfrc_id", &OpticsParser::ProductData::nfrcid)
       .def_readwrite("thickness", &OpticsParser::ProductData::thickness)
       .def_readwrite("conductivity", &OpticsParser::ProductData::conductivity)
+      .def_readwrite("coating_name", &OpticsParser::ProductData::coatingName)
+      .def_readwrite("coated_side", &OpticsParser::ProductData::coatedSide)
       .def_readwrite("ir_transmittance",
                      &OpticsParser::ProductData::IRTransmittance)
       .def_readwrite("emissivity_front",