Merge pull request #162 from LBNL-ETA/GapDeflectionInterfaceCleanup

Gap deflection interface cleanup

CMakeLists.txt

@@ -157,8 +157,8 @@ else()
   endif()
 
   if( BUILD_WCE_TESTING )
-  	
-  	if( ${BUILD_WCE_COMMON} )
+
+	if( ${BUILD_WCE_COMMON} )
   		include_directories( src/Common/include )
   		file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "src/Common/tst/units/*.cpp" )
     	LIST( APPEND test_src ${all_test_src} )

src/Common/CMakeLists.txt

@@ -23,6 +23,11 @@ install(TARGETS ${target_name}
 )
 
 if( BUILD_WCE_TESTING )
+  # common helper files for the testing
+  include_directories( ../helper )
+  file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.hpp" )
+  file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.cpp" )
+  LIST( APPEND test_src ${all_test_src} )
   include_directories( include )
   file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" tst/units/*.cpp )
   set( test_src ${all_test_src} )

src/Gases/CMakeLists.txt

@@ -25,6 +25,11 @@ install(TARGETS ${target_name}
 )
 
 if( BUILD_WCE_TESTING )
+  # common helper files for the testing
+  include_directories( ../helper )
+  file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.hpp" )
+  file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.cpp" )
+  LIST( APPEND test_src ${all_test_src} )
   include_directories( include )
   file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" tst/units/*.cpp )
   set( test_src ${all_test_src} )

src/MultiLayerOptics/CMakeLists.txt

@@ -33,10 +33,15 @@ install(TARGETS ${target_name}
 )
 
 if( BUILD_WCE_TESTING )
+  # common helper files for the testing
+  include_directories( ../helper )
+  file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.hpp" )
+  file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.cpp" )
+  LIST( APPEND test_src ${all_test_src} )
   include_directories( include )
-	file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" tst/units/*.cpp )
-	set( test_src ${all_test_src} )
-	CREATE_TEST_TARGETS_WCE( ${target_name} "${test_src}" "" )
+  file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" tst/units/*.cpp )
+  set( test_src ${all_test_src} )
+  CREATE_TEST_TARGETS_WCE( ${target_name} "${test_src}" "" )
 endif ()
 
 warning_level_update_wce()

src/SingleLayerOptics/CMakeLists.txt

@@ -31,6 +31,11 @@ install(TARGETS ${target_name}
 )
 
 if( BUILD_WCE_TESTING )
+  # common helper files for the testing
+  include_directories( ../helper )
+  file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.hpp" )
+  file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.cpp" )
+  LIST( APPEND test_src ${all_test_src} )
   include_directories( include )
   file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" tst/units/*.cpp )
   set( test_src ${all_test_src} )

src/SpectralAveraging/CMakeLists.txt

@@ -27,6 +27,11 @@ install(TARGETS ${target_name}
 )
 
 if( BUILD_WCE_TESTING )
+  # common helper files for the testing
+  include_directories( ../helper )
+  file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.hpp" )
+  file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.cpp" )
+  LIST( APPEND test_src ${all_test_src} )
   include_directories( include )
   file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" tst/units/*.cpp )
   set( test_src ${all_test_src} )

src/Tarcog/CMakeLists.txt

@@ -29,6 +29,12 @@ install(TARGETS ${target_name}
 )
 
 if( BUILD_WCE_TESTING )
