Added test for forced ventilation. Fixed bug in glazing system where …

…changing from condensed to full (or vice versa) did not correctly reset the glazing system.
LBNL-ETA · May 11, 2023 · d49b135 · d49b135
1 parent 0c582c4
commit d49b135
Show file tree

Hide file tree

Showing 281 changed files with 3,891 additions and 26,744 deletions.
diff --git a/src/glazing_system.cpp b/src/glazing_system.cpp
@@ -458,9 +458,13 @@ namespace wincalc
     void Glazing_System::set_spectral_data_wavelength_range(
       Spectal_Data_Wavelength_Range_Method const & type, int visible_bands, int solar_bands)
     {
-        this->spectral_data_wavelength_range_method = type;
-        this->number_visible_bands = visible_bands;
-        this->number_solar_bands = solar_bands;
+		if(this->spectral_data_wavelength_range_method != type || this->number_visible_bands != visible_bands || this->number_solar_bands != solar_bands)
+		{
+			this->spectral_data_wavelength_range_method = type;
+			this->number_visible_bands = visible_bands;
+			this->number_solar_bands = solar_bands;
+			this->optical_system_for_thermal_calcs = nullptr;
+		}
     }
 
     void Glazing_System::enable_deflection(bool enable)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -28,6 +28,7 @@ add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
                  EXCLUDE_FROM_ALL)
 
 add_executable(${PROJECT_TEST_NAME}
+		nfrc_102_nfrc_102_forced_ventilation.unit.cpp
 		deflection_triple_clear.unit.cpp
 		deflection_youngs_modulus.unit.cpp
  		deflection.unit.cpp

diff --git a/test/expected_results/CGDB_18000_NFRC_102/condensed_spectrum/theta=0_phi=0/color.json b/test/expected_results/CGDB_18000_NFRC_102/condensed_spectrum/theta=0_phi=0/color.json