Skip to content
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

Jump to bottom

Allow GPU-based shading calculations #7302

Merged
merged 61 commits into from
Feb 21, 2020
Merged

Allow GPU-based shading calculations #7302

Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
2f6f386
Link to Penumbra.
nealkruis Apr 2, 2019
9ad3b1f
Penumbra Cmake fixes (for Windows builds).
nealkruis Apr 2, 2019
3c8e0d4
Merge branch 'develop' into penumbra-integration
nealkruis Apr 23, 2019
2a30fc3
Initial implementation of Penumbra to do shading calculations.
nealkruis May 3, 2019
8aafc93
Fix reveal calculations.
nealkruis May 8, 2019
674d389
Update penumbra.
nealkruis May 16, 2019
f041b22
Modify ShadowCalculation object to allow input for GPU-based shading.
nealkruis May 16, 2019
341047a
Update testfiles.
nealkruis May 16, 2019
cf37de5
Merge branch 'develop' into penumbra-integration
nealkruis May 16, 2019
7794e71
Add design document.
nealkruis May 16, 2019
3030f59
Fix unit tests using 'ShadowCalculation' object.
nealkruis May 20, 2019
762b35c
Only run Penumbra tests if OpenGL is available.
nealkruis May 20, 2019
9cd3a17
Eliminate function name conflict.
nealkruis May 20, 2019
aeddb46
Update design doc.
nealkruis May 20, 2019
f3d0cab
Expand description of existing capabilities.
nealkruis May 20, 2019
6f02d69
Add Pixel Counting Resolution field.
nealkruis Jun 6, 2019
a0bd5c4
Add interior solar distribution calculations.
nealkruis Jun 13, 2019
ebca86b
Separate shader programs for render and calculate.
nealkruis Jun 13, 2019
5170ab3
Remove extra query check.
nealkruis Jun 13, 2019
5709797
Update Penumbra.
nealkruis Jun 14, 2019
0e0e847
Fix minor inconsistencies.
nealkruis Jun 14, 2019
a6e3fd4
Merge remote-tracking branch 'origin/develop' into penumbra-integration
mbadams5 Jun 27, 2019
139e522
Initial work on gpu performance and multi query
mbadams5 Jun 28, 2019
ee6073f
Fix bugs and test new performance ideas
mbadams5 Jun 30, 2019
4991f3d
Update for profiling
mbadams5 Jul 2, 2019
821ff2d
Don't set penumbra model if there are no surfaces.
nealkruis Jul 2, 2019
e0d0615
Merge branch 'develop' into multi_query
mbadams5 Jul 5, 2019
e2c55b1
Merge branch 'penumbra-integration' of github.com:NREL/EnergyPlus int…
mbadams5 Jul 5, 2019
ed39392
Allow builds without OpenGL (but issue warning).
nealkruis Jul 9, 2019
8adfa69
Merge branch 'develop' into penumbra-integration
nealkruis Jul 9, 2019
a0ea07b
Clean up cmake warning.
nealkruis Jul 11, 2019
83db34a
Merge branch 'develop' into penumbra-integration
mbadams5 Aug 12, 2019
e9db9fb
Merge remote-tracking branch 'origin/develop' into penumbra-integration
mbadams5 Oct 16, 2019
c867e0d
Code clean up
mbadams5 Oct 16, 2019
688708f
Fix infinite loop bug in penumbra unit tests
mbadams5 Dec 19, 2019
c26aee2
Merge branch 'develop' into penumbra-integration
mbadams5 Dec 19, 2019
6870012
Fix build error and initial runtime GPU check
mbadams5 Dec 22, 2019
b83c45c
Merge branch 'develop' into penumbra-integration
mbadams5 Dec 22, 2019
90da248
Add a an OpenGL on/off CMake flag
jasondegraw Dec 31, 2019
7b74c8c
Fix compile error in unit tests
mbadams5 Jan 1, 2020
522116a
Fix failing unit and performance tests
mbadams5 Jan 1, 2020
30b1023
Merge remote-tracking branch 'origin/update-license-year' into penumb…
mbadams5 Jan 2, 2020
b807e10
Clean up code and fix linux issues
mbadams5 Jan 2, 2020
72eebfb
Pass error callback to use E+ error messaging
mbadams5 Jan 3, 2020
1b398a1
Merge branch 'develop' into penumbra-integration
mbadams5 Jan 20, 2020
76b49a8
Fix two integration errors
mbadams5 Jan 21, 2020
5d01fd0
Test mac and windows CI opengl builds
mbadams5 Jan 22, 2020
94a46b2
Add GPU context check.
nealkruis Jan 27, 2020
e6b6b47
Update penumbra unit tests to not run if it can't create a valid Open…
nealkruis Feb 19, 2020
a22b1aa
Merge develop into penumbra-integration.
nealkruis Feb 19, 2020
32a411c
Clean up compiler warnings.
nealkruis Feb 20, 2020
fde9a15
Merge remote-tracking branch 'origin/develop' into penumbra-integration
mbadams5 Feb 21, 2020
353723a
Fix unit test errors since penumbra error shouldn't fatal
mbadams5 Feb 21, 2020
5e06222
Remove unused using statements
mbadams5 Feb 21, 2020
e3fc456
Add transition rules.
nealkruis Feb 21, 2020
95b2e30
Fixing failing unit test
mbadams5 Feb 21, 2020
dbf990b
Add transition rules description.
nealkruis Feb 21, 2020
742a5ec
Add output rules description.
nealkruis Feb 21, 2020
4b565c3
Fix build warning
mbadams5 Feb 21, 2020
a8518d9
Merge branch 'penumbra-integration' of https://github.com/NREL/Energy…
nealkruis Feb 21, 2020
9618585
Draft documentation.
nealkruis Feb 21, 2020
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 src/EnergyPlus/SolarShading.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ namespace SolarShading {
#else
auto error_callback = [](const int messageType, const std::string & message, void * /*contextPtr*/){
if (messageType == Pumbra::MSG_ERR) {
ShowFatalError(message);
ShowSevereError(message);
Copy link
Member Author

Choose a reason for hiding this comment

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

@mbadams5 I'm worried that this won't effectively handle problems within Penumbra.

} else if (messageType == Pumbra::MSG_WARN) {
ShowWarningError(message);
} else /*if (messageType == MSG_INFO)*/ {
Expand Down