+	# common helper files for the testing
+	include_directories( ../helper )
+	file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.hpp" )
+	file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../helper/*.cpp" )
+    LIST( APPEND test_src ${all_test_src} )
+
   include_directories( include )
 	file( GLOB all_test_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" tst/units/*.cpp )
 	set( test_src ${all_test_src} )

src/Tarcog/include/WCETarcog.hpp

@@ -7,7 +7,6 @@
 #include "../src/Environments.hpp"
 #include "../src/HeatFlowBalance.hpp"
 #include "../src/IGU.hpp"
-#include "../src/IGUGapDeflection.hpp"
 #include "../src/IGUGapLayer.hpp"
 #include "../src/IGUSolidDeflection.hpp"
 #include "../src/IGUSolidLayer.hpp"

src/Tarcog/src/BaseIGULayer.cpp

@@ -34,20 +34,6 @@ namespace Tarcog
             return getSurface(t_Position)->J();
         }
 
-        double CBaseIGULayer::getMaxDeflection() const
-        {
-            assert(getSurface(Side::Front)->getMaxDeflection()
-                   == getSurface(Side::Back)->getMaxDeflection());
-            return getSurface(Side::Front)->getMaxDeflection();
-        }
-
-        double CBaseIGULayer::getMeanDeflection() const
-        {
-            assert(getSurface(Side::Front)->getMeanDeflection()
-                   == getSurface(Side::Back)->getMeanDeflection());
-            return getSurface(Side::Front)->getMeanDeflection();
-        }
-
         double CBaseIGULayer::getConductivity()
         {
             return getConductionConvectionCoefficient() * m_Thickness;

src/Tarcog/src/BaseIGULayer.hpp

@@ -21,8 +21,8 @@ namespace Tarcog
             double getThickness() const override;
             double getTemperature(FenestrationCommon::Side t_Position) const;
             double J(FenestrationCommon::Side t_Position) const;
-            double getMaxDeflection() const;
-            double getMeanDeflection() const;
+            virtual double getMaxDeflection() const = 0;
+            virtual double getMeanDeflection() const = 0;
 
             double getConductivity();
 

src/Tarcog/src/IGU.cpp

@@ -13,7 +13,6 @@
 #include "IGUGapLayer.hpp"
 #include "Surface.hpp"
 #include "IGUSolidDeflection.hpp"
-#include "IGUGapDeflection.hpp"
 #include "IGUVentilatedGapLayer.hpp"
 #include "BaseShade.hpp"
 #include "Environment.hpp"
@@ -48,11 +47,7 @@ namespace Tarcog
                 addLayer(aLayer);
             }
 
-            if(t_IGU.m_DeflectionFromE1300Curves != nullptr)
-            {
-                m_DeflectionFromE1300Curves =
-                  std::make_unique<Deflection::DeflectionE1300>(*t_IGU.m_DeflectionFromE1300Curves);
-            }
+            m_DeflectionFromE1300Curves = t_IGU.m_DeflectionFromE1300Curves;
 
             return *this;
         }
@@ -120,7 +115,7 @@ namespace Tarcog
             }
             m_Tilt = t_Tilt;
 
-            if(m_DeflectionFromE1300Curves != nullptr)
+            if(m_DeflectionFromE1300Curves.has_value())
             {
                 m_DeflectionFromE1300Curves->setIGUTilt(t_Tilt);
             }
@@ -134,7 +129,7 @@ namespace Tarcog
             }
             m_Width = t_Width;
 
-            if(m_DeflectionFromE1300Curves != nullptr)
+            if(m_DeflectionFromE1300Curves.has_value())
             {
                 m_DeflectionFromE1300Curves->setDimensions(m_Width, m_Height);
             }
@@ -148,7 +143,7 @@ namespace Tarcog
             }
             m_Height = t_Height;
 
-            if(m_DeflectionFromE1300Curves != nullptr)
+            if(m_DeflectionFromE1300Curves.has_value())
             {
                 m_DeflectionFromE1300Curves->setDimensions(m_Width, m_Height);
             }
@@ -237,7 +232,7 @@ namespace Tarcog
             return aRadiosities;
         }
 
-        std::vector<double> CIGU::getMaxDeflections() const
+        std::vector<double> CIGU::getMaxLayerDeflections() const
         {
             std::vector<double> aMaxDeflections;
 
@@ -249,7 +244,7 @@ namespace Tarcog
             return aMaxDeflections;
         }
 
-        std::vector<double> CIGU::getMeanDeflections() const
+        std::vector<double> CIGU::getMeanLayerDeflections() const
         {
             std::vector<double> aMeanDeflections;
 
@@ -261,11 +256,47 @@ namespace Tarcog
             return aMeanDeflections;
         }
 
-        std::vector<double> CIGU::getPanesLoad() const
+        std::vector<double> CIGU::getMaxGapDeflections() const
+        {
+            std::vector<double> aMaxDeflections;
+
+            for(auto const & layer : getGapLayers())
+            {
+                aMaxDeflections.push_back(layer->getMaxDeflection());
+            }
+
+            return aMaxDeflections;
+        }
+
+        std::vector<double> CIGU::getMeanGapDeflections() const
+        {
+            std::vector<double> aMeanDeflections;
+
+            for(auto const & layer : getGapLayers())
+            {
+                aMeanDeflections.push_back(layer->getMeanDeflection());
+            }
+
+            return aMeanDeflections;
+        }
+
+        std::vector<double> CIGU::getGapPressures() const
+        {
+            std::vector<double> aPressures;
+
+            for(auto const & layer : getGapLayers())
+            {
+                aPressures.push_back(layer->getPressure());
+            }
+
+            return aPressures;
+        }
+
+        std::vector<double> CIGU::getPanesLoad()
         {
             std::vector<double> paneLoad(getSolidLayers().size());
 
-            if(m_DeflectionFromE1300Curves != nullptr)
+            if(m_DeflectionFromE1300Curves.has_value())
             {
                 paneLoad = m_DeflectionFromE1300Curves->results().paneLoad;
             }
@@ -365,13 +396,13 @@ namespace Tarcog
             }
 
             std::vector<Deflection::GapData> gapData;
-            for(const auto & gap : getGapLayers())
+            for(auto & gap : getGapLayers())
             {
+                gap->setSealedGapProperties(t_Tini, t_Pini);
                 gapData.emplace_back(gap->getThickness(), t_Tini, t_Pini);
             }
 
-            m_DeflectionFromE1300Curves =
-              std::make_unique<Deflection::DeflectionE1300>(m_Width, m_Height, layerData, gapData);
+            m_DeflectionFromE1300Curves = Deflection::DeflectionE1300(m_Width, m_Height, layerData, gapData);
 
             m_DeflectionFromE1300Curves->setIGUTilt(m_Tilt);
             m_DeflectionFromE1300Curves->setInteriorPressure(t_InsidePressure);
@@ -402,7 +433,7 @@ namespace Tarcog
             // In case user sets the deflection properties as pressure and temperauture and then
             // reset this back to measured deflection should delete calculator for the deflection
             // from E1300 curves.
-            m_DeflectionFromE1300Curves = nullptr;
+            m_DeflectionFromE1300Curves = std::nullopt;
 
             if(t_MeasuredDeflections.size() != getNumOfLayers() - 1)
             {
@@ -429,7 +460,7 @@ namespace Tarcog
 
         void CIGU::updateDeflectionState()
         {
-            if(m_DeflectionFromE1300Curves != nullptr)
+            if(m_DeflectionFromE1300Curves.has_value())
             {
                 const auto gapLayers{getGapLayers()};
                 std::vector<double> gapTemperatures(gapLayers.size());
@@ -585,13 +616,13 @@ namespace Tarcog
 
         void CIGU::clearDeflection()
         {
-            m_DeflectionFromE1300Curves = nullptr;
+            m_DeflectionFromE1300Curves = std::nullopt;
         }
 
         void CIGU::setAppliedLoad(std::vector<double> t_AppliedLoad)
         {
             m_DeflectionAppliedLoad = t_AppliedLoad;
-            if(m_DeflectionFromE1300Curves != nullptr)
+            if(m_DeflectionFromE1300Curves.has_value())
             {
                 m_DeflectionFromE1300Curves->setAppliedLoad(std::move(t_AppliedLoad));
             }

src/Tarcog/src/IGU.hpp

@@ -1,5 +1,4 @@
-#ifndef TARIGU_H
-#define TARIGU_H
+#pragma once
 
 #include <memory>
 #include <vector>
@@ -49,12 +48,17 @@ namespace Tarcog
 
             [[nodiscard]] std::vector<double> getTemperatures() const;
             [[nodiscard]] std::vector<double> getRadiosities() const;
-            [[nodiscard]] std::vector<double> getMaxDeflections() const;
-            [[nodiscard]] std::vector<double> getMeanDeflections() const;
+
+            [[nodiscard]] std::vector<double> getMaxLayerDeflections() const;
+            [[nodiscard]] std::vector<double> getMeanLayerDeflections() const;
+            [[nodiscard]] std::vector<double> getMaxGapDeflections() const;
+            [[nodiscard]] std::vector<double> getMeanGapDeflections() const;
+
+            [[nodiscard]] std::vector<double> getGapPressures() const;
 
             //! Function to return pressure difference on each of the layers when using deflection
             //! model
-            [[nodiscard]] std::vector<double> getPanesLoad() const;
+            [[nodiscard]] std::vector<double> getPanesLoad();
 
             [[nodiscard]] double getTilt() const;
             [[nodiscard]] double getWidth() const;
@@ -84,16 +88,18 @@ namespace Tarcog
             void precalculateLayerStates();
 
         private:
-            // Replces layer in existing construction and keeps correct connections in linked list
+            // Replaces layer in existing construction and keeps correct connections in linked list
             void replaceLayer(const std::shared_ptr<CBaseIGULayer> & t_Original,
                               const std::shared_ptr<CBaseIGULayer> & t_Replacement);
 
             // Check if layer needs to be decorated with another object
             void checkForLayerUpgrades(const std::shared_ptr<CBaseLayer> & t_Layer);
 
-            double calculateDeflectionNumerator(const std::vector<double> & t_MeasuredDeflections) const;
-            double calculateDeflectionDenominator() const;
-            std::vector<double> calculateLDefMax(const std::vector<double> & t_MeasuredDeflections) const;
+            [[nodiscard]] double
+              calculateDeflectionNumerator(const std::vector<double> & t_MeasuredDeflections) const;
+            [[nodiscard]] double calculateDeflectionDenominator() const;
+            [[nodiscard]] std::vector<double>
+              calculateLDefMax(const std::vector<double> & t_MeasuredDeflections) const;
 
             std::vector<std::shared_ptr<CBaseLayer>> m_Layers;
 
@@ -107,7 +113,7 @@ namespace Tarcog
 
             //! This is by default set to nullptr since deflection is not turn on by default.
             //! Setting deflection properties will enable deflection calculations automatically.
-            std::unique_ptr<Deflection::DeflectionE1300> m_DeflectionFromE1300Curves;
+            std::optional<Deflection::DeflectionE1300> m_DeflectionFromE1300Curves{std::nullopt};
 
             //! It is possible that user can set applied load before setting initial parameters for
             //! the deflection in which case applied load will not be set automatically. This is
@@ -117,7 +123,4 @@ namespace Tarcog
 
     }   // namespace ISO15099
 
-}   // namespace Tarcog
-
-
-#endif
+}   // namespace Tarcog