Updating bindings to change in wincalc interface.

LBNL-ETA · Feb 4, 2022 · db5bc99 · db5bc99
1 parent 3b69862
commit db5bc99
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 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 "jan_2022"
+    GIT_TAG "develop"
 
     UPDATE_COMMAND ""
     PATCH_COMMAND ""

diff --git a/src/pywincalc.cpp b/src/pywincalc.cpp
@@ -1234,20 +1234,8 @@ PYBIND11_MODULE(pywincalc, m) {
 	  .def_readwrite("emissivity_front_hemispheric", &wincalc::ThermalIRResults::emissivity_front_hemispheric)
       .def_readwrite("emissivity_back_hemispheric", &wincalc::ThermalIRResults::emissivity_back_hemispheric);
 
-  m.def("calc_thermal_ir", &wincalc::calc_thermal_ir, py::arg("optical_standard"), py::arg("product_data"), 
-		py::arg("wavelength_range_method") = wincalc::Spectal_Data_Wavelength_Range_Method::FULL,
-		py::arg("number_visible_bands") = 5, py::arg("number_solar_bands") = 10);
-#if 0	  
-  m.def("calc_thermal_ir", py::overload_cast<window_standards::Optical_Standard const&, wincalc::Product_Data_Optical_Thermal const&,
-		wincalc::Spectal_Data_Wavelength_Range_Method const&,int,int>(&wincalc::calc_thermal_ir), py::arg("optical_standard"), py::arg("product_data"), 
-		py::arg("wavelength_range_method") = wincalc::Spectal_Data_Wavelength_Range_Method::FULL,
-		py::arg("number_visible_bands") = 5, py::arg("number_solar_bands") = 10);
-
-//  m.def("calc_thermal_ir", py::overload_cast<window_standards::Optical_Standard const&, std::shared_ptr<OpticsParser::ProductData> const&,
-//		wincalc::Spectal_Data_Wavelength_Range_Method const&,int,int>(&wincalc::calc_thermal_ir), py::arg("optical_standard"), py::arg("product_data"), 
-//		py::arg("wavelength_range_method") = wincalc::Spectal_Data_Wavelength_Range_Method::FULL,
-//		py::arg("number_visible_bands") = 5, py::arg("number_solar_bands") = 10);
-#endif 
+  m.def("calc_thermal_ir", &wincalc::calc_thermal_ir, py::arg("optical_standard"), py::arg("product_data"));
+
   m.def("get_spacer_keff", &wincalc::get_spacer_keff,
         "Calculate the effective conductivity of a spacer from a THERM thmx "
         "file.");