Fix #7225 - Add Year field in SQL for DaylightMapHourlyReports by jmarrec · Pull Request #7235 · NatLabRockies/EnergyPlus

jmarrec · 2019-03-20T12:01:07Z

Pull request overview

Fix #7225 - Add Year field in SQL for DaylightMapHourlyReports

I also have uploaded a supporting file to EnergyPlusDevSupport/DefectFiles/7000s/7225 if you want to look at a multiyear sql output.

Work Checklist

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

Title of PR should be user-synopsis style (clearly understandable in a standalone changelog context)
At least one of the following appropriate labels must be added to this PR to be consumed into the changelog:
- Defect: This pull request repairs a github defect issue. The github issue should be referenced in the PR description
- Refactoring: This pull request includes code changes that don't change the functionality of the program, just perform refactoring
- NewFeature: This pull request includes code to add a new feature to EnergyPlus
- Performance: This pull request includes code changes that are directed at improving the runtime performance of EnergyPlus
- DoNoPublish: This pull request includes changes that shouldn't be included in the changelog

Review Checklist

This will not be exhaustively relevant to every PR.

…25_SQLDaylightingYearField

nrel-bot · 2019-04-11T01:32:51Z

@jmarrec it has been 20 days since this pull request was last updated.

nrel-bot · 2019-04-18T00:24:50Z

@jmarrec it has been 7 days since this pull request was last updated.

nrel-bot · 2019-04-25T00:39:31Z

@jmarrec it has been 7 days since this pull request was last updated.

nrel-bot · 2019-05-03T00:38:26Z

@jmarrec it has been 8 days since this pull request was last updated.

nrel-bot-2 · 2019-05-16T00:46:53Z

@jmarrec it has been 13 days since this pull request was last updated.

nrel-bot-2c · 2019-05-23T00:59:56Z

@jmarrec it has been 7 days since this pull request was last updated.

nrel-bot-2c · 2019-05-31T00:58:23Z

@jmarrec it has been 8 days since this pull request was last updated.

jmarrec · 2019-06-05T07:58:28Z

@Myoldmopar could you suggest a reviewer please?

…25_SQLDaylightingYearField

Myoldmopar · 2019-07-17T03:09:18Z

@macumber do you envision this causing any issues on OS side?

macumber · 2019-07-17T04:13:19Z

Don't think so, @jmarrec could check if there is :-)

jmarrec · 2019-07-17T05:14:19Z

@Myoldmopar This actually coming from OpenStudio's side, I noticed this daylightmap table was missing the year field while adding the year field to other tables now that it was available, cf NatLabRockies/OpenStudio#3453

More specifically, I should mostly have to revert that commit to get OS to make use of this PR: NatLabRockies/OpenStudio@79ecaa3

Myoldmopar · 2019-07-17T13:57:30Z


+                    // We need DataGlobals::CalendarYear, and not DataEnvironment::Year because
+                    // otherwise if you run a TMY file, you'll get for eg 1977, 1981, etc
+                    SQYear = DataGlobals::CalendarYear;


Myoldmopar · 2019-07-17T13:57:41Z


                    sqlite->createSQLiteDaylightMap(
-                        MapNum, SQMonth, SQDayOfMonth, HourOfDay, IllumMap(MapNum).Xnum, XValue, IllumMap(MapNum).Ynum, YValue, IllumValue);
+                        MapNum, SQYear, SQMonth, SQDayOfMonth, HourOfDay, IllumMap(MapNum).Xnum, XValue, IllumMap(MapNum).Ynum, YValue, IllumValue);


Makes sense, adding a year so it can report.

Myoldmopar · 2019-07-17T13:57:58Z

    const std::string daylightMapHourlyReportsTableSQL = "CREATE TABLE DaylightMapHourlyReports ( "
                                                         "HourlyReportIndex INTEGER PRIMARY KEY, "
-                                                         "MapNumber INTEGER, Month INTEGER, DayOfMonth INTEGER, Hour INTEGER, "
+                                                         "MapNumber INTEGER, Year INTEGER, Month INTEGER, DayOfMonth INTEGER, Hour INTEGER, "


Of course the SQL will need a new argument

Myoldmopar · 2019-07-17T13:58:51Z

    sqliteExecuteCommand(daylightMapHourlyReportsTableSQL);

