Skip to content

Improve test coverage for ConvexWeilerAtherton polygon clipping algorithm #11554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mitchute merged 8 commits into from
May 6, 2026
Merged

Improve test coverage for ConvexWeilerAtherton polygon clipping algorithm #11554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
95407bc
Add new testfile with ConvexWeilerAtherton polygon clipping algorithm.
joseph-robertson Apr 29, 2026
0d13f85
Add new testfile to CMakeLists.
joseph-robertson Apr 29, 2026
30cb1d0
Clean up related output variable in docs.
joseph-robertson Apr 29, 2026
44c5ee7
Clean up duplicate output variable lines caught by review.
joseph-robertson Apr 29, 2026
d3d55fa
Replace new test file with improved unit test.
joseph-robertson May 1, 2026
d5f478b
Merge branch 'develop' into convex-weiler-atherton
joseph-robertson May 1, 2026
4d27428
Formatting.
joseph-robertson May 1, 2026
41e1502
ensure the right algorithm is picked by asserting the other algorithm…
mitchute May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/input-output-reference/src/overview/group-thermal-zone-description-geometry.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2874,7 +2874,7 @@ \subsection{Surface Output Variables/Reports}\label{surface-output-variablesrepo
Zone,Average,Surface Outside Face Outdoor Air Wind Speed [m/s]
Zone,Average,Surface Outside Face Outdoor Air Wind Direction [deg]
Zone,Average,Surface Outside Face Sunlit Area [m2]
Zone,Average,Surface Outside Face Sunlit Fraction \protect\hyperlinksection-1
Zone,Average,Surface Outside Face Sunlit Fraction []
Zone,Average,Surface Outside Face Incident Solar Radiation Rate per Area[W/m2]
Zone,Average,Surface Outside Face Solar Radiation Heat Gain Rate [W]
Zone,Average,Surface Outside Face Solar Radiation Heat Gain Rate per Area [W/m2]
Expand Down
2 changes: 0 additions & 2 deletions testfiles/QTFtest.idf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,6 @@

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Surface Inside Face Temperature,daily;

Output:Variable,*,Surface Outside Face Temperature,daily;
Expand Down
2 changes: 0 additions & 2 deletions testfiles/SolarShadingTest.idf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3005,8 +3005,6 @@

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Surface Outside Face Sunlit Fraction,timestep;

Output:Variable,*,Surface Inside Face Temperature,daily;
Expand Down
2 changes: 0 additions & 2 deletions testfiles/SolarShadingTestGPU.idf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3005,8 +3005,6 @@

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Surface Outside Face Sunlit Fraction,timestep;

Output:Variable,*,Surface Inside Face Temperature,daily;
Expand Down
2 changes: 0 additions & 2 deletions testfiles/SolarShadingTest_DisableSelfShading.idf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3017,8 +3017,6 @@

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Surface Inside Face Temperature,daily;

Output:Variable,*,Surface Outside Face Temperature,daily;
Expand Down
2 changes: 0 additions & 2 deletions testfiles/SolarShadingTest_DisableSelfShadingGroup.idf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3026,8 +3026,6 @@

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Surface Inside Face Temperature,daily;

Output:Variable,*,Surface Outside Face Temperature,daily;
Expand Down
2 changes: 0 additions & 2 deletions testfiles/SolarShadingTest_ExternalFraction.idf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4744,8 +4744,6 @@

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Surface Inside Face Temperature,daily;

Output:Variable,*,Surface Outside Face Temperature,daily;
Expand Down
2 changes: 0 additions & 2 deletions testfiles/SolarShadingTest_ImportedShading.idf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3018,8 +3018,6 @@

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Surface Inside Face Temperature,daily;

Output:Variable,*,Surface Outside Face Temperature,daily;
Expand Down
2 changes: 0 additions & 2 deletions testfiles/SolarShadingTest_SQL.idf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3005,8 +3005,6 @@

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Surface Inside Face Temperature,daily;

Output:Variable,*,Surface Outside Face Temperature,daily;
Expand Down
2 changes: 0 additions & 2 deletions testfiles/SurfaceTest.idf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2311,8 +2311,6 @@

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Zone Mean Radiant Temperature,hourly;

Output:Variable,*,Surface Inside Face Temperature,daily;

Output:Variable,*,Surface Outside Face Temperature,daily;
Expand Down
32 changes: 28 additions & 4 deletions tst/EnergyPlus/unit/SolarShading.unit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2500,6 +2500,8 @@ WindowMaterial:SimpleGlazingSystem,
}

