Daylighting output revisions and other cleanup related to Enclosures vs Zones #9102

mjwitte · 2021-09-27T20:20:30Z

Pull request overview

Move various daylighting outputs to be by enclosure or daylighting control object rather than by zone. This introduces changes in eio output headers and row order.
Remove glare calculations and associated arrays for map points. Glare calculations were being performed for every map point, but the glare results are never used.
Fixes Duplicate daylighting reference points in DXF output #9084
Convert optional arguments in daylighting functions into int const with defaults.
Move chunks of daylighting code out of HeatBalanceSurfaceManager::InitSurfaceHeatBalance into new functions in DaylightingManager.
Add missing daylighting eio sections to Output Details and Examples doc.

Diffs

dxf diffs reflect 2 things that fix Duplicate daylighting reference points in DXF output #9084
- Duplicate daylighting reference points are removed
- The actual reference point names are used in the label, rather than RefPt1, 2, etc.
- For example, diffs from AirflowNetwork_MultiZone_SmallOffice

 999
-WEST ZONE:DayRefPt:1
+WEST ZONE:DayRefPt:WEST ZONE_DAYLREFPT1
   0
 CIRCLE
   8
@@ -1503,22 +1503,6 @@
         0.90000
  40
         0.20000
-999
-WEST ZONE:DEDayRefPt:1
-  0
-CIRCLE