-    const std::string daylightMapHourlyTitleInsertSQL = "INSERT INTO DaylightMapHourlyReports VALUES(?,?,?,?,?);";
+    const std::string daylightMapHourlyTitleInsertSQL = "INSERT INTO DaylightMapHourlyReports VALUES(?,?,?,?,?,?);";


And a placeholder

Myoldmopar · 2019-07-17T13:59:33Z

-        sqliteBindInteger(m_daylightMapHourlyTitleInsertStmt, 3, month);
-        sqliteBindInteger(m_daylightMapHourlyTitleInsertStmt, 4, dayOfMonth);
-        sqliteBindInteger(m_daylightMapHourlyTitleInsertStmt, 5, hourOfDay);
+        int b = 0;


Sure, it's reasonable to use a counter here instead of manually persisting the order.

Myoldmopar · 2019-07-17T13:59:58Z


    ASSERT_EQ(1ul, daylightMapHourlyReports.size());
-    std::vector<std::string> daylightMapHourlyReport0{"1", "1", "7", "21", "5"};
+    std::vector<std::string> daylightMapHourlyReport0{"1", "1", "2005", "7", "21", "5"};


Works for me.

jmarrec added 4 commits March 19, 2019 14:34

Add Year Field to unit test for DaylightMapHourlyReports

f3fa117

Add year to createSQLiteDaylightMap

6dec23f

Update point of call to createSQLiteDaylightMap

2a97891

Merge remote-tracking branch 'upstream/develop' into PR_opened/Fix_72…

d61c362

…25_SQLDaylightingYearField

jmarrec mentioned this pull request Mar 21, 2019

Fix #745 - Use the 'Year' field from Sql file NatLabRockies/OpenStudio#3453

Merged

mjwitte added this to the EnergyPlus 9.1.0 milestone Mar 21, 2019

Myoldmopar modified the milestones: EnergyPlus 9.1.0, EnergyPlus Future Mar 21, 2019

mjwitte added the Defect Includes code to repair a defect in EnergyPlus label Jun 3, 2019

jmarrec and others added 2 commits June 5, 2019 09:59

Merge branch 'develop' into PR_opened/Fix_7225_SQLDaylightingYearField

b4ac092

Merge remote-tracking branch 'upstream/develop' into PR_opened/Fix_72…

c152101

…25_SQLDaylightingYearField

Myoldmopar approved these changes Jul 17, 2019

View reviewed changes

Myoldmopar merged commit 49bedc3 into NatLabRockies:develop Jul 17, 2019

jmarrec deleted the PR_opened/Fix_7225_SQLDaylightingYearField branch July 17, 2019 14:15

jmarrec mentioned this pull request Feb 28, 2020

SqlFile need to support the "Year" field for IlluminanceMaps NatLabRockies/OpenStudio#3894

Closed

Conversation

jmarrec commented Mar 20, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull request overview

Work Checklist

Review Checklist

Uh oh!

nrel-bot commented Apr 11, 2019

Uh oh!

nrel-bot commented Apr 18, 2019

Uh oh!

nrel-bot commented Apr 25, 2019

Uh oh!

nrel-bot commented May 3, 2019

Uh oh!

nrel-bot-2 commented May 16, 2019

Uh oh!

nrel-bot-2c commented May 23, 2019

Uh oh!

nrel-bot-2c commented May 31, 2019

Uh oh!

jmarrec commented Jun 5, 2019

Uh oh!

Myoldmopar commented Jul 17, 2019

Uh oh!

macumber commented Jul 17, 2019

Uh oh!

jmarrec commented Jul 17, 2019

Uh oh!

Myoldmopar Jul 17, 2019

Choose a reason for hiding this comment

Uh oh!

Myoldmopar Jul 17, 2019

Choose a reason for hiding this comment

Uh oh!

Myoldmopar Jul 17, 2019

Choose a reason for hiding this comment

Uh oh!

Myoldmopar Jul 17, 2019

Choose a reason for hiding this comment

Uh oh!

Myoldmopar Jul 17, 2019

Choose a reason for hiding this comment

Uh oh!

Myoldmopar Jul 17, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

jmarrec commented Mar 20, 2019 •

edited

Loading