Skip to content

Commit

Permalink
SetSolarAbsorptance is renamed to SetSolarHeatGain for the layers.
Browse files Browse the repository at this point in the history
  • Loading branch information
vidanovic committed Aug 24, 2023
1 parent 0633110 commit 8b606a7
Show file tree
Hide file tree
Showing 42 changed files with 77 additions and 77 deletions.
2 changes: 1 addition & 1 deletion src/Tarcog/src/IGU.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Tarcog/src/IGUSolidLayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Tarcog/src/IGUSolidLayer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/Tarcog/tst/units/DoubleClearDeflectionTPDefault.unit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/Tarcog/tst/units/DoubleClearLeeward.unit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/Tarcog/tst/units/DoubleClearSingleSystemWithSun.unit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions src/Tarcog/tst/units/DoubleClear_DeflectionWithLoad.unit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/Tarcog/tst/units/DoubleClear_UValueEnvironment.unit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)};
Expand All @@ -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};
Expand Down
4 changes: 2 additions & 2 deletions src/Tarcog/tst/units/DoubleLowESingleVisionSHGCRun.unit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)};
Expand All @@ -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};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)};
Expand All @@ -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};
Expand Down
4 changes: 2 additions & 2 deletions src/Tarcog/tst/units/DoubleLowEVerticalSliderSHGCRun.unit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)};
Expand All @@ -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};
Expand Down
4 changes: 2 additions & 2 deletions src/Tarcog/tst/units/DoubleLoweWithDeflection.unit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand All @@ -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};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/Tarcog/tst/units/DoubleOutsideVenetianShade_SHGC.unit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
Loading

0 comments on commit 8b606a7

Please sign in to comment.