Merge pull request #19 from LBNL-ETA/develop

Develop
LBNL-ETA · Apr 28, 2023 · 054002e · 054002e
2 parents 5926a29 + d3b0e32
commit 054002e
Show file tree

Hide file tree

Showing 47 changed files with 178 additions and 288 deletions.
diff --git a/CMakeLists-OpticalMeasurementParser.txt.in b/CMakeLists-OpticalMeasurementParser.txt.in
@@ -4,7 +4,7 @@ include(ExternalProject)
 
 ExternalProject_Add(OpticalMeasurementParser
     GIT_REPOSITORY https://github.com/LBNL-ETA/OpticalMeasurementParser.git
-    GIT_TAG "oct_2022_refactor"
+    GIT_TAG "v2.0.0"
 
     UPDATE_COMMAND ""
     PATCH_COMMAND ""

diff --git a/CMakeLists-THMXParser.txt.in b/CMakeLists-THMXParser.txt.in
@@ -4,7 +4,7 @@ include(ExternalProject)
 
 ExternalProject_Add(THMXParser
     GIT_REPOSITORY https://github.com/LBNL-ETA/THMXParser.git
-    GIT_TAG "WINDOW_CMA"
+    GIT_TAG "v1.1.0"
 
     UPDATE_COMMAND ""
     PATCH_COMMAND ""

diff --git a/CMakeLists-Windows-CalcEngine.txt.in b/CMakeLists-Windows-CalcEngine.txt.in
@@ -4,7 +4,7 @@ include(ExternalProject)
 
 ExternalProject_Add(Windows-CalcEngine
     GIT_REPOSITORY https://github.com/LBNL-ETA/Windows-CalcEngine.git
-    GIT_TAG "Version_1.0.39"
+    GIT_TAG "Version_1.0.40"
 
     UPDATE_COMMAND ""
     PATCH_COMMAND ""

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project( wincalc VERSION 2.2.9 LANGUAGES CXX )
+project( wincalc VERSION 2.3.0 LANGUAGES CXX )
 set(LIB_NAME ${PROJECT_NAME})
 
 if(NOT "${CMAKE_CXX_STANDARD}")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -9,8 +9,6 @@ add_library( ${LIB_NAME}
 		create_wce_objects.cpp
 		glazing_system.h
 		glazing_system.cpp
-		gap.h
-		gap.cpp
 		optical_calc_params.h
 		environmental_conditions.h
 		environmental_conditions.cpp

diff --git a/src/create_wce_objects.cpp b/src/create_wce_objects.cpp
@@ -1057,7 +1057,7 @@ namespace wincalc
 
     Tarcog::ISO15099::CIGU
       create_igu(std::vector<wincalc::Product_Data_Optical_Thermal> const & layers,
-                 std::vector<Engine_Gap_Info> const & gaps,
+                 std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>> const & gaps,
                  double width,
                  double height,
                  double tilt,
@@ -1098,24 +1098,7 @@ namespace wincalc
             tarcog_solid_layers.push_back(tarcog_layer);
         }
 
-        std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>> tarcog_gaps;
-        for(const Engine_Gap_Info & engine_gap_info : gaps)
-        {
-            std::vector<std::pair<double, Gases::CGasData>> converted_gas;
-            for(Engine_Gas_Mixture_Component gas : engine_gap_info.gases)
-            {
-                converted_gas.emplace_back(gas.percent, gas.gas);
-            }
-            auto gap = Tarcog::ISO15099::Layers::gap(
-              engine_gap_info.thickness, Gases::CGas(converted_gas), engine_gap_info.pressure);
-            if(engine_gap_info.pillar)
-            {
-                gap = engine_gap_info.pillar->createGapPillar(gap);
-            }
-            tarcog_gaps.push_back(gap);
-        }
-
-        return create_igu(tarcog_solid_layers, tarcog_gaps, width, height, tilt);
+        return create_igu(tarcog_solid_layers, gaps, width, height, tilt);
     }
 
     Tarcog::ISO15099::CSystem create_system(Tarcog::ISO15099::CIGU & igu,
@@ -1126,4 +1109,16 @@ namespace wincalc
         auto system = Tarcog::ISO15099::CSystem(igu, indoor, outdoor);
         return system;
     }
+
+	Gases::CGas create_gas(std::vector<std::pair<double, std::variant<Gases::GasDef, Gases::CGasData>>> const& components)
+	{
+		auto gas = Gases::CGas();
+		for(const auto & item : components)
+		{
+			auto percent = item.first;
+			std::visit([&gas, percent](auto arg) { gas.addGasItem(percent, arg); }, item.second);
+		}
+
+		return gas;
+	}
 }   // namespace wincalc
diff --git a/src/create_wce_objects.h b/src/create_wce_objects.h
@@ -13,7 +13,6 @@
 #include <OpticsProductData.hpp>
 #include <windows_standards/windows_standard.h>
 
-#include "gap.h"
 #include "environmental_conditions.h"
 #include "product_data.h"
 
@@ -32,7 +31,7 @@ namespace wincalc
     std::shared_ptr<Tarcog::ISO15099::COutdoorEnvironment>
       create_outdoor_environment(Environment const & environment);
 
-    // std::vector<Engine_Gap_Info> convert(std::vector<Gap_Data> const & data);
+    // std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>> convert(std::vector<Gap_Data> const & data);
 
 
     // SpectralAveraging::MeasuredRow convert(OpticsParser::WLData const & data);
@@ -92,7 +91,7 @@ namespace wincalc
 
     Tarcog::ISO15099::CIGU
       create_igu(std::vector<wincalc::Product_Data_Optical_Thermal> const & layers,
-                 std::vector<Engine_Gap_Info> const & gaps,
+                 std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>> const & gaps,
                  double width,
                  double height,
                  double tilt,
@@ -119,6 +118,6 @@ namespace wincalc
                                   double product_data_maximum_wavelength,
                                   FenestrationCommon::CSeries const & source_spectrum);
 
-
+	Gases::CGas create_gas(std::vector<std::pair<double, std::variant<Gases::GasDef, Gases::CGasData>>> const& components);
 }   // namespace wincalc
 #endif
diff --git a/src/gap.cpp b/src/gap.cpp
diff --git a/src/gap.h b/src/gap.h
diff --git a/src/glazing_system.cpp b/src/glazing_system.cpp
@@ -304,7 +304,7 @@ namespace wincalc
     Glazing_System::Glazing_System(
       window_standards::Optical_Standard const & standard,
       std::vector<Product_Data_Optical_Thermal> const & product_data,
-      std::vector<Engine_Gap_Info> const & gap_values,
+      std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>> const & gap_values,
       double width,
       double height,
       double tilt,
@@ -331,7 +331,7 @@ namespace wincalc
     Glazing_System::Glazing_System(
       window_standards::Optical_Standard const & standard,
       std::vector<OpticsParser::ProductData> const & product_data,
-      std::vector<Engine_Gap_Info> const & gap_values,
+      std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>> const & gap_values,
       double width,
       double height,
       double tilt,
@@ -385,7 +385,7 @@ namespace wincalc
       window_standards::Optical_Standard const & standard,
       std::vector<std::variant<OpticsParser::ProductData, Product_Data_Optical_Thermal>> const &
         product_data,
-      std::vector<Engine_Gap_Info> const & gap_values,
+      std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>> const & gap_values,
       double width,
       double height,
       double tilt,

diff --git a/src/glazing_system.h b/src/glazing_system.h
@@ -7,7 +7,6 @@
 #include <windows_standards/windows_standard.h>
 #include <WCEGases.hpp>
 #include <WCETarcog.hpp>
-#include "gap.h"
 #include "optical_results.h"
 #include "environmental_conditions.h"
 #include "product_data.h"
@@ -21,7 +20,7 @@ namespace wincalc
         Glazing_System(
           window_standards::Optical_Standard const & standard,
           std::vector<Product_Data_Optical_Thermal> const & product_data,
-          std::vector<Engine_Gap_Info> const & gap_values = std::vector<Engine_Gap_Info>(),
+          std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>> const & gap_values = std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>>(),
           double width = 1.0,
           double height = 1.0,
           double tilt = 90,
@@ -36,7 +35,7 @@ namespace wincalc
         Glazing_System(
           window_standards::Optical_Standard const & standard,
           std::vector<OpticsParser::ProductData> const & product_data,
-          std::vector<Engine_Gap_Info> const & gap_values = std::vector<Engine_Gap_Info>(),
+          std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>> const & gap_values = std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>>(),
           double width = 1.0,
           double height = 1.0,
           double tilt = 90,
@@ -53,7 +52,7 @@ namespace wincalc
           window_standards::Optical_Standard const & standard,
           std::vector<std::variant<OpticsParser::ProductData, Product_Data_Optical_Thermal>> const &
             product_data,
-          std::vector<Engine_Gap_Info> const & gap_values = std::vector<Engine_Gap_Info>(),
+          std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>> const & gap_values = std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>>(),
           double width = 1.0,
           double height = 1.0,
           double tilt = 90,
@@ -124,7 +123,7 @@ namespace wincalc
 
     protected:
         std::vector<Product_Data_Optical_Thermal> product_data;
-        std::vector<Engine_Gap_Info> gap_values;
+        std::vector<std::shared_ptr<Tarcog::ISO15099::CIGUGapLayer>> gap_values;
         window_standards::Optical_Standard standard;
         double width;
         double height;

diff --git a/src/thermal_ir.cpp b/src/thermal_ir.cpp
@@ -1,6 +1,6 @@
 #include "thermal_ir.h"
 #include "convert_optics_parser.h"
-
+#include "create_wce_objects.h"
 
 wincalc::ThermalIRResults
   wincalc::calc_thermal_ir(window_standards::Optical_Standard const & standard,

diff --git a/src/thermal_ir.h b/src/thermal_ir.h
@@ -1,17 +1,9 @@
 #ifndef WINCALC_THERMAL_IR_H_
 #define WINCALC_THERMAL_IR_H_
 
-#include <vector>
-#include <variant>
-#include <OpticsParser.hpp>
 #include <windows_standards/windows_standard.h>
-#include <WCEGases.hpp>
-#include <WCETarcog.hpp>
-#include "gap.h"
 #include "optical_results.h"
-#include "environmental_conditions.h"
 #include "product_data.h"
-#include "create_wce_objects.h"
 
 namespace wincalc
 {