Updating expected results for forced ventilation. Changing target of …

…Windows-CalcEngine to target main.
LBNL-ETA · Jun 29, 2023 · 32679cb · 32679cb
2 parents d49b135 + 81df986
commit 32679cb
Show file tree

Hide file tree

Showing 7 changed files with 138 additions and 4 deletions.
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.41"
+    GIT_TAG "main"
 
     UPDATE_COMMAND ""
     PATCH_COMMAND ""

diff --git a/src/product_data.h b/src/product_data.h
@@ -196,8 +196,10 @@ namespace wincalc
 
     struct Product_Data_Optical_Thermal
     {
+        Product_Data_Optical_Thermal() = default;
         Product_Data_Optical_Thermal(std::shared_ptr<Product_Data_Optical> optical_data,
                                      std::shared_ptr<Product_Data_Thermal> thermal_data);
+        Product_Data_Optical_Thermal & operator=(Product_Data_Optical_Thermal const &) = default;
         std::shared_ptr<Product_Data_Optical> optical_data;
         std::shared_ptr<Product_Data_Thermal> thermal_data;
     };
@@ -261,8 +263,8 @@ namespace wincalc
     struct Woven_Geometry
     {
         Woven_Geometry(double thread_diameter, double thread_spacing, double shade_thickness);
-        
-		double thread_diameter;
+
+        double thread_diameter;
         double thread_spacing;
         double shade_thickness;
     };

diff --git a/...2_NFRC_102_forced_ventilation/condensed_spectrum/theta=0_phi=0/thermal_U_Environment.json b/...2_NFRC_102_forced_ventilation/condensed_spectrum/theta=0_phi=0/thermal_U_Environment.json
@@ -0,0 +1,33 @@
+{
+    "SHGC": 0.0,
+    "U": 1.5418823772391732,
+    "gap_layer_effective_conductivities_shgc": [
+        0.09538467202434418
+    ],
+    "gap_layer_effective_conductivities_u": [
+        0.09538467202436164
+    ],
+    "layer_temperatures_shgc": [
+        263.81829125054907,
+        264.5931993034383,
+        285.52149788295145,
+        285.7047845307389
+    ],
+    "layer_temperatures_u": [
+        263.8182912505478,
+        264.59319930343696,
+        285.5214978829511,
+        285.7047845307386
+    ],
+    "relative_heat_gain": 11.995844894357878,
+    "solid_layer_effective_conductivities_shgc": [
+        1.0,
+        1.0
+    ],
+    "solid_layer_effective_conductivities_u": [
+        1.0,
+        1.0
+    ],
+    "system_effective_conductivity_shgc": 0.05164224448920759,
+    "system_effective_conductivity_u": 0.051642244488307905
+}
diff --git a/...FRC_102_forced_ventilation/condensed_spectrum/theta=15_phi=270/thermal_U_Environment.json b/...FRC_102_forced_ventilation/condensed_spectrum/theta=15_phi=270/thermal_U_Environment.json
@@ -0,0 +1,33 @@
+{
+    "SHGC": 0.0,
+    "U": 1.5418823772391732,
+    "gap_layer_effective_conductivities_shgc": [
+        0.09538467202434418
+    ],
+    "gap_layer_effective_conductivities_u": [
+        0.09538467202436164
+    ],
+    "layer_temperatures_shgc": [
+        263.81829125054907,
+        264.5931993034383,
+        285.52149788295145,
+        285.7047845307389
+    ],
+    "layer_temperatures_u": [
+        263.8182912505478,
+        264.59319930343696,
+        285.5214978829511,
+        285.7047845307386
+    ],
+    "relative_heat_gain": 11.995844894357878,
+    "solid_layer_effective_conductivities_shgc": [
+        1.0,
+        1.0
+    ],
+    "solid_layer_effective_conductivities_u": [
+        1.0,
+        1.0
+    ],
+    "system_effective_conductivity_shgc": 0.05164224448920759,
+    "system_effective_conductivity_u": 0.051642244488307905
+}
diff --git a/...RC_102_NFRC_102_forced_ventilation/full_spectrum/theta=0_phi=0/thermal_U_Environment.json b/...RC_102_NFRC_102_forced_ventilation/full_spectrum/theta=0_phi=0/thermal_U_Environment.json
@@ -0,0 +1,33 @@
+{
+    "SHGC": 0.0,
+    "U": 1.5418823771618657,
+    "gap_layer_effective_conductivities_shgc": [
+        0.09538467202434585
+    ],
+    "gap_layer_effective_conductivities_u": [
+        0.09538467202435004
+    ],
+    "layer_temperatures_shgc": [
+        263.8182912505489,
+        264.59319930343815,
+        285.5214978829497,
+        285.7047845307371
+    ],
+    "layer_temperatures_u": [
+        263.81829125054895,
+        264.59319930343815,
+        285.5214978829512,
+        285.7047845307386
+    ],
+    "relative_heat_gain": 11.995844894318543,
+    "solid_layer_effective_conductivities_shgc": [
+        1.0,
+        1.0
+    ],
+    "solid_layer_effective_conductivities_u": [
+        1.0,
+        1.0
+    ],
+    "system_effective_conductivity_shgc": 0.05164224448902762,
+    "system_effective_conductivity_u": 0.05164224448903481
+}
diff --git a/...102_NFRC_102_forced_ventilation/full_spectrum/theta=15_phi=270/thermal_U_Environment.json b/...102_NFRC_102_forced_ventilation/full_spectrum/theta=15_phi=270/thermal_U_Environment.json
@@ -0,0 +1,33 @@
+{
+    "SHGC": 0.0,
+    "U": 1.5418823771618657,
+    "gap_layer_effective_conductivities_shgc": [
+        0.09538467202434585
+    ],
+    "gap_layer_effective_conductivities_u": [
+        0.09538467202435004
+    ],
+    "layer_temperatures_shgc": [
+        263.8182912505489,
+        264.59319930343815,
+        285.5214978829497,
+        285.7047845307371
+    ],
+    "layer_temperatures_u": [
+        263.81829125054895,
+        264.59319930343815,
+        285.5214978829512,
+        285.7047845307386
+    ],
+    "relative_heat_gain": 11.995844894318543,
+    "solid_layer_effective_conductivities_shgc": [
+        1.0,
+        1.0
+    ],
+    "solid_layer_effective_conductivities_u": [
+        1.0,
+        1.0
+    ],
+    "system_effective_conductivity_shgc": 0.05164224448902762,
+    "system_effective_conductivity_u": 0.05164224448903481
+}
diff --git a/test/nfrc_102_nfrc_102_forced_ventilation.unit.cpp b/test/nfrc_102_nfrc_102_forced_ventilation.unit.cpp
@@ -56,7 +56,7 @@ class TestNFRC102NFRC102ForcedVentilation : public testing::Test
 
 TEST_F(TestNFRC102NFRC102ForcedVentilation, Test_Thermal)
 {
-    //test_thermal_results("NFRC_102_NFRC_102_forced_ventilation", "thermal_U_Environment", glazing_system_u, update_results);
+    test_thermal_results("NFRC_102_NFRC_102_forced_ventilation", "thermal_U_Environment", glazing_system_u, update_results);
     test_thermal_results(
       "NFRC_102_NFRC_102_forced_ventilation", "thermal_SHGC_Environment", glazing_system_shgc, update_results);
 }