From 0941dfde9ae8e28c4442c959b81f0a1f0f0a375b Mon Sep 17 00:00:00 2001 From: Simon Vidanovic Date: Wed, 23 Aug 2023 15:19:14 -0700 Subject: [PATCH 1/3] Fixed issue where surfaces were not reset between calculation. --- src/Tarcog/src/IGU.cpp | 14 ++ src/Tarcog/src/IGU.hpp | 3 + .../DoubleClear_UValueEnvironment.unit.cpp | 227 +++++++++--------- 3 files changed, 131 insertions(+), 113 deletions(-) diff --git a/src/Tarcog/src/IGU.cpp b/src/Tarcog/src/IGU.cpp index 6ceffddf..eec1aabc 100644 --- a/src/Tarcog/src/IGU.cpp +++ b/src/Tarcog/src/IGU.cpp @@ -388,6 +388,9 @@ namespace Tarcog const double t_InsidePressure, const double t_OutsidePressure) { + // m_DeflectionFromE1300Curves must be set when surfaces are in non-deflected state. + // Since user might have called IGU previously with different deflection properties + resetSurfaceDeflections(); std::vector layerData; for(const auto & layer : getSolidLayers()) { @@ -683,6 +686,17 @@ namespace Tarcog return LDefMax; } + void CIGU::resetSurfaceDeflections() + { + for(auto const & aLayer : m_Layers) + { + if(std::dynamic_pointer_cast(aLayer) != nullptr) + { + std::dynamic_pointer_cast(aLayer)->applyDeflection(0, 0); + } + } + } + } // namespace ISO15099 } // namespace Tarcog diff --git a/src/Tarcog/src/IGU.hpp b/src/Tarcog/src/IGU.hpp index 93986744..60a99f3a 100644 --- a/src/Tarcog/src/IGU.hpp +++ b/src/Tarcog/src/IGU.hpp @@ -107,6 +107,9 @@ namespace Tarcog double m_Height; // meters double m_Tilt; // degrees + // Reset deflection state of all surfaces back to zero. + void resetSurfaceDeflections(); + // Routines to calculate deflection coefficients [[nodiscard]] double Ldmean() const; [[nodiscard]] double Ldmax() const; diff --git a/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp b/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp index 8d1d9c21..c92cb068 100644 --- a/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp +++ b/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp @@ -1,91 +1,86 @@ #include -#include #include #include "WCETarcog.hpp" -#include "WCECommon.hpp" + +#include "vectorTesting.hpp" // Example of double clear window with inital guess for solution class TestDoubleClearUValueEnvironment : public testing::Test { private: - std::shared_ptr m_TarcogSystem; + ///////////////////////////////////////////////////////// + /// Outdoor + ///////////////////////////////////////////////////////// + double airTemperature = 255.15; // Kelvins + double airSpeed = 5.5; // meters per second + double tSky = 255.15; // Kelvins + double solarRadiation = 789.0; + + ///////////////////////////////////////////////////////// + /// Indoor + ///////////////////////////////////////////////////////// + + double roomTemperature = 294.15; + + ///////////////////////////////////////////////////////// + /// IGU + ///////////////////////////////////////////////////////// + double solidLayerThickness = 0.003048; // [m] + double solidLayerConductance = 1.0; // [W/m2K] + + double gapThickness = 0.0127; + + double windowWidth = 1.0; + double windowHeight = 1.0; + double tilt = 90.0; + + std::unique_ptr tarcogSystem; -protected: void SetUp() override { - ///////////////////////////////////////////////////////// - /// Outdoor - ///////////////////////////////////////////////////////// - auto airTemperature = 255.15; // Kelvins - auto airSpeed = 5.5; // meters per second - auto tSky = 255.15; // Kelvins - auto solarRadiation = 789.0; - auto Outdoor = Tarcog::ISO15099::Environments::outdoor( airTemperature, airSpeed, solarRadiation, tSky, Tarcog::ISO15099::SkyModel::AllSpecified); ASSERT_TRUE(Outdoor != nullptr); Outdoor->setHCoeffModel(Tarcog::ISO15099::BoundaryConditionsCoeffModel::CalculateH); - ///////////////////////////////////////////////////////// - /// Indoor - ///////////////////////////////////////////////////////// - - auto roomTemperature = 294.15; - auto Indoor = Tarcog::ISO15099::Environments::indoor(roomTemperature); ASSERT_TRUE(Indoor != nullptr); - ///////////////////////////////////////////////////////// - /// IGU - ///////////////////////////////////////////////////////// - auto solidLayerThickness = 0.003048; // [m] - auto solidLayerConductance = 1.0; // [W/m2K] - auto aSolidLayer1 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer1->setSolarAbsorptance(0.096489921212, solarRadiation); + aSolidLayer1->setSolarAbsorptance(0.096498350373052627, solarRadiation); auto aSolidLayer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer2->setSolarAbsorptance(0.072256758809, solarRadiation); + aSolidLayer2->setSolarAbsorptance(0.072264769695765979, solarRadiation); - auto gapThickness = 0.0127; auto gapLayer = Tarcog::ISO15099::Layers::gap(gapThickness); ASSERT_TRUE(gapLayer != nullptr); - auto windowWidth = 1.0; - auto windowHeight = 1.0; - Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); + Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight, tilt); aIGU.addLayers({aSolidLayer1, gapLayer, aSolidLayer2}); - // Alternative way of adding layers. - // aIGU.addLayer(aSolidLayer1); - // aIGU.addLayer(gapLayer); - // aIGU.addLayer(aSolidLayer2); - ///////////////////////////////////////////////////////// /// System ///////////////////////////////////////////////////////// - m_TarcogSystem = std::make_shared(aIGU, Indoor, Outdoor); - ASSERT_TRUE(m_TarcogSystem != nullptr); + tarcogSystem = std::make_unique(aIGU, Indoor, Outdoor); } public: - [[nodiscard]] std::shared_ptr GetSystem() const + Tarcog::ISO15099::CSystem & getSystem() { - return m_TarcogSystem; - } + return *tarcogSystem; + }; }; -TEST_F(TestDoubleClearUValueEnvironment, Test1) +TEST_F(TestDoubleClearUValueEnvironment, StandardRun) { - SCOPED_TRACE("Begin Test: Double Clear - Surface temperatures"); + SCOPED_TRACE("Begin Test: Double Clear"); constexpr auto Tolerance = 1e-6; - auto aSystem = GetSystem(); - ASSERT_TRUE(aSystem != nullptr); + auto tarcogSystem = getSystem(); ////////////////////////////////////////////////////////////////////// /// UValue run @@ -93,48 +88,35 @@ TEST_F(TestDoubleClearUValueEnvironment, Test1) auto aRun = Tarcog::ISO15099::System::Uvalue; - auto Temperature = aSystem->getTemperatures(aRun); std::vector correctTemperature = {258.791640, 259.116115, 279.323983, 279.648458}; - ASSERT_EQ(correctTemperature.size(), Temperature.size()); + testVectors("Temperature - Uvalue run", + correctTemperature, + tarcogSystem.getTemperatures(aRun), + Tolerance); - for(auto i = 0u; i < correctTemperature.size(); ++i) - { - EXPECT_NEAR(correctTemperature[i], Temperature[i], Tolerance); - } - - auto SolidLayerConductivities = aSystem->getSolidEffectiveLayerConductivities(aRun); std::vector correctSolidConductivities{1.0, 1.0}; - EXPECT_EQ(SolidLayerConductivities.size(), correctSolidConductivities.size()); - - for(auto i = 0u; i < SolidLayerConductivities.size(); ++i) - { - EXPECT_NEAR(correctSolidConductivities[i], SolidLayerConductivities[i], Tolerance); - } + testVectors("Solid Conductivities - Uvalue run", + correctSolidConductivities, + tarcogSystem.getSolidEffectiveLayerConductivities(aRun), + Tolerance); - auto GapLayerConductivities = aSystem->getGapEffectiveLayerConductivities(aRun); std::vector correctGapConductivities{0.066904}; - EXPECT_EQ(GapLayerConductivities.size(), correctGapConductivities.size()); - - for(auto i = 0u; i < GapLayerConductivities.size(); ++i) - { - EXPECT_NEAR(correctGapConductivities[i], GapLayerConductivities[i], Tolerance); - } + testVectors("Gap Conductivities - Uvalue run", + correctGapConductivities, + tarcogSystem.getGapEffectiveLayerConductivities(aRun), + Tolerance); - auto radiosity = aSystem->getRadiosities(aRun); std::vector correctRadiosity = {252.066216, 267.938384, 332.786197, 359.178924}; - ASSERT_EQ(correctRadiosity.size(), radiosity.size()); - for(auto i = 0u; i < correctRadiosity.size(); ++i) - { - EXPECT_NEAR(correctRadiosity[i], radiosity[i], Tolerance); - } + testVectors( + "Radiosity - Uvalue run", correctRadiosity, tarcogSystem.getRadiosities(aRun), Tolerance); - auto effectiveSystemConductivity{aSystem->getEffectiveSystemConductivity(aRun)}; + auto effectiveSystemConductivity{tarcogSystem.getEffectiveSystemConductivity(aRun)}; EXPECT_NEAR(0.095937, effectiveSystemConductivity, Tolerance); - auto thickness{aSystem->thickness(aRun)}; + auto thickness{tarcogSystem.thickness(aRun)}; EXPECT_NEAR(0.018796, thickness, Tolerance); - auto numOfIter = aSystem->getNumberOfIterations(aRun); + auto numOfIter = tarcogSystem.getNumberOfIterations(aRun); EXPECT_EQ(24u, numOfIter); ////////////////////////////////////////////////////////////////////// @@ -143,60 +125,79 @@ TEST_F(TestDoubleClearUValueEnvironment, Test1) aRun = Tarcog::ISO15099::System::SHGC; - Temperature = aSystem->getTemperatures(aRun); - correctTemperature = {261.920088, 262.408524, 284.752662, 285.038190}; - ASSERT_EQ(correctTemperature.size(), Temperature.size()); + correctTemperature = {261.920381, 262.408833, 284.753241, 285.038766}; + testVectors( + "Temperature - SHGC Run", correctTemperature, tarcogSystem.getTemperatures(aRun), Tolerance); - for(auto i = 0u; i < correctTemperature.size(); ++i) - { - EXPECT_NEAR(correctTemperature[i], Temperature[i], Tolerance); - } - - SolidLayerConductivities = aSystem->getSolidEffectiveLayerConductivities(aRun); correctSolidConductivities = {1.0, 1.0}; - EXPECT_EQ(SolidLayerConductivities.size(), correctSolidConductivities.size()); - - for(auto i = 0u; i < SolidLayerConductivities.size(); ++i) - { - EXPECT_NEAR(correctSolidConductivities[i], SolidLayerConductivities[i], Tolerance); - } + testVectors("Solid Conductivities - SHGC Run", + correctSolidConductivities, + tarcogSystem.getSolidEffectiveLayerConductivities(aRun), + Tolerance); - GapLayerConductivities = aSystem->getGapEffectiveLayerConductivities(aRun); correctGapConductivities = {0.069446}; - EXPECT_EQ(GapLayerConductivities.size(), correctGapConductivities.size()); + testVectors("Gap Conductivities - SHGC Run", + correctGapConductivities, + tarcogSystem.getGapEffectiveLayerConductivities(aRun), + Tolerance); - for(auto i = 0u; i < GapLayerConductivities.size(); ++i) - { - EXPECT_NEAR(correctGapConductivities[i], GapLayerConductivities[i], Tolerance); - } + correctRadiosity = {262.585532, 283.163764, 358.428554, 382.293524}; + testVectors( + "Radiosity - SHGC Run", correctRadiosity, tarcogSystem.getRadiosities(aRun), Tolerance); - radiosity = aSystem->getRadiosities(aRun); - correctRadiosity = {262.584530, 283.162254, 358.425764, 382.290985}; - ASSERT_EQ(correctRadiosity.size(), radiosity.size()); - - for(auto i = 0u; i < correctRadiosity.size(); ++i) - { - EXPECT_NEAR(correctRadiosity[i], radiosity[i], Tolerance); - } + effectiveSystemConductivity = tarcogSystem.getEffectiveSystemConductivity(aRun); + EXPECT_NEAR(0.052983, effectiveSystemConductivity, Tolerance); - effectiveSystemConductivity = aSystem->getEffectiveSystemConductivity(aRun); - EXPECT_NEAR(0.052988, effectiveSystemConductivity, Tolerance); - - thickness = aSystem->thickness(aRun); + thickness = tarcogSystem.thickness(aRun); EXPECT_NEAR(0.018796, thickness, Tolerance); - numOfIter = aSystem->getNumberOfIterations(aRun); + numOfIter = tarcogSystem.getNumberOfIterations(aRun); EXPECT_EQ(25u, numOfIter); ////////////////////////////////////////////////////////////////////// /// General results ////////////////////////////////////////////////////////////////////// - auto Uvalue = aSystem->getUValue(); + auto Uvalue = tarcogSystem.getUValue(); EXPECT_NEAR(Uvalue, 2.729619, Tolerance); - auto SHGC = aSystem->getSHGC(0.703296); - EXPECT_NEAR(SHGC, 0.755619, Tolerance); + constexpr double Tsol{0.703296}; + auto SHGC = tarcogSystem.getSHGC(Tsol); + EXPECT_NEAR(SHGC, 0.755625, Tolerance); - auto relativeHeatGain = aSystem->relativeHeatGain(0.703296); - EXPECT_NEAR(relativeHeatGain, 569.190777, Tolerance); + auto relativeHeatGain = tarcogSystem.relativeHeatGain(Tsol); + EXPECT_NEAR(569.194784, relativeHeatGain, Tolerance); } + +TEST_F(TestDoubleClearUValueEnvironment, EnabledDeflection) +{ + SCOPED_TRACE("Begin Test: Double Clear Deflection"); + + constexpr auto Tolerance = 1e-8; + + auto tarcogSystem = getSystem(); + + constexpr auto initialTemperature{293.15}; + constexpr auto initialPressure{101325.0}; + tarcogSystem.setDeflectionProperties(initialTemperature, initialPressure); + + ////////////////////////////////////////////////////////////////////// + /// UValue run + ////////////////////////////////////////////////////////////////////// + + auto aRun = Tarcog::ISO15099::System::Uvalue; + + const std::vector correctMaxLayersDeflection{-1.190817e-3, 1.190817e-3}; + testVectors("Max Layer Deflection", + correctMaxLayersDeflection, + tarcogSystem.getMaxLayerDeflections(aRun), + Tolerance); + + const std::vector correctMeanLayersDeflection{-0.498864e-3, 0.498864e-3}; + testVectors("Mean Layer Deflection", + correctMeanLayersDeflection, + tarcogSystem.getMeanLayerDeflections(aRun), + Tolerance); + + const std::vector correctPanesLoad{-55.34465653, 55.34465653}; + testVectors("Panes Load", correctPanesLoad, tarcogSystem.getPanesLoad(aRun), Tolerance); +} \ No newline at end of file From 06331109597d2b0a65d9489a5b9eea01382fe05f Mon Sep 17 00:00:00 2001 From: Simon Vidanovic Date: Thu, 24 Aug 2023 09:25:31 -0700 Subject: [PATCH 2/3] Unit test for SHGC added. Gap deflection renamed to deflection width. --- src/Tarcog/src/IGU.cpp | 16 +- src/Tarcog/src/IGU.hpp | 4 +- src/Tarcog/src/SingleSystem.cpp | 8 +- src/Tarcog/src/SingleSystem.hpp | 4 +- src/Tarcog/src/System.cpp | 8 +- src/Tarcog/src/System.hpp | 4 +- .../DoubleClearDeflectionTPDefault.unit.cpp | 8 +- .../DoubleClear_SHGCEnvironment.unit.cpp | 248 ++++++++++++------ .../DoubleClear_UValueEnvironment.unit.cpp | 16 +- 9 files changed, 202 insertions(+), 114 deletions(-) diff --git a/src/Tarcog/src/IGU.cpp b/src/Tarcog/src/IGU.cpp index eec1aabc..65e3dae3 100644 --- a/src/Tarcog/src/IGU.cpp +++ b/src/Tarcog/src/IGU.cpp @@ -256,28 +256,28 @@ namespace Tarcog return aMeanDeflections; } - std::vector CIGU::getMaxGapDeflections() const + std::vector CIGU::getMaxGapWidth() const { - std::vector aMaxDeflections; + std::vector aMaxWidths; for(auto const & layer : getGapLayers()) { - aMaxDeflections.push_back(layer->getMaxDeflection()); + aMaxWidths.push_back(layer->getMaxDeflection()); } - return aMaxDeflections; + return aMaxWidths; } - std::vector CIGU::getMeanGapDeflections() const + std::vector CIGU::getMeanGapWidth() const { - std::vector aMeanDeflections; + std::vector aMeanWidths; for(auto const & layer : getGapLayers()) { - aMeanDeflections.push_back(layer->getMeanDeflection()); + aMeanWidths.push_back(layer->getMeanDeflection()); } - return aMeanDeflections; + return aMeanWidths; } std::vector CIGU::getGapPressures() const diff --git a/src/Tarcog/src/IGU.hpp b/src/Tarcog/src/IGU.hpp index 60a99f3a..8eaad6b0 100644 --- a/src/Tarcog/src/IGU.hpp +++ b/src/Tarcog/src/IGU.hpp @@ -51,8 +51,8 @@ namespace Tarcog [[nodiscard]] std::vector getMaxLayerDeflections() const; [[nodiscard]] std::vector getMeanLayerDeflections() const; - [[nodiscard]] std::vector getMaxGapDeflections() const; - [[nodiscard]] std::vector getMeanGapDeflections() const; + [[nodiscard]] std::vector getMaxGapWidth() const; + [[nodiscard]] std::vector getMeanGapWidth() const; [[nodiscard]] std::vector getGapPressures() const; diff --git a/src/Tarcog/src/SingleSystem.cpp b/src/Tarcog/src/SingleSystem.cpp index 46223855..82fb8969 100644 --- a/src/Tarcog/src/SingleSystem.cpp +++ b/src/Tarcog/src/SingleSystem.cpp @@ -122,14 +122,14 @@ namespace Tarcog return m_IGU.getMeanLayerDeflections(); } - std::vector CSingleSystem::getMaxGapDeflections() const + std::vector CSingleSystem::getMaxGapWidth() const { - return m_IGU.getMaxGapDeflections(); + return m_IGU.getMaxGapWidth(); } - std::vector CSingleSystem::getMeanGapDeflections() const + std::vector CSingleSystem::getMeanGapWidth() const { - return m_IGU.getMeanGapDeflections(); + return m_IGU.getMeanGapWidth(); } std::vector CSingleSystem::getPanesLoad() diff --git a/src/Tarcog/src/SingleSystem.hpp b/src/Tarcog/src/SingleSystem.hpp index 408ff37b..cae80167 100644 --- a/src/Tarcog/src/SingleSystem.hpp +++ b/src/Tarcog/src/SingleSystem.hpp @@ -44,8 +44,8 @@ namespace Tarcog [[nodiscard]] std::vector getMaxLayerDeflections() const; [[nodiscard]] std::vector getMeanLayerDeflections() const; - [[nodiscard]] std::vector getMaxGapDeflections() const; - [[nodiscard]] std::vector getMeanGapDeflections() const; + [[nodiscard]] std::vector getMaxGapWidth() const; + [[nodiscard]] std::vector getMeanGapWidth() const; [[nodiscard]] std::vector getPanesLoad(); void setAppliedLoad(std::vector load); diff --git a/src/Tarcog/src/System.cpp b/src/Tarcog/src/System.cpp index ffbd521a..2f0d401f 100644 --- a/src/Tarcog/src/System.cpp +++ b/src/Tarcog/src/System.cpp @@ -44,16 +44,16 @@ namespace Tarcog return m_System.at(t_System)->getMeanLayerDeflections(); } - std::vector CSystem::getMaxGapDeflections(System t_System) + std::vector CSystem::getMaxGapWidth(System t_System) { checkSolved(); - return m_System.at(t_System)->getMaxGapDeflections(); + return m_System.at(t_System)->getMaxGapWidth(); } - std::vector CSystem::getMeanGapDeflections(System t_System) + std::vector CSystem::getMeanGapWidth(System t_System) { checkSolved(); - return m_System.at(t_System)->getMeanGapDeflections(); + return m_System.at(t_System)->getMeanGapWidth(); } std::vector CSystem::getPanesLoad(System t_System) diff --git a/src/Tarcog/src/System.hpp b/src/Tarcog/src/System.hpp index 160e0824..8fc1b167 100644 --- a/src/Tarcog/src/System.hpp +++ b/src/Tarcog/src/System.hpp @@ -32,8 +32,8 @@ namespace Tarcog [[nodiscard]] std::vector getMaxLayerDeflections(System t_System); [[nodiscard]] std::vector getMeanLayerDeflections(System t_System); - [[nodiscard]] std::vector getMaxGapDeflections(System t_System); - [[nodiscard]] std::vector getMeanGapDeflections(System t_System); + [[nodiscard]] std::vector getMaxGapWidth(System t_System); + [[nodiscard]] std::vector getMeanGapWidth(System t_System); [[nodiscard]] std::vector getPanesLoad(System t_System); void setAppliedLoad(const std::vector & load); diff --git a/src/Tarcog/tst/units/DoubleClearDeflectionTPDefault.unit.cpp b/src/Tarcog/tst/units/DoubleClearDeflectionTPDefault.unit.cpp index 4196b8be..4833b750 100644 --- a/src/Tarcog/tst/units/DoubleClearDeflectionTPDefault.unit.cpp +++ b/src/Tarcog/tst/units/DoubleClearDeflectionTPDefault.unit.cpp @@ -92,11 +92,11 @@ TEST_F(DoubleClearDeflectionTPDefault, U_ValueRun) testVectors( "Mean layer deflection", correctMeanLayerDeflection, MeanLayerDeflection, Tolerance); - const auto MaxGapDeflection = tarcogSystem.getMaxGapDeflections(); + const auto MaxGapDeflection = tarcogSystem.getMaxGapWidth(); std::vector correctMaxGapDeflection{9.930646e-3}; testVectors("Maximum gap deflection", correctMaxGapDeflection, MaxGapDeflection, 1e-8); - const auto MeanGapDeflection = tarcogSystem.getMeanGapDeflections(); + const auto MeanGapDeflection = tarcogSystem.getMeanGapWidth(); std::vector correctMeanGapDeflection{11.539846e-3}; testVectors("Mean gap deflection", correctMeanGapDeflection, MeanGapDeflection, Tolerance); @@ -192,11 +192,11 @@ TEST_F(DoubleClearDeflectionTPDefault, SHGC_ValueRun) testVectors( "Mean layer deflection", correctMeanLayerDeflection, MeanLayerDeflection, Tolerance); - const auto MaxGapDeflection = tarcogSystem.getMaxGapDeflections(); + const auto MaxGapDeflection = tarcogSystem.getMaxGapWidth(); std::vector correctMaxGapDeflection{0.013286}; testVectors("Maximum gap deflection", correctMaxGapDeflection, MaxGapDeflection, Tolerance); - const auto MeanGapDeflection = tarcogSystem.getMeanGapDeflections(); + const auto MeanGapDeflection = tarcogSystem.getMeanGapWidth(); std::vector correctMeanGapDeflection{0.012945}; testVectors("Mean gap deflection", correctMeanGapDeflection, MeanGapDeflection, Tolerance); diff --git a/src/Tarcog/tst/units/DoubleClear_SHGCEnvironment.unit.cpp b/src/Tarcog/tst/units/DoubleClear_SHGCEnvironment.unit.cpp index 9534cd66..68199797 100644 --- a/src/Tarcog/tst/units/DoubleClear_SHGCEnvironment.unit.cpp +++ b/src/Tarcog/tst/units/DoubleClear_SHGCEnvironment.unit.cpp @@ -1,87 +1,87 @@ #include -#include #include #include "WCETarcog.hpp" -// Example of double clear window with inital guess for solution +#include "vectorTesting.hpp" + class TestDoubleClearSHGCEnvironment : public testing::Test { private: - std::shared_ptr m_TarcogSystem; + ///////////////////////////////////////////////////////// + /// Outdoor + ///////////////////////////////////////////////////////// + const double airTemperature{305.15}; // Kelvins + const double airSpeed{2.75}; // meters per second + const double tSky{305.15}; // Kelvins + const double solarRadiation{783.0}; // W/m2 + + ///////////////////////////////////////////////////////// + /// Indoor + ///////////////////////////////////////////////////////// + + const double roomTemperature{297.15}; // Kelvins + + ///////////////////////////////////////////////////////// + /// IGU + ///////////////////////////////////////////////////////// + const double solidLayerThickness{0.003048}; // [m] + const double solidLayerConductance{1.0}; // [W/m2K] + + const double gapThickness{0.0127}; // [m] + + const double windowWidth{1.0}; // [m] + const double windowHeight{1.0}; // [m] + const double tilt{90.0}; // [deg] + + std::unique_ptr m_TarcogSystem; protected: void SetUp() override { - ///////////////////////////////////////////////////////// - /// Outdoor - ///////////////////////////////////////////////////////// - auto airTemperature = 305.15; // Kelvins - auto airSpeed = 2.75; // meters per second - auto tSky = 305.15; // Kelvins - auto solarRadiation = 783.0; - auto Outdoor = Tarcog::ISO15099::Environments::outdoor( airTemperature, airSpeed, solarRadiation, tSky, Tarcog::ISO15099::SkyModel::AllSpecified); ASSERT_TRUE(Outdoor != nullptr); Outdoor->setHCoeffModel(Tarcog::ISO15099::BoundaryConditionsCoeffModel::CalculateH); - ///////////////////////////////////////////////////////// - /// Indoor - ///////////////////////////////////////////////////////// - - auto roomTemperature = 297.15; - auto Indoor = Tarcog::ISO15099::Environments::indoor(roomTemperature); ASSERT_TRUE(Indoor != nullptr); - ///////////////////////////////////////////////////////// - /// IGU - ///////////////////////////////////////////////////////// - auto solidLayerThickness = 0.003048; // [m] - auto solidLayerConductance = 1.0; // [W/m2K] - auto aSolidLayer1 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - //aSolidLayer1->setSolarAbsorptance(0.096489921212, solarRadiation); auto aSolidLayer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - //aSolidLayer2->setSolarAbsorptance(0.072256758809, solarRadiation); - auto gapThickness = 0.0127; auto gapLayer = Tarcog::ISO15099::Layers::gap(gapThickness); ASSERT_TRUE(gapLayer != nullptr); - auto windowWidth = 1.0; - auto windowHeight = 1.0; - Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); + Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight, tilt); aIGU.addLayers({aSolidLayer1, gapLayer, aSolidLayer2}); ///////////////////////////////////////////////////////// /// System ///////////////////////////////////////////////////////// - m_TarcogSystem = std::make_shared(aIGU, Indoor, Outdoor); + m_TarcogSystem = std::make_unique(aIGU, Indoor, Outdoor); ASSERT_TRUE(m_TarcogSystem != nullptr); m_TarcogSystem->setAbsorptances({0.096489921212, 0.072256758809}); } public: - [[nodiscard]] std::shared_ptr GetSystem() const + [[nodiscard]] Tarcog::ISO15099::CSystem & GetSystem() const { - return m_TarcogSystem; + return *m_TarcogSystem; }; }; -TEST_F(TestDoubleClearSHGCEnvironment, Test1) +TEST_F(TestDoubleClearSHGCEnvironment, UValue) { - SCOPED_TRACE("Begin Test: Double Clear - Surface temperatures"); + SCOPED_TRACE("Begin Test: Double Clear - U-value run"); constexpr auto Tolerance = 1e-6; - auto aSystem = GetSystem(); - ASSERT_TRUE(aSystem != nullptr); + auto aSystem{GetSystem()}; ////////////////////////////////////////////////////////////////////// /// UValue run @@ -89,7 +89,7 @@ TEST_F(TestDoubleClearSHGCEnvironment, Test1) auto aRun = Tarcog::ISO15099::System::Uvalue; - auto Temperature = aSystem->getTemperatures(aRun); + auto Temperature = aSystem.getTemperatures(aRun); std::vector correctTemperature = {304.025047, 303.955156, 300.484758, 300.414867}; ASSERT_EQ(correctTemperature.size(), Temperature.size()); @@ -98,7 +98,7 @@ TEST_F(TestDoubleClearSHGCEnvironment, Test1) EXPECT_NEAR(correctTemperature[i], Temperature[i], Tolerance); } - auto SolidLayerConductivities = aSystem->getSolidEffectiveLayerConductivities(aRun); + auto SolidLayerConductivities = aSystem.getSolidEffectiveLayerConductivities(aRun); std::vector correctSolidConductivities{1, 1}; EXPECT_EQ(SolidLayerConductivities.size(), correctSolidConductivities.size()); @@ -107,7 +107,7 @@ TEST_F(TestDoubleClearSHGCEnvironment, Test1) EXPECT_NEAR(correctSolidConductivities[i], SolidLayerConductivities[i], Tolerance); } - auto GapLayerConductivities = aSystem->getGapEffectiveLayerConductivities(aRun); + auto GapLayerConductivities = aSystem.getGapEffectiveLayerConductivities(aRun); std::vector correctGapConductivities{0.083913}; EXPECT_EQ(GapLayerConductivities.size(), correctGapConductivities.size()); @@ -116,7 +116,7 @@ TEST_F(TestDoubleClearSHGCEnvironment, Test1) EXPECT_NEAR(correctGapConductivities[i], GapLayerConductivities[i], Tolerance); } - auto Radiosity = aSystem->getRadiosities(aRun); + auto Radiosity = aSystem.getRadiosities(aRun); std::vector correctRadiosity = {485.546128, 480.950664, 465.217923, 458.631346}; ASSERT_EQ(correctRadiosity.size(), Radiosity.size()); for(auto i = 0u; i < correctRadiosity.size(); ++i) @@ -124,75 +124,153 @@ TEST_F(TestDoubleClearSHGCEnvironment, Test1) EXPECT_NEAR(correctRadiosity[i], Radiosity[i], Tolerance); } - auto effectiveSystemConductivity{aSystem->getEffectiveSystemConductivity(aRun)}; + auto effectiveSystemConductivity{aSystem.getEffectiveSystemConductivity(aRun)}; EXPECT_NEAR(0.119383, effectiveSystemConductivity, Tolerance); - auto thickness{aSystem->thickness(aRun)}; + auto thickness{aSystem.thickness(aRun)}; EXPECT_NEAR(0.018796, thickness, Tolerance); - auto numOfIter = aSystem->getNumberOfIterations(aRun); + auto numOfIter = aSystem.getNumberOfIterations(aRun); EXPECT_EQ(1u, numOfIter); +} + +TEST_F(TestDoubleClearSHGCEnvironment, SHGC) +{ + SCOPED_TRACE("Begin Test: Double Clear - SHGC run"); + + constexpr auto Tolerance = 1e-6; + + auto aSystem{GetSystem()}; ////////////////////////////////////////////////////////////////////// /// SHGC run ////////////////////////////////////////////////////////////////////// - aRun = Tarcog::ISO15099::System::SHGC; + const auto aRun{Tarcog::ISO15099::System::SHGC}; - Temperature = aSystem->getTemperatures(aRun); - correctTemperature = {308.185604, 308.260088, 306.318284, 306.191403}; - ASSERT_EQ(correctTemperature.size(), Temperature.size()); + const std::vector correctTemperature{308.185604, 308.260088, 306.318284, 306.191403}; + testVectors("Temperature - SHGC Run", correctTemperature, aSystem.getTemperatures(aRun), Tolerance); - for(auto i = 0u; i < correctTemperature.size(); ++i) - { - EXPECT_NEAR(correctTemperature[i], Temperature[i], Tolerance); - } + const std::vector correctSolidLayerConductivities{1.0, 1.0}; + testVectors("Solid Conductivities - SHGC Run", + correctSolidLayerConductivities, + aSystem.getSolidEffectiveLayerConductivities(aRun), + Tolerance); - SolidLayerConductivities = aSystem->getSolidEffectiveLayerConductivities(aRun); - correctSolidConductivities = {1, 1}; - EXPECT_EQ(SolidLayerConductivities.size(), correctSolidConductivities.size()); + const std::vector correctGapConductivities{0.087241}; + testVectors("Gap Conductivities - SHGC Run", + correctGapConductivities, + aSystem.getGapEffectiveLayerConductivities(aRun), + Tolerance); - for(auto i = 0u; i < SolidLayerConductivities.size(); ++i) - { - EXPECT_NEAR(correctSolidConductivities[i], SolidLayerConductivities[i], Tolerance); - } + const std::vector correctRadiosity{508.280530, 510.189512, 500.936293, 489.338313}; + testVectors("Radiosity - SHGC Run", correctRadiosity, aSystem.getRadiosities(aRun), Tolerance); - GapLayerConductivities = aSystem->getGapEffectiveLayerConductivities(aRun); - correctGapConductivities = {0.087241}; - EXPECT_EQ(GapLayerConductivities.size(), correctGapConductivities.size()); + EXPECT_NEAR(0.658981, aSystem.getEffectiveSystemConductivity(aRun), Tolerance); + EXPECT_NEAR(0.018796, aSystem.thickness(aRun), Tolerance); + EXPECT_EQ(1u, aSystem.getNumberOfIterations(aRun)); +} - for(auto i = 0u; i < GapLayerConductivities.size(); ++i) - { - EXPECT_NEAR(correctGapConductivities[i], GapLayerConductivities[i], Tolerance); - } +TEST_F(TestDoubleClearSHGCEnvironment, SystemResults) +{ + SCOPED_TRACE("Begin Test: Double Clear - System results"); - Radiosity = aSystem->getRadiosities(aRun); - correctRadiosity = {508.280530, 510.189512, 500.936293, 489.338313}; - ASSERT_EQ(correctRadiosity.size(), Radiosity.size()); + constexpr auto Tolerance = 1e-6; - for(auto i = 0u; i < correctRadiosity.size(); ++i) - { - EXPECT_NEAR(correctRadiosity[i], Radiosity[i], Tolerance); - } + auto aSystem{GetSystem()}; - effectiveSystemConductivity = aSystem->getEffectiveSystemConductivity(aRun); - EXPECT_NEAR(0.658981, effectiveSystemConductivity, Tolerance); + EXPECT_NEAR(2.866261, aSystem.getUValue(), Tolerance); - thickness = aSystem->thickness(aRun); - EXPECT_NEAR(0.018796, thickness, Tolerance); + constexpr auto Tsol{0.703296}; + EXPECT_NEAR(0.763304, aSystem.getSHGC(Tsol), Tolerance); + + EXPECT_NEAR(575.826177, aSystem.relativeHeatGain(Tsol), Tolerance); +} - numOfIter = aSystem->getNumberOfIterations(aRun); - EXPECT_EQ(1, int(numOfIter)); +TEST_F(TestDoubleClearSHGCEnvironment, DeflectionUValue) +{ + SCOPED_TRACE("Begin Test: Double Clear Deflection - UValue"); + + constexpr auto Tolerance = 1e-8; + + auto tarcogSystem{GetSystem()}; + + constexpr auto initialTemperature{293.15}; + constexpr auto initialPressure{101325.0}; + tarcogSystem.setDeflectionProperties(initialTemperature, initialPressure); ////////////////////////////////////////////////////////////////////// - /// General results + /// UValue run ////////////////////////////////////////////////////////////////////// - auto Uvalue = aSystem->getUValue(); - EXPECT_NEAR(Uvalue, 2.866261, Tolerance); - auto SHGC = aSystem->getSHGC(0.703296); - EXPECT_NEAR(SHGC, 0.763304, Tolerance); + auto aRun = Tarcog::ISO15099::System::Uvalue; - auto relativeHeatGain = aSystem->relativeHeatGain(0.703296); - EXPECT_NEAR(relativeHeatGain, 575.826177, Tolerance); + const std::vector correctMaxLayersDeflection{0.448510e-3, -0.448510e-3}; + testVectors("Max Layer Deflection", + correctMaxLayersDeflection, + tarcogSystem.getMaxLayerDeflections(aRun), + Tolerance); + + const std::vector correctMeanLayersDeflection{0.187892e-3, -0.187892e-3}; + testVectors("Mean Layer Deflection", + correctMeanLayersDeflection, + tarcogSystem.getMeanLayerDeflections(aRun), + Tolerance); + + const std::vector correctPanesLoad{20.52839045, -20.52839045}; + testVectors("Panes Load", correctPanesLoad, tarcogSystem.getPanesLoad(aRun), Tolerance); + + const std::vector correctMaxGapWidth{13.597019e-3}; + testVectors("Max Gap Width", + correctMaxGapWidth, tarcogSystem.getMaxGapWidth(aRun), + Tolerance); + + const std::vector correctMeanGapWidth{13.075785e-3}; + testVectors("Mean Gap Width", + correctMeanGapWidth, tarcogSystem.getMeanGapWidth(aRun), + Tolerance); } + +TEST_F(TestDoubleClearSHGCEnvironment, DeflectionSHGC) +{ + SCOPED_TRACE("Begin Test: Double Clear Deflection - SHGC"); + + constexpr auto Tolerance = 1e-8; + + auto tarcogSystem{GetSystem()}; + + constexpr auto initialTemperature{293.15}; + constexpr auto initialPressure{101325.0}; + tarcogSystem.setDeflectionProperties(initialTemperature, initialPressure); + + ////////////////////////////////////////////////////////////////////// + /// UValue run + ////////////////////////////////////////////////////////////////////// + + auto aRun = Tarcog::ISO15099::System::SHGC; + + const std::vector correctMaxLayersDeflection{0.696246e-3, -0.696246e-3}; + testVectors("Max Layer Deflection", + correctMaxLayersDeflection, + tarcogSystem.getMaxLayerDeflections(aRun), + Tolerance); + + const std::vector correctMeanLayersDeflection{0.291675e-3, -0.291675e-3}; + testVectors("Mean Layer Deflection", + correctMeanLayersDeflection, + tarcogSystem.getMeanLayerDeflections(aRun), + Tolerance); + + const std::vector correctPanesLoad{32.14789366, -32.14789366}; + testVectors("Panes Load", correctPanesLoad, tarcogSystem.getPanesLoad(aRun), Tolerance); + + const std::vector correctMaxGapWidth{14.092491e-3}; + testVectors("Max Gap Width", + correctMaxGapWidth, tarcogSystem.getMaxGapWidth(aRun), + Tolerance); + + const std::vector correctMeanGapWidth{13.283351e-3}; + testVectors("Mean Gap Width", + correctMeanGapWidth, tarcogSystem.getMeanGapWidth(aRun), + Tolerance); +} \ No newline at end of file diff --git a/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp b/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp index c92cb068..58230245 100644 --- a/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp +++ b/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp @@ -35,7 +35,7 @@ class TestDoubleClearUValueEnvironment : public testing::Test double windowHeight = 1.0; double tilt = 90.0; - std::unique_ptr tarcogSystem; + std::unique_ptr system; void SetUp() override { @@ -64,13 +64,13 @@ class TestDoubleClearUValueEnvironment : public testing::Test ///////////////////////////////////////////////////////// /// System ///////////////////////////////////////////////////////// - tarcogSystem = std::make_unique(aIGU, Indoor, Outdoor); + system = std::make_unique(aIGU, Indoor, Outdoor); } public: Tarcog::ISO15099::CSystem & getSystem() { - return *tarcogSystem; + return *system; }; }; @@ -200,4 +200,14 @@ TEST_F(TestDoubleClearUValueEnvironment, EnabledDeflection) const std::vector correctPanesLoad{-55.34465653, 55.34465653}; testVectors("Panes Load", correctPanesLoad, tarcogSystem.getPanesLoad(aRun), Tolerance); + + const std::vector correctMaxGapWidth{10.3183670e-3}; + testVectors("Max Gap Width", + correctMaxGapWidth, tarcogSystem.getMaxGapWidth(aRun), + Tolerance); + + const std::vector correctMeanGapWidth{11.702272e-3}; + testVectors("Mean Gap Width", + correctMeanGapWidth, tarcogSystem.getMeanGapWidth(aRun), + Tolerance); } \ No newline at end of file From 8b606a7405e5d40e5909cc8aa802817d5b1defef Mon Sep 17 00:00:00 2001 From: Simon Vidanovic Date: Thu, 24 Aug 2023 09:37:27 -0700 Subject: [PATCH 3/3] SetSolarAbsorptance is renamed to SetSolarHeatGain for the layers. --- src/Tarcog/src/IGU.cpp | 2 +- src/Tarcog/src/IGUSolidLayer.cpp | 2 +- src/Tarcog/src/IGUSolidLayer.hpp | 2 +- .../tst/units/DoubleClearDeflectionTPDefault.unit.cpp | 4 ++-- src/Tarcog/tst/units/DoubleClearLeeward.unit.cpp | 4 ++-- .../tst/units/DoubleClearSingleSystemWithSun.unit.cpp | 4 ++-- .../units/DoubleClear_102_102_ForcedVentilation.unit.cpp | 4 ++-- .../tst/units/DoubleClear_DeflectionWithLoad.unit.cpp | 4 ++-- src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp | 4 ++-- .../tst/units/DoubleLowEHorizontalSliderSHGCRun.unit.cpp | 4 ++-- src/Tarcog/tst/units/DoubleLowESingleVisionSHGCRun.unit.cpp | 4 ++-- .../DoubleLowESingleVisionSHGCRunWithDividers.unit.cpp | 4 ++-- .../tst/units/DoubleLowEVerticalSliderSHGCRun.unit.cpp | 4 ++-- src/Tarcog/tst/units/DoubleLoweWithDeflection.unit.cpp | 4 ++-- .../DoubleOutsidePerforatedShadeExterior_UValue.unit.cpp | 4 ++-- .../tst/units/DoubleOutsidePerforatedShade_SHGC.unit.cpp | 4 ++-- .../tst/units/DoubleOutsidePerforatedShade_UValue.unit.cpp | 4 ++-- .../tst/units/DoubleOutsideVenetianShade_SHGC.unit.cpp | 4 ++-- .../tst/units/DoubleOutsideVenetianShade_UValue.unit.cpp | 4 ++-- ...PanesForcedVentilationInsideAirWinterValidation.unit.cpp | 4 ++-- ...weenDarkGlassPanesNoVentilationWinterValidation.unit.cpp | 4 ++-- ...teriorShadingAndGlassForcedVentilationInsideAir.unit.cpp | 4 ++-- ...eriorShadingAndGlassForcedVentilationOutsideAir.unit.cpp | 4 ++-- ...ndInteriorShadingFastForcedVentilationInsideAir.unit.cpp | 4 ++-- ...assAndInteriorShadingForcedVentilationInsideAir.unit.cpp | 4 ++-- ...adingForcedVentilationInsideAirThreeMeterHeight.unit.cpp | 4 ++-- ...adiatedGlassAndInteriorShadingNaturalConvection.unit.cpp | 4 ++-- ...dGlassAndInteriorShadingNaturalConvection1mmGap.unit.cpp | 4 ++-- ...adiatedGlassAndInteriorShadingSealedVentilation.unit.cpp | 4 ++-- ...tedGlassAndInteriorShadingZeroForcedVentilation.unit.cpp | 4 ++-- ...ssAndInteriorShadingZeroForcedVentilation1mmGap.unit.cpp | 4 ++-- ...PanesForcedVentilationInsideAirSummerValidation.unit.cpp | 4 ++-- ...lassPanesWithIntegratedShadingForcedVentilation.unit.cpp | 6 +++--- src/Tarcog/tst/units/HorizontalSliderWindow.unit.cpp | 2 +- src/Tarcog/tst/units/SingleClear.unit.cpp | 2 +- .../tst/units/SingleClearSolarRadiationCond001.unit.cpp | 2 +- .../tst/units/SingleClearSolarRadiationCond100.unit.cpp | 2 +- src/Tarcog/tst/units/SingleClearThermochromics.unit.cpp | 2 +- src/Tarcog/tst/units/SingleVisionWindow.unit.cpp | 2 +- src/Tarcog/tst/units/TripleClear_Deflection.unit.cpp | 6 +++--- .../tst/units/TripleClear_DeflectionWithLoad.unit.cpp | 6 +++--- src/Tarcog/tst/units/VerticalSliderWindow.unit.cpp | 2 +- 42 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/Tarcog/src/IGU.cpp b/src/Tarcog/src/IGU.cpp index 65e3dae3..dd9196f1 100644 --- a/src/Tarcog/src/IGU.cpp +++ b/src/Tarcog/src/IGU.cpp @@ -613,7 +613,7 @@ namespace Tarcog } for(size_t i = 0; i < solidLayers.size(); ++i) { - solidLayers[i]->setSolarAbsorptance(absorptances[i], solarRadiation); + solidLayers[i]->setSolarHeatGain(absorptances[i], solarRadiation); } } diff --git a/src/Tarcog/src/IGUSolidLayer.cpp b/src/Tarcog/src/IGUSolidLayer.cpp index 563c9ce9..4177f861 100644 --- a/src/Tarcog/src/IGUSolidLayer.cpp +++ b/src/Tarcog/src/IGUSolidLayer.cpp @@ -114,7 +114,7 @@ namespace Tarcog resetCalculated(); } - void CIGUSolidLayer::setSolarAbsorptance(double const t_SolarAbsorptance, + void CIGUSolidLayer::setSolarHeatGain(double const t_SolarAbsorptance, const double t_SolarRadiation) { m_SolarAbsorptance = t_SolarAbsorptance; diff --git a/src/Tarcog/src/IGUSolidLayer.hpp b/src/Tarcog/src/IGUSolidLayer.hpp index d7618381..b26d4b88 100644 --- a/src/Tarcog/src/IGUSolidLayer.hpp +++ b/src/Tarcog/src/IGUSolidLayer.hpp @@ -36,7 +36,7 @@ namespace Tarcog void setLayerState(double t_Tf, double t_Tb, double t_Jf, double t_Jb); void setSolarRadiation(double t_SolarRadiation); - void setSolarAbsorptance(double t_SolarAbsorptance, double t_SolarRadiation); + void setSolarHeatGain(double t_SolarAbsorptance, double t_SolarRadiation); // Radiation flow in solid layer should be eliminated double getRadiationFlow() override; diff --git a/src/Tarcog/tst/units/DoubleClearDeflectionTPDefault.unit.cpp b/src/Tarcog/tst/units/DoubleClearDeflectionTPDefault.unit.cpp index 4833b750..5ee75b45 100644 --- a/src/Tarcog/tst/units/DoubleClearDeflectionTPDefault.unit.cpp +++ b/src/Tarcog/tst/units/DoubleClearDeflectionTPDefault.unit.cpp @@ -147,10 +147,10 @@ TEST_F(DoubleClearDeflectionTPDefault, SHGC_ValueRun) auto solidLayerConductance = 1.0; auto layer1 = Tarcog::ISO15099::Layers::solid(solidLayerThickness1, solidLayerConductance); - layer1->setSolarAbsorptance(0.096058987081, solarRadiation); + layer1->setSolarHeatGain(0.096058987081, solarRadiation); auto layer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness2, solidLayerConductance); - layer2->setSolarAbsorptance(0.126891940832, solarRadiation); + layer2->setSolarHeatGain(0.126891940832, solarRadiation); auto gapThickness = 0.0127; auto gap = Tarcog::ISO15099::Layers::gap(gapThickness); diff --git a/src/Tarcog/tst/units/DoubleClearLeeward.unit.cpp b/src/Tarcog/tst/units/DoubleClearLeeward.unit.cpp index dea20efb..1468edbe 100644 --- a/src/Tarcog/tst/units/DoubleClearLeeward.unit.cpp +++ b/src/Tarcog/tst/units/DoubleClearLeeward.unit.cpp @@ -51,10 +51,10 @@ class TestDoubleClearLeeward : public testing::Test auto solidLayerConductance = 1.0; auto layer1 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - layer1->setSolarAbsorptance(0.166707709432, solarRadiation); + layer1->setSolarHeatGain(0.166707709432, solarRadiation); auto layer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - layer2->setSolarAbsorptance(0.112737670541, solarRadiation); + layer2->setSolarHeatGain(0.112737670541, solarRadiation); auto gapThickness = 0.012; auto gap = Tarcog::ISO15099::Layers::gap(gapThickness); diff --git a/src/Tarcog/tst/units/DoubleClearSingleSystemWithSun.unit.cpp b/src/Tarcog/tst/units/DoubleClearSingleSystemWithSun.unit.cpp index be83327e..64291273 100644 --- a/src/Tarcog/tst/units/DoubleClearSingleSystemWithSun.unit.cpp +++ b/src/Tarcog/tst/units/DoubleClearSingleSystemWithSun.unit.cpp @@ -43,11 +43,11 @@ class TestDoubleClearSingleSystemWithSun : public testing::Test auto solarAbsorptance = 0.187443971634; auto layer1 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - layer1->setSolarAbsorptance(solarAbsorptance, solarRadiation); + layer1->setSolarHeatGain(solarAbsorptance, solarRadiation); solarAbsorptance = 0.054178960621; auto layer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - layer2->setSolarAbsorptance(solarAbsorptance, solarRadiation); + layer2->setSolarHeatGain(solarAbsorptance, solarRadiation); auto gapThickness = 0.012; auto m_GapLayer = Tarcog::ISO15099::Layers::gap(gapThickness); diff --git a/src/Tarcog/tst/units/DoubleClear_102_102_ForcedVentilation.unit.cpp b/src/Tarcog/tst/units/DoubleClear_102_102_ForcedVentilation.unit.cpp index a29b1ec0..c9593634 100644 --- a/src/Tarcog/tst/units/DoubleClear_102_102_ForcedVentilation.unit.cpp +++ b/src/Tarcog/tst/units/DoubleClear_102_102_ForcedVentilation.unit.cpp @@ -223,11 +223,11 @@ TEST_F(TestDoubleClear102_102_ForcedVentilation, SummerSystem) constexpr auto nfrcSolarRadiation{783.0}; // [W/m2] constexpr auto solarAbsorptanceCoefficientLayer1{0.09649835037305263}; // [-] auto aSolidLayer1{createSolidLayer102()}; - aSolidLayer1->setSolarAbsorptance(solarAbsorptanceCoefficientLayer1, nfrcSolarRadiation); + aSolidLayer1->setSolarHeatGain(solarAbsorptanceCoefficientLayer1, nfrcSolarRadiation); constexpr auto solarAbsorptanceCoefficientLayer2{0.07226476969576598}; // [-] auto aSolidLayer2{createSolidLayer102()}; - aSolidLayer2->setSolarAbsorptance(solarAbsorptanceCoefficientLayer2, nfrcSolarRadiation); + aSolidLayer2->setSolarHeatGain(solarAbsorptanceCoefficientLayer2, nfrcSolarRadiation); auto forcedGapLayer{createForcedVentilationGap()}; constexpr auto windowWidth = 1.0; // [m] diff --git a/src/Tarcog/tst/units/DoubleClear_DeflectionWithLoad.unit.cpp b/src/Tarcog/tst/units/DoubleClear_DeflectionWithLoad.unit.cpp index 359af18f..0c45d873 100644 --- a/src/Tarcog/tst/units/DoubleClear_DeflectionWithLoad.unit.cpp +++ b/src/Tarcog/tst/units/DoubleClear_DeflectionWithLoad.unit.cpp @@ -48,10 +48,10 @@ TEST_F(TestDoubleClearDeflectionWithLoad, U_ValueRun) constexpr auto solidLayerConductance{1.0}; // [W/m2K] auto aSolidLayer1 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer1->setSolarAbsorptance(0.099839858711, solarRadiation); + aSolidLayer1->setSolarHeatGain(0.099839858711, solarRadiation); auto aSolidLayer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer2->setSolarAbsorptance(0.076627746224, solarRadiation); + aSolidLayer2->setSolarHeatGain(0.076627746224, solarRadiation); constexpr auto gapThickness1{0.006}; const auto gapLayer1 = Tarcog::ISO15099::Layers::gap(gapThickness1); diff --git a/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp b/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp index 58230245..21397cc2 100644 --- a/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp +++ b/src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp @@ -49,11 +49,11 @@ class TestDoubleClearUValueEnvironment : public testing::Test auto aSolidLayer1 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer1->setSolarAbsorptance(0.096498350373052627, solarRadiation); + aSolidLayer1->setSolarHeatGain(0.096498350373052627, solarRadiation); auto aSolidLayer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer2->setSolarAbsorptance(0.072264769695765979, solarRadiation); + aSolidLayer2->setSolarHeatGain(0.072264769695765979, solarRadiation); auto gapLayer = Tarcog::ISO15099::Layers::gap(gapThickness); ASSERT_TRUE(gapLayer != nullptr); diff --git a/src/Tarcog/tst/units/DoubleLowEHorizontalSliderSHGCRun.unit.cpp b/src/Tarcog/tst/units/DoubleLowEHorizontalSliderSHGCRun.unit.cpp index ada9f6d2..a3f4e096 100644 --- a/src/Tarcog/tst/units/DoubleLowEHorizontalSliderSHGCRun.unit.cpp +++ b/src/Tarcog/tst/units/DoubleLowEHorizontalSliderSHGCRun.unit.cpp @@ -50,7 +50,7 @@ class TestDoubleLowEHorizontalSliderSHGCRun : public testing::Test backEmissivity1, tIR1); ASSERT_TRUE(layer1 != nullptr); - layer1->setSolarAbsorptance(0.194422408938, solarRadiation); + layer1->setSolarHeatGain(0.194422408938, solarRadiation); const auto gapThickness{0.0127}; auto gap{Tarcog::ISO15099::Layers::gap(gapThickness)}; @@ -62,7 +62,7 @@ class TestDoubleLowEHorizontalSliderSHGCRun : public testing::Test Tarcog::ISO15099::Layers::solid(solidLayerThickness2, solidLayerConductance2); ASSERT_TRUE(layer2 != nullptr); - layer2->setSolarAbsorptance(0.054760526866, solarRadiation); + layer2->setSolarHeatGain(0.054760526866, solarRadiation); const auto iguWidth{1.0}; const auto iguHeight{1.0}; diff --git a/src/Tarcog/tst/units/DoubleLowESingleVisionSHGCRun.unit.cpp b/src/Tarcog/tst/units/DoubleLowESingleVisionSHGCRun.unit.cpp index c9c75e02..373e8611 100644 --- a/src/Tarcog/tst/units/DoubleLowESingleVisionSHGCRun.unit.cpp +++ b/src/Tarcog/tst/units/DoubleLowESingleVisionSHGCRun.unit.cpp @@ -49,7 +49,7 @@ class TestDoubleLowESingleVisionSHGCRun : public testing::Test backEmissivity1, tIR1); ASSERT_TRUE(layer1 != nullptr); - layer1->setSolarAbsorptance(0.194422408938, solarRadiation); + layer1->setSolarHeatGain(0.194422408938, solarRadiation); const auto gapThickness{0.0127}; auto gap{Tarcog::ISO15099::Layers::gap(gapThickness)}; @@ -60,7 +60,7 @@ class TestDoubleLowESingleVisionSHGCRun : public testing::Test const auto layer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness2, solidLayerConductance2); ASSERT_TRUE(layer2 != nullptr); - layer2->setSolarAbsorptance(0.054760526866, solarRadiation); + layer2->setSolarHeatGain(0.054760526866, solarRadiation); const auto iguWidth{1.0}; const auto iguHeight{1.0}; diff --git a/src/Tarcog/tst/units/DoubleLowESingleVisionSHGCRunWithDividers.unit.cpp b/src/Tarcog/tst/units/DoubleLowESingleVisionSHGCRunWithDividers.unit.cpp index 9901d3d9..dff96d4a 100644 --- a/src/Tarcog/tst/units/DoubleLowESingleVisionSHGCRunWithDividers.unit.cpp +++ b/src/Tarcog/tst/units/DoubleLowESingleVisionSHGCRunWithDividers.unit.cpp @@ -50,7 +50,7 @@ class TestDoubleLowESingleVisionSHGCRunWithDividers : public testing::Test backEmissivity1, tIR1); ASSERT_TRUE(layer1 != nullptr); - layer1->setSolarAbsorptance(0.194422408938, solarRadiation); + layer1->setSolarHeatGain(0.194422408938, solarRadiation); const auto gapThickness{0.0127}; auto gap{Tarcog::ISO15099::Layers::gap(gapThickness)}; @@ -61,7 +61,7 @@ class TestDoubleLowESingleVisionSHGCRunWithDividers : public testing::Test const auto layer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness2, solidLayerConductance2); ASSERT_TRUE(layer2 != nullptr); - layer2->setSolarAbsorptance(0.054760526866, solarRadiation); + layer2->setSolarHeatGain(0.054760526866, solarRadiation); const auto iguWidth{1.0}; const auto iguHeight{1.0}; diff --git a/src/Tarcog/tst/units/DoubleLowEVerticalSliderSHGCRun.unit.cpp b/src/Tarcog/tst/units/DoubleLowEVerticalSliderSHGCRun.unit.cpp index bcfe2cc4..33e0d452 100644 --- a/src/Tarcog/tst/units/DoubleLowEVerticalSliderSHGCRun.unit.cpp +++ b/src/Tarcog/tst/units/DoubleLowEVerticalSliderSHGCRun.unit.cpp @@ -50,7 +50,7 @@ class TestDoubleLowEVerticalSliderSHGCRun : public testing::Test backEmissivity1, tIR1); ASSERT_TRUE(layer1 != nullptr); - layer1->setSolarAbsorptance(0.194422408938, solarRadiation); + layer1->setSolarHeatGain(0.194422408938, solarRadiation); const auto gapThickness{0.0127}; auto gap{Tarcog::ISO15099::Layers::gap(gapThickness)}; @@ -63,7 +63,7 @@ class TestDoubleLowEVerticalSliderSHGCRun : public testing::Test ASSERT_TRUE(layer2 != nullptr); - layer2->setSolarAbsorptance(0.054760526866, solarRadiation); + layer2->setSolarHeatGain(0.054760526866, solarRadiation); const auto iguWidth{1.0}; const auto iguHeight{1.0}; diff --git a/src/Tarcog/tst/units/DoubleLoweWithDeflection.unit.cpp b/src/Tarcog/tst/units/DoubleLoweWithDeflection.unit.cpp index 903d5a43..a56006f8 100644 --- a/src/Tarcog/tst/units/DoubleLoweWithDeflection.unit.cpp +++ b/src/Tarcog/tst/units/DoubleLoweWithDeflection.unit.cpp @@ -52,7 +52,7 @@ class TestDoubleLoweEnvironmentWithDeflection : public testing::Test backEmissivity1, tIR1); - layer1->setSolarAbsorptance(0.194422408938, solarRadiation); + layer1->setSolarHeatGain(0.194422408938, solarRadiation); ASSERT_TRUE(layer1 != nullptr); const auto gapThickness{0.0127}; @@ -64,7 +64,7 @@ class TestDoubleLoweEnvironmentWithDeflection : public testing::Test const auto layer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness2, solidLayerConductance2); - layer2->setSolarAbsorptance(0.054760526866, solarRadiation); + layer2->setSolarHeatGain(0.054760526866, solarRadiation); const auto iguWidth{1.0}; const auto iguHeight{1.0}; diff --git a/src/Tarcog/tst/units/DoubleOutsidePerforatedShadeExterior_UValue.unit.cpp b/src/Tarcog/tst/units/DoubleOutsidePerforatedShadeExterior_UValue.unit.cpp index 36d2e45e..ba3ae955 100644 --- a/src/Tarcog/tst/units/DoubleOutsidePerforatedShadeExterior_UValue.unit.cpp +++ b/src/Tarcog/tst/units/DoubleOutsidePerforatedShadeExterior_UValue.unit.cpp @@ -85,7 +85,7 @@ class TestDoubleOutsidePerforatedShadeExterior_UValue : public testing::Test auto aLayer1 = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - aLayer1->setSolarAbsorptance(0.324484854937, solarRadiation); + aLayer1->setSolarHeatGain(0.324484854937, solarRadiation); auto gapThickness = 0.0127; auto GapLayer1 = Tarcog::ISO15099::Layers::gap(gapThickness); @@ -96,7 +96,7 @@ class TestDoubleOutsidePerforatedShadeExterior_UValue : public testing::Test auto aLayer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); ASSERT_TRUE(aLayer2 != nullptr); - aLayer2->setSolarAbsorptance(0.034704498947, solarRadiation); + aLayer2->setSolarHeatGain(0.034704498947, solarRadiation); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/DoubleOutsidePerforatedShade_SHGC.unit.cpp b/src/Tarcog/tst/units/DoubleOutsidePerforatedShade_SHGC.unit.cpp index 74fac184..8dddd25e 100644 --- a/src/Tarcog/tst/units/DoubleOutsidePerforatedShade_SHGC.unit.cpp +++ b/src/Tarcog/tst/units/DoubleOutsidePerforatedShade_SHGC.unit.cpp @@ -83,7 +83,7 @@ class TestDoubleOutsidePerforatedShade_SHGC : public testing::Test auto aLayer1 = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - aLayer1->setSolarAbsorptance(0.106659, solarRadiation); + aLayer1->setSolarHeatGain(0.106659, solarRadiation); auto gapThickness = 0.0127; auto GapLayer1 = Tarcog::ISO15099::Layers::gap(gapThickness); @@ -94,7 +94,7 @@ class TestDoubleOutsidePerforatedShade_SHGC : public testing::Test auto aLayer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); ASSERT_TRUE(aLayer2 != nullptr); - aLayer2->setSolarAbsorptance(0.034677, solarRadiation); + aLayer2->setSolarHeatGain(0.034677, solarRadiation); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/DoubleOutsidePerforatedShade_UValue.unit.cpp b/src/Tarcog/tst/units/DoubleOutsidePerforatedShade_UValue.unit.cpp index fdcfb259..87ef86b2 100644 --- a/src/Tarcog/tst/units/DoubleOutsidePerforatedShade_UValue.unit.cpp +++ b/src/Tarcog/tst/units/DoubleOutsidePerforatedShade_UValue.unit.cpp @@ -81,7 +81,7 @@ class TestDoubleOutsidePerforatedShade_UValue : public testing::Test auto aLayer1 = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - aLayer1->setSolarAbsorptance(0.106659, solarRadiation); + aLayer1->setSolarHeatGain(0.106659, solarRadiation); auto gapThickness = 0.0127; auto GapLayer1 = Tarcog::ISO15099::Layers::gap(gapThickness); @@ -92,7 +92,7 @@ class TestDoubleOutsidePerforatedShade_UValue : public testing::Test auto aLayer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); ASSERT_TRUE(aLayer2 != nullptr); - aLayer2->setSolarAbsorptance(0.034677, solarRadiation); + aLayer2->setSolarHeatGain(0.034677, solarRadiation); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/DoubleOutsideVenetianShade_SHGC.unit.cpp b/src/Tarcog/tst/units/DoubleOutsideVenetianShade_SHGC.unit.cpp index afec69f5..550dd11c 100644 --- a/src/Tarcog/tst/units/DoubleOutsideVenetianShade_SHGC.unit.cpp +++ b/src/Tarcog/tst/units/DoubleOutsideVenetianShade_SHGC.unit.cpp @@ -86,7 +86,7 @@ class TestDoubleOutsideVenetianShade_SHGC : public testing::Test // shadeLayerConductance); // From unit test - aLayer1->setSolarAbsorptance(0.030609361, solarRadiation); + aLayer1->setSolarHeatGain(0.030609361, solarRadiation); auto gapThickness = 0.0127; auto GapLayer1 = Tarcog::ISO15099::Layers::gap(gapThickness); @@ -98,7 +98,7 @@ class TestDoubleOutsideVenetianShade_SHGC : public testing::Test ASSERT_TRUE(aLayer2 != nullptr); // From unit test - aLayer2->setSolarAbsorptance(0.08669346, solarRadiation); + aLayer2->setSolarHeatGain(0.08669346, solarRadiation); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/DoubleOutsideVenetianShade_UValue.unit.cpp b/src/Tarcog/tst/units/DoubleOutsideVenetianShade_UValue.unit.cpp index 743882cd..234cfc28 100644 --- a/src/Tarcog/tst/units/DoubleOutsideVenetianShade_UValue.unit.cpp +++ b/src/Tarcog/tst/units/DoubleOutsideVenetianShade_UValue.unit.cpp @@ -79,7 +79,7 @@ class TestDoubleOutsideVenetianShade_UValue : public testing::Test // auto aLayer1 = Tarcog::ISO15099::Layers::solid(shadeLayerThickness, // shadeLayerConductance); - // aLayer1->setSolarAbsorptance(0.306310117245, solarRadiation); + // aLayer1->setSolarHeatGain(0.306310117245, solarRadiation); auto gapThickness = 0.0127; auto GapLayer1 = Tarcog::ISO15099::Layers::gap(gapThickness); @@ -90,7 +90,7 @@ class TestDoubleOutsideVenetianShade_UValue : public testing::Test auto aLayer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); ASSERT_TRUE(aLayer2 != nullptr); - // aLayer2->setSolarAbsorptance(0.086374, solarRadiation); + // aLayer2->setSolarHeatGain(0.086374, solarRadiation); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenDarkGlassPanesForcedVentilationInsideAirWinterValidation.unit.cpp b/src/Tarcog/tst/units/GapBetweenDarkGlassPanesForcedVentilationInsideAirWinterValidation.unit.cpp index ff47aead..857b8e6e 100644 --- a/src/Tarcog/tst/units/GapBetweenDarkGlassPanesForcedVentilationInsideAirWinterValidation.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenDarkGlassPanesForcedVentilationInsideAirWinterValidation.unit.cpp @@ -64,7 +64,7 @@ class TestGapBetweenDarkGlassPanesForcedVentilationInsideAirWinterValidation : p transmittance1, emissivity1, transmittance1); - solidLayer1->setSolarAbsorptance(0.2, solarRadiation); + solidLayer1->setSolarHeatGain(0.2, solarRadiation); ASSERT_TRUE(solidLayer1 != nullptr); auto gapThickness = 0.01; @@ -85,7 +85,7 @@ class TestGapBetweenDarkGlassPanesForcedVentilationInsideAirWinterValidation : p transmittance2, emissivity2, transmittance2); - solidLayer2->setSolarAbsorptance(0.2, solarRadiation); + solidLayer2->setSolarHeatGain(0.2, solarRadiation); ASSERT_TRUE(solidLayer2 != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenDarkGlassPanesNoVentilationWinterValidation.unit.cpp b/src/Tarcog/tst/units/GapBetweenDarkGlassPanesNoVentilationWinterValidation.unit.cpp index 25044a46..cc2bfbae 100644 --- a/src/Tarcog/tst/units/GapBetweenDarkGlassPanesNoVentilationWinterValidation.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenDarkGlassPanesNoVentilationWinterValidation.unit.cpp @@ -64,7 +64,7 @@ class TestGapBetweenDarkGlassPanesNoVentilationWinterValidation : public testing transmittance1, emissivity1, transmittance1); - solidLayer1->setSolarAbsorptance(0.2, solarRadiation); + solidLayer1->setSolarHeatGain(0.2, solarRadiation); ASSERT_TRUE(solidLayer1 != nullptr); auto gapThickness = 0.01; @@ -85,7 +85,7 @@ class TestGapBetweenDarkGlassPanesNoVentilationWinterValidation : public testing transmittance2, emissivity2, transmittance2); - solidLayer2->setSolarAbsorptance(0.2, solarRadiation); + solidLayer2->setSolarHeatGain(0.2, solarRadiation); ASSERT_TRUE(solidLayer2 != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationInsideAir.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationInsideAir.unit.cpp index 2587ca2d..9388c4ab 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationInsideAir.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationInsideAir.unit.cpp @@ -73,7 +73,7 @@ class TestGapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationInsideAir auto Tirb = 0.257367; auto shadeLayer = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - shadeLayer->setSolarAbsorptance(0.35, solarRadiation); + shadeLayer->setSolarHeatGain(0.35, solarRadiation); ASSERT_TRUE(shadeLayer != nullptr); auto gapThickness = 0.05; @@ -88,7 +88,7 @@ class TestGapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationInsideAir const auto solidLayerConductance = 1.0; auto solidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - solidLayer->setSolarAbsorptance(0.04, solarRadiation); + solidLayer->setSolarHeatGain(0.04, solarRadiation); ASSERT_TRUE(solidLayer != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationOutsideAir.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationOutsideAir.unit.cpp index f5e5ff62..1400a82f 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationOutsideAir.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationOutsideAir.unit.cpp @@ -73,7 +73,7 @@ class TestGapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationOutsideAir auto Tirb = 0.257367; auto shadeLayer = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - shadeLayer->setSolarAbsorptance(0.35, solarRadiation); + shadeLayer->setSolarHeatGain(0.35, solarRadiation); ASSERT_TRUE(shadeLayer != nullptr); auto gapThickness = 0.05; @@ -88,7 +88,7 @@ class TestGapBetweenIrradiatedExteriorShadingAndGlassForcedVentilationOutsideAir const auto solidLayerConductance = 1.0; auto solidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - solidLayer->setSolarAbsorptance(0.04, solarRadiation); + solidLayer->setSolarHeatGain(0.04, solarRadiation); ASSERT_TRUE(solidLayer != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingFastForcedVentilationInsideAir.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingFastForcedVentilationInsideAir.unit.cpp index 851235bf..b40b6a7c 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingFastForcedVentilationInsideAir.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingFastForcedVentilationInsideAir.unit.cpp @@ -47,7 +47,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingFastForcedVentilationInside const auto solidLayerConductance = 1.0; auto solidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - solidLayer->setSolarAbsorptance(0.04, solarRadiation); + solidLayer->setSolarHeatGain(0.04, solarRadiation); ASSERT_TRUE(solidLayer != nullptr); auto gapThickness = 0.05; @@ -88,7 +88,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingFastForcedVentilationInside auto Tirb = 0.257367; auto shadeLayer = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - shadeLayer->setSolarAbsorptance(0.35, solarRadiation); + shadeLayer->setSolarHeatGain(0.35, solarRadiation); ASSERT_TRUE(shadeLayer != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAir.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAir.unit.cpp index 8e6ca019..922a44ab 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAir.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAir.unit.cpp @@ -47,7 +47,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAir const auto solidLayerConductance = 1.0; auto solidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - solidLayer->setSolarAbsorptance(0.04, solarRadiation); + solidLayer->setSolarHeatGain(0.04, solarRadiation); ASSERT_TRUE(solidLayer != nullptr); auto gapThickness = 0.05; @@ -88,7 +88,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAir auto Tirb = 0.257367; auto shadeLayer = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - shadeLayer->setSolarAbsorptance(0.35, solarRadiation); + shadeLayer->setSolarHeatGain(0.35, solarRadiation); ASSERT_TRUE(shadeLayer != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAirThreeMeterHeight.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAirThreeMeterHeight.unit.cpp index a5fc0ba6..53dae8aa 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAirThreeMeterHeight.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAirThreeMeterHeight.unit.cpp @@ -47,7 +47,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAirT const auto solidLayerConductance = 1.0; auto solidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - solidLayer->setSolarAbsorptance(0.04, solarRadiation); + solidLayer->setSolarHeatGain(0.04, solarRadiation); ASSERT_TRUE(solidLayer != nullptr); auto gapThickness = 0.05; @@ -88,7 +88,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingForcedVentilationInsideAirT auto Tirb = 0.257367; auto shadeLayer = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - shadeLayer->setSolarAbsorptance(0.35, solarRadiation); + shadeLayer->setSolarHeatGain(0.35, solarRadiation); ASSERT_TRUE(shadeLayer != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection.unit.cpp index f31c808f..bf555d09 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection.unit.cpp @@ -47,7 +47,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection : public const auto solidLayerConductance = 1.0; auto solidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - solidLayer->setSolarAbsorptance(0.04, solarRadiation); + solidLayer->setSolarHeatGain(0.04, solarRadiation); ASSERT_TRUE(solidLayer != nullptr); auto gapThickness = 0.05; @@ -84,7 +84,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection : public auto Tirb = 0.257367; auto shadeLayer = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - shadeLayer->setSolarAbsorptance(0.35, solarRadiation); + shadeLayer->setSolarHeatGain(0.35, solarRadiation); ASSERT_TRUE(shadeLayer != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection1mmGap.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection1mmGap.unit.cpp index c6d5d814..63181a31 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection1mmGap.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection1mmGap.unit.cpp @@ -51,7 +51,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection1mmGap : p const auto solidLayerConductance = 1.0; auto solidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - solidLayer->setSolarAbsorptance(0.04, solarRadiation); + solidLayer->setSolarHeatGain(0.04, solarRadiation); ASSERT_TRUE(solidLayer != nullptr); auto gapThickness = 0.001; @@ -88,7 +88,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingNaturalConvection1mmGap : p auto Tirb = 0.257367; auto shadeLayer = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - shadeLayer->setSolarAbsorptance(0.35, solarRadiation); + shadeLayer->setSolarHeatGain(0.35, solarRadiation); ASSERT_TRUE(shadeLayer != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingSealedVentilation.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingSealedVentilation.unit.cpp index 15c8267c..7fe1032c 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingSealedVentilation.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingSealedVentilation.unit.cpp @@ -47,7 +47,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingSealedVentilation : public const auto solidLayerConductance = 1.0; auto solidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - solidLayer->setSolarAbsorptance(0.04, solarRadiation); + solidLayer->setSolarHeatGain(0.04, solarRadiation); ASSERT_TRUE(solidLayer != nullptr); auto gapThickness = 0.05; @@ -82,7 +82,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingSealedVentilation : public auto Tirb = 0.257367; auto shadeLayer = Tarcog::ISO15099::Layers::sealedLayer( effectiveThickness, shadeLayerConductance, Ef, Tirf, Eb, Tirb); - shadeLayer->setSolarAbsorptance(0.35, solarRadiation); + shadeLayer->setSolarHeatGain(0.35, solarRadiation); ASSERT_TRUE(shadeLayer != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation.unit.cpp index 1b7f5527..75bcda4f 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation.unit.cpp @@ -47,7 +47,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation : pub const auto solidLayerConductance = 1.0; auto solidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - solidLayer->setSolarAbsorptance(0.04, solarRadiation); + solidLayer->setSolarHeatGain(0.04, solarRadiation); ASSERT_TRUE(solidLayer != nullptr); auto gapThickness = 0.05; @@ -88,7 +88,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation : pub auto Tirb = 0.257367; auto shadeLayer = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - shadeLayer->setSolarAbsorptance(0.35, solarRadiation); + shadeLayer->setSolarHeatGain(0.35, solarRadiation); ASSERT_TRUE(shadeLayer != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation1mmGap.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation1mmGap.unit.cpp index 9e97bfa7..1cf5291a 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation1mmGap.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation1mmGap.unit.cpp @@ -52,7 +52,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation1mmGap const auto solidLayerConductance = 1.0; auto solidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - solidLayer->setSolarAbsorptance(0.04, solarRadiation); + solidLayer->setSolarHeatGain(0.04, solarRadiation); ASSERT_TRUE(solidLayer != nullptr); auto gapThickness = 0.001; @@ -93,7 +93,7 @@ class TestGapBetweenIrradiatedGlassAndInteriorShadingZeroForcedVentilation1mmGap auto Tirb = 0.257367; auto shadeLayer = Tarcog::ISO15099::Layers::shading( effectiveThickness, shadeLayerConductance, effOpenness, Ef, Tirf, Eb, Tirb); - shadeLayer->setSolarAbsorptance(0.35, solarRadiation); + shadeLayer->setSolarHeatGain(0.35, solarRadiation); ASSERT_TRUE(shadeLayer != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassPanesForcedVentilationInsideAirSummerValidation.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassPanesForcedVentilationInsideAirSummerValidation.unit.cpp index fe74d22c..51a0e243 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassPanesForcedVentilationInsideAirSummerValidation.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassPanesForcedVentilationInsideAirSummerValidation.unit.cpp @@ -70,7 +70,7 @@ class TestGapBetweenIrradiatedGlassPanesForcedVentilationInsideAirSummerValidati transmittance1, emissivity1, transmittance1); - solidLayer1->setSolarAbsorptance(0.2, solarRadiation); + solidLayer1->setSolarHeatGain(0.2, solarRadiation); ASSERT_TRUE(solidLayer1 != nullptr); auto gapThickness = 0.01; @@ -91,7 +91,7 @@ class TestGapBetweenIrradiatedGlassPanesForcedVentilationInsideAirSummerValidati transmittance2, emissivity2, transmittance2); - solidLayer2->setSolarAbsorptance(0.2, solarRadiation); + solidLayer2->setSolarHeatGain(0.2, solarRadiation); ASSERT_TRUE(solidLayer2 != nullptr); Tarcog::ISO15099::CIGU aIGU(windowWidth, windowHeight); diff --git a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassPanesWithIntegratedShadingForcedVentilation.unit.cpp b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassPanesWithIntegratedShadingForcedVentilation.unit.cpp index ccd2064d..34c21ae9 100644 --- a/src/Tarcog/tst/units/GapBetweenIrradiatedGlassPanesWithIntegratedShadingForcedVentilation.unit.cpp +++ b/src/Tarcog/tst/units/GapBetweenIrradiatedGlassPanesWithIntegratedShadingForcedVentilation.unit.cpp @@ -48,11 +48,11 @@ class TestGapBetweenIrradiatedGlassPanesWithIntegratedShadingForcedVentilation : auto solidLayerConductance = 1.0; auto layer1 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - layer1->setSolarAbsorptance(0.03, solarRadiation); + layer1->setSolarHeatGain(0.03, solarRadiation); ASSERT_TRUE(layer1 != nullptr); auto layer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - layer2->setSolarAbsorptance(0.03, solarRadiation); + layer2->setSolarHeatGain(0.03, solarRadiation); ASSERT_TRUE(layer2 != nullptr); auto shadeLayerThickness = 0.01; @@ -68,7 +68,7 @@ class TestGapBetweenIrradiatedGlassPanesWithIntegratedShadingForcedVentilation : EffectiveLayers::EffectiveOpenness effOpenness{effectiveLayer.getEffectiveOpenness()}; auto shadeLayer = Tarcog::ISO15099::Layers::shading( shadeLayerThickness, shadeLayerConductance, effOpenness); - shadeLayer->setSolarAbsorptance(0.35, solarRadiation); + shadeLayer->setSolarHeatGain(0.35, solarRadiation); ASSERT_TRUE(shadeLayer != nullptr); const auto gapThickness = 0.0127; diff --git a/src/Tarcog/tst/units/HorizontalSliderWindow.unit.cpp b/src/Tarcog/tst/units/HorizontalSliderWindow.unit.cpp index f9590ddf..654d8c65 100644 --- a/src/Tarcog/tst/units/HorizontalSliderWindow.unit.cpp +++ b/src/Tarcog/tst/units/HorizontalSliderWindow.unit.cpp @@ -37,7 +37,7 @@ class TestHorizontalSliderWindow : public testing::Test auto aSolidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer->setSolarAbsorptance(0.094189159572, solarRadiation); + aSolidLayer->setSolarHeatGain(0.094189159572, solarRadiation); auto windowWidth = 1.0; auto windowHeight = 1.0; diff --git a/src/Tarcog/tst/units/SingleClear.unit.cpp b/src/Tarcog/tst/units/SingleClear.unit.cpp index d0b3878b..0843b243 100644 --- a/src/Tarcog/tst/units/SingleClear.unit.cpp +++ b/src/Tarcog/tst/units/SingleClear.unit.cpp @@ -43,7 +43,7 @@ class TestSingleClear : public testing::Test auto aSolidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); ASSERT_TRUE(aSolidLayer != nullptr); - aSolidLayer->setSolarAbsorptance(0.094189159572, solarRadiation); + aSolidLayer->setSolarHeatGain(0.094189159572, solarRadiation); auto windowWidth = 1.0; auto windowHeight = 1.0; diff --git a/src/Tarcog/tst/units/SingleClearSolarRadiationCond001.unit.cpp b/src/Tarcog/tst/units/SingleClearSolarRadiationCond001.unit.cpp index a747818a..14a834cf 100644 --- a/src/Tarcog/tst/units/SingleClearSolarRadiationCond001.unit.cpp +++ b/src/Tarcog/tst/units/SingleClearSolarRadiationCond001.unit.cpp @@ -42,7 +42,7 @@ class TestSingleClearSolarCond100 : public testing::Test auto aSolidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer->setSolarAbsorptance(solarAbsorptance, solarRadiation); + aSolidLayer->setSolarHeatGain(solarAbsorptance, solarRadiation); ASSERT_TRUE(aSolidLayer != nullptr); auto windowWidth = 1.0; diff --git a/src/Tarcog/tst/units/SingleClearSolarRadiationCond100.unit.cpp b/src/Tarcog/tst/units/SingleClearSolarRadiationCond100.unit.cpp index 14ac5a6b..ef304f07 100644 --- a/src/Tarcog/tst/units/SingleClearSolarRadiationCond100.unit.cpp +++ b/src/Tarcog/tst/units/SingleClearSolarRadiationCond100.unit.cpp @@ -44,7 +44,7 @@ class TestSingleClearSolarCond001 : public testing::Test auto aSolidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer->setSolarAbsorptance(solarAbsorptance, solarRadiation); + aSolidLayer->setSolarHeatGain(solarAbsorptance, solarRadiation); ASSERT_TRUE(aSolidLayer != nullptr); double windowWidth = 1; diff --git a/src/Tarcog/tst/units/SingleClearThermochromics.unit.cpp b/src/Tarcog/tst/units/SingleClearThermochromics.unit.cpp index 1ba6f4be..ba2d8de6 100644 --- a/src/Tarcog/tst/units/SingleClearThermochromics.unit.cpp +++ b/src/Tarcog/tst/units/SingleClearThermochromics.unit.cpp @@ -67,7 +67,7 @@ class TestSingleClearThermochromics : public testing::Test auto aSolidLayer = std::make_shared( solidLayerThickness, solidLayerConductance, frontSurface, backSurface); ASSERT_TRUE(aSolidLayer != nullptr); - aSolidLayer->setSolarAbsorptance(0.094189159572, solarRadiation); + aSolidLayer->setSolarHeatGain(0.094189159572, solarRadiation); const auto windowWidth = 1.0; const auto windowHeight = 1.0; diff --git a/src/Tarcog/tst/units/SingleVisionWindow.unit.cpp b/src/Tarcog/tst/units/SingleVisionWindow.unit.cpp index e65aa64f..d0e2d798 100644 --- a/src/Tarcog/tst/units/SingleVisionWindow.unit.cpp +++ b/src/Tarcog/tst/units/SingleVisionWindow.unit.cpp @@ -39,7 +39,7 @@ class TestSingleVisionWindow : public testing::Test auto aSolidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer->setSolarAbsorptance(0.0914, solarRadiation); + aSolidLayer->setSolarHeatGain(0.0914, solarRadiation); auto windowWidth = 2.0; auto windowHeight = 2.0; diff --git a/src/Tarcog/tst/units/TripleClear_Deflection.unit.cpp b/src/Tarcog/tst/units/TripleClear_Deflection.unit.cpp index 5537f14f..9f0cfaf6 100644 --- a/src/Tarcog/tst/units/TripleClear_Deflection.unit.cpp +++ b/src/Tarcog/tst/units/TripleClear_Deflection.unit.cpp @@ -45,15 +45,15 @@ class TestTripleClearDeflection : public testing::Test auto aSolidLayer1 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer1->setSolarAbsorptance(0.099839858711, solarRadiation); + aSolidLayer1->setSolarHeatGain(0.099839858711, solarRadiation); auto aSolidLayer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer2->setSolarAbsorptance(0.076627746224, solarRadiation); + aSolidLayer2->setSolarHeatGain(0.076627746224, solarRadiation); auto aSolidLayer3 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer3->setSolarAbsorptance(0.058234799653, solarRadiation); + aSolidLayer3->setSolarHeatGain(0.058234799653, solarRadiation); constexpr auto gapThickness1{0.006}; const auto gapLayer1 = Tarcog::ISO15099::Layers::gap(gapThickness1); diff --git a/src/Tarcog/tst/units/TripleClear_DeflectionWithLoad.unit.cpp b/src/Tarcog/tst/units/TripleClear_DeflectionWithLoad.unit.cpp index c23f562b..52971ee2 100644 --- a/src/Tarcog/tst/units/TripleClear_DeflectionWithLoad.unit.cpp +++ b/src/Tarcog/tst/units/TripleClear_DeflectionWithLoad.unit.cpp @@ -45,15 +45,15 @@ class TestTripleClearDeflectionWithLoad : public testing::Test auto aSolidLayer1 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer1->setSolarAbsorptance(0.099839858711, solarRadiation); + aSolidLayer1->setSolarHeatGain(0.099839858711, solarRadiation); auto aSolidLayer2 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer2->setSolarAbsorptance(0.076627746224, solarRadiation); + aSolidLayer2->setSolarHeatGain(0.076627746224, solarRadiation); auto aSolidLayer3 = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer3->setSolarAbsorptance(0.058234799653, solarRadiation); + aSolidLayer3->setSolarHeatGain(0.058234799653, solarRadiation); constexpr auto gapThickness1{0.006}; const auto gapLayer1 = Tarcog::ISO15099::Layers::gap(gapThickness1); diff --git a/src/Tarcog/tst/units/VerticalSliderWindow.unit.cpp b/src/Tarcog/tst/units/VerticalSliderWindow.unit.cpp index 65ac79c1..531f7f03 100644 --- a/src/Tarcog/tst/units/VerticalSliderWindow.unit.cpp +++ b/src/Tarcog/tst/units/VerticalSliderWindow.unit.cpp @@ -39,7 +39,7 @@ class TestVerticalSliderWindow : public testing::Test auto aSolidLayer = Tarcog::ISO15099::Layers::solid(solidLayerThickness, solidLayerConductance); - aSolidLayer->setSolarAbsorptance(0.094189159572, solarRadiation); + aSolidLayer->setSolarHeatGain(0.094189159572, solarRadiation); auto windowWidth = 1.0; auto windowHeight = 1.0;