TEST_F(EnergyPlusFixture, SolarShadingTest_GetBuildingDataUsesShadowCalculationSettingsDuringGeometrySetup)
// Tests that GetShadowingInput must be called before SetupZoneGeometry to get the CheckConvexity warning -- related to issue #9275
// Also provides coverage for Polygon Clipping Algorithm = ConvexWeilerAtherton -- issue #5558
{
std::string const idf_objects = R"IDF(
RunPeriod,
Expand Down Expand Up @@ -2785,7 +2787,28 @@ WindowMaterial:SimpleGlazingSystem,

HeatBalanceManager::GetBuildingData(*state, FoundError);
ASSERT_FALSE(FoundError);
ASSERT_TRUE(match_err_stream("CheckConvexity: Zone=\"ZONE A\", Surface=\"69C03D\" is non-convex."));
state->dataGlobal->BeginSimFlag = true;
EXPECT_TRUE(state->dataSolarShading->GetInputFlag);
SolarShading::InitSolarCalculations(*state);
EXPECT_FALSE(state->dataSysVars->SutherlandHodgman);
EXPECT_FALSE(state->dataSysVars->SlaterBarsky);
Comment on lines +2793 to +2794
Copy link
Copy Markdown
Collaborator

@mitchute mitchute May 5, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added these. These various algorithms needed to get refactored using an actual enum.


std::string const error_string =
delimited_string({" ** Warning ** CheckConvexity: Zone=\"ZONE A\", Surface=\"69C03D\" is non-convex.",
" ** ~~~ ** ...vertex 4 to vertex 5 to vertex 6",
" ** ~~~ ** ...vertex 4=[0.00,0.00,3.05]",
" ** ~~~ ** ...vertex 5=[0.00,3.05,3.05]",
" ** ~~~ ** ...vertex 6=[0.00,3.05,6.10]",
" ** Warning ** CheckConvexity: Zone=\"ZONE A\", Surface=\"5BB552\" is non-convex.",
" ** ~~~ ** ...vertex 2 to vertex 3 to vertex 4",
" ** ~~~ ** ...vertex 2=[6.10,3.05,3.05]",
" ** ~~~ ** ...vertex 3=[6.10,0.00,3.05]",
" ** ~~~ ** ...vertex 4=[6.10,0.00,0.00]",
" ** Warning ** DetermineShadowingCombinations: Surface=\"5BB552\" is a receiving surface and is non-convex.",
" ** ~~~ ** ...Shadowing values may be inaccurate. Check .shd report file for more surface shading details",
" ** Severe ** DetermineShadowingCombinations: Surface=\"5BB552\" is a casting surface and is non-convex.",
" ** ~~~ ** ...Shadowing values may be inaccurate. Check .shd report file for more surface shading details"});
EXPECT_TRUE(compare_err_stream(error_string, true));
}

TEST_F(EnergyPlusFixture, SolarShadingTest_GPUNonConvexErrors)
Expand Down Expand Up @@ -5549,7 +5572,7 @@ TEST_F(EnergyPlusFixture, SolarShadingTest_PolygonOverlap3)
}

TEST_F(EnergyPlusFixture, SolarShadingTest_checkSurfaceExternalShadingSchedules_Scheduled)
// Test of check to see if all surfaces have a sunlit schedule when shadow calculations are set to "Scheduled"
// Test of check to see if all surfaces have a sunlit schedule when shadow calculations are set to "Scheduled" -- related to issue #9275
{
// Set up data for test. Shading surfaces are skipped so they should not report any errors.
// Some surfaces will be correctly defined while two other surfaces will not be correctly defined and will generate errors.
Expand Down Expand Up @@ -5920,7 +5943,7 @@ WindowMaterial:SimpleGlazingSystem,
}

TEST_F(EnergyPlusFixture, SolarShadingTest_checkSurfaceExternalShadingSchedules_Imported)
// Test of check to see if all surfaces have a sunlit schedule when shadow calculations are set to "Imported"
// Test of check to see if all surfaces have a sunlit schedule when shadow calculations are set to "Imported" -- related to issue #9275
{
// Set up data for test. Shading surfaces are skipped so they should not report any errors.
// Some surfaces will be correctly defined while two other surfaces will not be correctly defined and will generate errors.
Expand Down Expand Up @@ -6269,7 +6292,8 @@ WindowMaterial:SimpleGlazingSystem,
}

TEST_F(EnergyPlusFixture, SolarShadingTest_checkSurfaceExternalShadingSchedules_PolygonClipping)
// Test of check to see if all surfaces do not have a sunlit schedule when shadow calculations are not set to "Scheduled" or "Imported"
// Test of check to see if all surfaces do not have a sunlit schedule when shadow calculations are not set to "Scheduled" or "Imported" -- related to
// issue #9275
{
// Set up data for test. Shading surfaces are skipped so they should not report any errors.
// Some surfaces will be correctly defined while two other surfaces will not be correctly defined and will generate errors.
Expand Down
Loading