eio diffs reflect 2 things related to daylighting outputs
- Changing zone names to daylighting control and/or enclosure name
- Changes in row order (previously the order was by zone, now it's by daylighting control or enclosure)
- Added missing "Sky Type" in the Sky Daylight Factors header.
dfs diffs are a change in order
table diffs
- Changes in row order and/or subtable titles in the Initialization Summary (same changes as the eio output)
- Changes in row order in the Lighting Summary Daylighting subtable.

ToDo List

Add output rules
Unit tests
Additional refactoring comments logged in new issue Miscellaneous Daylighting Code Refactoring #9152

Pull Request Author

Add to this list or remove from it as applicable. This is a simple templated set of guidelines.

Reviewer

This will not be exhaustively relevant to every PR.

…owup

amirroth · 2021-09-28T19:46:09Z

src/EnergyPlus/DaylightingManager.cc

+                                                                            DataDaylighting::SkyType::ClearTurbid,
+                                                                            DataDaylighting::SkyType::Intermediate,
+                                                                            DataDaylighting::SkyType::Overcast}) {
+                                std::string skyTypeString;


constexpr std::array<std::string_view>

amirroth · 2021-09-28T19:50:08Z

src/EnergyPlus/DaylightingManager.cc

+            curRefPt.indexToFracAndIllum = refPtNum; // back reference to the index to the ZoneDaylight structure arrays related to reference points
+            if (state.dataSurface->DaylRefWorldCoordSystem) {
+                // transform only by appendix G rotation
+                daylCntrl.DaylRefPtAbsCoord(1, refPtNum) = curRefPt.x * CosBldgRotAppGonly - curRefPt.y * SinBldgRotAppGonly;


This bad girl looks like it should be an Array1D<Vector3> rather than Array2D.

amirroth · 2021-09-28T19:51:50Z

src/EnergyPlus/OutputReports.cc

+        for (int daylightCtrlNum = 1; daylightCtrlNum <= state.dataDaylightingData->totDaylightingControls; ++daylightCtrlNum) {
+            auto &thisDaylightControl = state.dataDaylightingData->daylightControl(daylightCtrlNum);
+            auto curcolorno = ColorNo::DaylSensor1;
+            std::string refPtType;


constexpr std::array<std::string_view>

…owup

mjwitte

Code walkthrough.
Note that several earlier comments from @amirroth have been logged in #9152.

mjwitte · 2021-11-18T14:54:17Z

src/EnergyPlus/DataDaylighting.hh

@@ -247,17 +247,11 @@ namespace DataDaylighting {
        Array2D<Real64> MapRefPtAbsCoord; // X,Y,Z coordinates of all illuminance map reference points
        // in absolute coordinate system (m)
        // Points 1 and 2 are the control reference points
-        Array1D_bool MapRefPtInBounds;     // True when coordinates are in bounds of zone coordinates
-        Array1D<Real64> DaylIllumAtMapPt;  // Daylight illuminance at illuminance map points (lux)


Delete unused glare arrays in MapCalcData. More below.

mjwitte · 2021-11-18T14:58:35Z

src/EnergyPlus/DaylightingManager.cc

                static constexpr std::string_view Format_700(
-                    "! <Sky Daylight Factors>, MonthAndDay, Zone Name, Window Name, Reference Point, Daylight Factor\n");
+                    "! <Sky Daylight Factors>, Sky Type, MonthAndDay, Daylighting Control Name, Enclosure Name, "


Add missing Sky Type in header.

mjwitte · 2021-11-18T14:58:58Z

src/EnergyPlus/DaylightingManager.cc

                print(state.files.eio, Format_700);
-                for (int zoneNum = 1; zoneNum <= state.dataGlobal->NumOfZones; ++zoneNum) {


Remove outer loop by zone.

mjwitte · 2021-11-18T14:59:49Z

src/EnergyPlus/DaylightingManager.cc

        print(dfs,
              "{}\n",
              "Hour,Reference Point,Daylight Factor for Clear Sky,Daylight Factor for Clear Turbid Sky,"
              "Daylight Factor for Intermediate Sky,Daylight Factor for Overcast Sky");
        state.dataDaylightingManager->CreateDFSReportFile = false;
    }

-    // TODO MJW: For now preserve order by zone
-    for (int zoneNum = 1; zoneNum <= state.dataGlobal->NumOfZones; ++zoneNum) {


Remove outer loop by zone.

mjwitte · 2021-11-18T15:01:35Z

src/EnergyPlus/DaylightingManager.cc

-    // TODO MJW: remove all of the glare calcs for map points
+    // but these are arguments to some of the functions that are shared with regular reference points, so initalize here.


Remove as much as possible related to glare calculations in the map functions.

mjwitte · 2021-11-18T15:37:49Z

src/EnergyPlus/OutputReports.cc

-        // TODO MJW: Keep zone loop for now to maintain order
-        for (int zoneNum = 1; zoneNum <= state.dataGlobal->NumOfZones; ++zoneNum) {


Remove yet another zone loop (YAZL).

mjwitte · 2021-11-18T15:39:40Z

src/EnergyPlus/OutputReports.cc

-    DXFDaylightingReferencePoints(state, dxffile, false);
-    DXFDaylightingReferencePoints(state, dxffile, true);
+    DXFDaylightingReferencePoints(state, dxffile);


This is the same thing again in DXFOutLines.

mjwitte · 2021-11-18T15:43:31Z

src/EnergyPlus/OutputReports.cc

-    DXFDaylightingReferencePoints(state, dxffile, false);
+    DXFDaylightingReferencePoints(state, dxffile);


Just call this once and handle the different reference point types within the function.

mjwitte · 2021-11-18T15:44:19Z

src/EnergyPlus/OutputReports.cc

@@ -1256,8 +1257,7 @@ void DXFOutWireFrame(EnergyPlusData &state, std::string const &ColorScheme)
        }
    }

-    DXFDaylightingReferencePoints(state, dxffile, false);
-    DXFDaylightingReferencePoints(state, dxffile, true);
+    DXFDaylightingReferencePoints(state, dxffile);


And again in DXFOutWireFrame.

mjwitte · 2021-11-18T15:44:46Z

tst/EnergyPlus/unit/DaylightingManager.unit.cc

@@ -3028,3 +3034,299 @@ TEST_F(EnergyPlusFixture, DaylightingManager_ReportIllumMap)
    EXPECT_EQ(expectedResultName, state->dataDaylightingData->IllumMap(1).Name);
    EXPECT_EQ(expectedResultPtsHeader, state->dataDaylightingData->IllumMap(MapNum).pointsHeader);
 }
+TEST_F(EnergyPlusFixture, DaylightingManager_DayltgIlluminanceMap)


New unit test for map values.

…owup

nrel-bot-3 · 2021-12-28T01:35:04Z

@mjwitte @Myoldmopar it has been 28 days since this pull request was last updated.

Myoldmopar · 2022-01-03T18:20:50Z

This is all around a really great cleanup. I pulled in develop, and resolved a couple dozen conflicts. They were pretty easy to resolve, just taking the functional changes from this branch and integrating the enum changes from develop. All tests pass, so I'm going to push the branch back up here to get fresh CI results. I'm happy with this going in assuming CI is happy. If anyone wants anything else added here, speak up!

Myoldmopar · 2022-01-03T19:40:36Z

src/EnergyPlus/DaylightingManager.hh

@@ -177,9 +174,7 @@ namespace DaylightingManager {
        bool const Triangle,
        Real64 &TVISIntWin,     // Visible transmittance of int win at COSBIntWin for light from ext win
        Real64 &TVISIntWinDisk, // Visible transmittance of int win at COSBIntWin for sun
-        Optional_int_const MapNum = _,
-        //        Optional< Real64 > MapWindowSolidAngAtRefPt = _, //Inactive
-        Optional<Real64> MapWindowSolidAngAtRefPtWtd = _);


All these Optionals going away is a great move.

Myoldmopar · 2022-01-03T19:56:51Z

src/EnergyPlus/HeatBalanceSurfaceManager.cc

@@ -157,7 +155,6 @@ using namespace DataSurfaces;
 // Use statements for access to subroutines in other modules
 using namespace ScheduleManager;
 using namespace SolarShading;
-using namespace DaylightingManager;


Any using namespace going away makes me happy too. Even though this is in the cc file and not a header, I bet @lefticus would still agree.

Myoldmopar · 2022-01-03T19:57:13Z

src/EnergyPlus/HeatBalanceSurfaceManager.cc

@@ -651,25 +456,8 @@ void InitSurfaceHeatBalance(EnergyPlusData &state)
    if (state.dataHeatBalSurfMgr->InitSurfaceHeatBalancefirstTime) DisplayString(state, "Initializing Solar Heat Gains");

    InitSolarHeatGains(state);
-    if (state.dataEnvrn->SunIsUp && (state.dataEnvrn->BeamSolarRad + state.dataEnvrn->GndSolarRad + state.dataEnvrn->DifSolarRad > 0.0)) {


This is a really nice cleanup in the HBSM.

Myoldmopar · 2022-01-03T19:57:20Z

src/EnergyPlus/OutputReports.cc

-        // TODO MJW: Keep zone loop for now to maintain order
-        for (int zoneNum = 1; zoneNum <= state.dataGlobal->NumOfZones; ++zoneNum) {


Myoldmopar · 2022-01-04T14:43:30Z

CI looks similar to how it did before, builds and tests fine locally, checked the updated documentation and everything seems in order there. Merging this in, thanks @mjwitte!

Daylighting output revisions and other cleanup related to Enclosures vs Zones

mjwitte added 6 commits September 21, 2021 16:14

Daylighting output cleanup

5cd82b0

Daylighting output cleanup 2

7acf2fe

Merge remote-tracking branch 'remotes/origin/develop' into space-foll…

7570e15

…owup

Daylighting remove map point glare calculations - part 1

17f8f2d

Daylighting remove map point glare calculations - part 2

7c08a7a

Daylighting get rid of optional args

dc053cb

formatting

c3524ed

mjwitte changed the title ~~Daylighting output by enclosure and other daylighting cleanup~~ Daylighting output revisions and other cleanup Sep 27, 2021

mjwitte added 3 commits September 28, 2021 07:27

Daylighting remove map point glare calculations - part 3

8d327b4

Move daylighting code out of HeatBalanceSurfaceManager.cc

cbb2e2a

Daylighting fix warnings

fa4beb6

amirroth reviewed Sep 28, 2021

View reviewed changes

Daylighting avoid duplicate update of enclosure outputs

6561c46

mjwitte changed the title ~~Daylighting output revisions and other cleanup~~ Daylighting output revisions and other cleanup related to Spaces vs Zones Oct 14, 2021

mjwitte changed the title ~~Daylighting output revisions and other cleanup related to Spaces vs Zones~~ Daylighting output revisions and other cleanup related to Enclosures vs Zones Oct 14, 2021

mjwitte mentioned this pull request Oct 27, 2021

Miscellaneous Daylighting Code Refactoring #9152

Open

14 tasks

mjwitte added 7 commits November 4, 2021 12:33

Merge remote-tracking branch 'remotes/origin/develop' into space-foll…

4b3b5ce

…owup

Daylighting output cleanup - output rules

946c2a6

Daylighting output cleanup - more output rules

a5f7fb5

Merge remote-tracking branch 'remotes/origin/develop' into space-foll…

ee6fa3a

…owup

Add missing sky type label for Sky Daylight Factors report

5e3b065

Add eio daylighting outputs to Output Details doc and update dfs

ccec472

fomat

c2ac23a

mjwitte added 6 commits November 16, 2021 08:50

Add missing sky type label to unit test

eee9395

eio daylighting doc cleanup

94a4374

Merge remote-tracking branch 'remotes/origin/develop' into space-foll…

0a0bc59

…owup

Merge remote-tracking branch 'remotes/origin/develop' into space-foll…

cdc8414

…owup

move output eio changes to 22-1-0

be1fdeb

Illuminance map unit test

815fd4a

mjwitte marked this pull request as ready for review November 18, 2021 14:40

mjwitte commented Nov 18, 2021

View reviewed changes

mjwitte requested a review from Myoldmopar November 18, 2021 15:46

Merge remote-tracking branch 'remotes/origin/develop' into space-foll…

0f3ec48

…owup

Myoldmopar added 2 commits January 3, 2022 13:10

Merge develop; resolve conflicts

f543874

Clang format

7e91b39

Myoldmopar approved these changes Jan 3, 2022

View reviewed changes

Myoldmopar merged commit 36adab7 into develop Jan 4, 2022

Myoldmopar deleted the space-followup branch January 4, 2022 14:43

yujiex pushed a commit that referenced this pull request Jan 27, 2022

Merge pull request #9102 from NREL/space-followup

b4a8445

Daylighting output revisions and other cleanup related to Enclosures vs Zones

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Daylighting output revisions and other cleanup related to Enclosures vs Zones #9102

Daylighting output revisions and other cleanup related to Enclosures vs Zones #9102

mjwitte commented Sep 27, 2021 •

edited

Loading

amirroth Sep 28, 2021 •

edited

Loading

amirroth Sep 28, 2021

amirroth Sep 28, 2021

mjwitte left a comment

mjwitte Nov 18, 2021

mjwitte Nov 18, 2021

mjwitte Nov 18, 2021

mjwitte Nov 18, 2021

mjwitte Nov 18, 2021

mjwitte Nov 18, 2021

Myoldmopar Jan 3, 2022

mjwitte Nov 18, 2021

mjwitte Nov 18, 2021

mjwitte Nov 18, 2021

mjwitte Nov 18, 2021

nrel-bot-3 commented Dec 28, 2021

Myoldmopar commented Jan 3, 2022

Myoldmopar Jan 3, 2022

Myoldmopar Jan 3, 2022

Myoldmopar Jan 3, 2022

Myoldmopar Jan 3, 2022

Myoldmopar commented Jan 4, 2022

		print(state.files.eio, Format_700);
		for (int zoneNum = 1; zoneNum <= state.dataGlobal->NumOfZones; ++zoneNum) {

		// TODO MJW: remove all of the glare calcs for map points
		// but these are arguments to some of the functions that are shared with regular reference points, so initalize here.

		// TODO MJW: Keep zone loop for now to maintain order
		for (int zoneNum = 1; zoneNum <= state.dataGlobal->NumOfZones; ++zoneNum) {

		DXFDaylightingReferencePoints(state, dxffile, false);
		DXFDaylightingReferencePoints(state, dxffile);

Daylighting output revisions and other cleanup related to Enclosures vs Zones #9102

Daylighting output revisions and other cleanup related to Enclosures vs Zones #9102

Conversation

mjwitte commented Sep 27, 2021 • edited Loading

Pull request overview

Diffs

ToDo List

Pull Request Author

Reviewer

amirroth Sep 28, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mjwitte left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nrel-bot-3 commented Dec 28, 2021

Myoldmopar commented Jan 3, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Myoldmopar commented Jan 4, 2022

mjwitte commented Sep 27, 2021 •

edited

Loading

amirroth Sep 28, 2021 •

edited

Loading