From 8b606a7405e5d40e5909cc8aa802817d5b1defef Mon Sep 17 00:00:00 2001 From: Simon Vidanovic Date: Thu, 24 Aug 2023 09:37:27 -0700 Subject: [PATCH] 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;