-
Notifications
You must be signed in to change notification settings - Fork 389
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.
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
Correct and update all emissions meter source names from 'Electric' to 'Electricity' for consistency. #9101
Conversation
…Electricity for consistency.
@matthew-larson @lgentile it has been 28 days since this pull request was last updated. |
@mjwitte, could you comment on this if you have a chance? I can do the full review, but I would love your input. |
@Myoldmopar The changes look reasonable. Surprised (not!) that this slipped through during the great meter renaming of 1872 (seems that long ago). This will need a |
@matthew-larson @lgentile it has been 28 days since this pull request was last updated. |
So I pulled this branch, merged in latest develop, then went to the Report Variables file to add all the entries and get it transitioning properly. I tested out the transition utility on the _SmallOfficeDulles file, and it wasn't converting the output variable names. This seemed strange, so I debugged into the program, and it does find the Report Variables file, but it was showing zero report variable changes found in that file...which I had modified. I checked, and the Report Variables file inside the Products directory was blank...because CMake had not reconfigured. The CMake system appears to not respond to a change in that file and understand that it needs to re-copy it in. Rerunning CMake and executing the transition binary, and it started working....mostly. I am getting a bunch of pre-processor warnings coming out in the transitioned IDF. @mjwitte perhaps you could shed some light on this? If not I'll dig in a bit more: Old:
New:
It is converting the output variable properly, I just don't know what it is complaining about. I'll push my branch here if I can, and if you happen to notice anything @mjwitte or anyone else, that would be great, but if not I'll figure it out. |
Nevermind, I don't seem to have the credentials to push to this branch. I guess I can send a patch via email like the good old days. |
I thought you still had an instance of StarTeam running in the background for times like this 😃 |
@mjwitte and I secretly still do all our testing on a Fortran build stored in a StarTeam instance with ms word docs. |
Ahhhh, the good old days. Nostalgia is nice during the holiday season. |
The
Examples from prior versions:
Report Variables 7-0-0-036 to 7-1-0.csv
So, it sounds like column C is not empty? |
Thanks @mjwitte, that's super helpful. @matthew-larson are you able to flip the switch so I can push my changes to this branch? Otherwise I'll have to push the branch to our own repo, and open a new PR, which is fine, but hopefully unnecessary. |
@Myoldmopar I can give you write permissions. Stand by... |
Alright, so the problem was that the third column "didn't exist." There was no trailing comma after the new report variable name, which is apparently problematic. So anyway, it's all set now and runs without adding preprocessor warnings. I would love someone to comment on the list of fields I added to make sure it is exhaustive, and otherwise if this is clean it can probably go right in. Thanks! |
Zone,Meter,ElectricEmissions:Nuclear High {[}kg{]} | ||
Zone,Meter,ElectricityEmissions:Nuclear High {[}kg{]} | ||
\item | ||
Zone,Meter,ElectricEmissions:Nuclear Low {[}m3{]} | ||
Zone,Meter,ElectricityEmissions:Nuclear Low {[}m3{]} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, do we really want a resource type with a space in it? "Nuclear High" and "Nuclear Low" have been there a long time. so I guess it works, but those may be the only meter name components with a space in them. I realize if we change that here, then it crosses into all of the end-use types for these two resources. There's also "Carbon Equivalent". If there's agreement to change these, it could be done as a separate issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree this looked weird, but I wasn't going to make that kind of change here. Feel free to open up discussion on a separate issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See #9207.
Zone,Meter,PurchasedElectricEmissions:Source {[}J{]} | ||
Zone,Meter,PurchasedElectricityEmissions:Source {[}J{]} | ||
\item | ||
Zone,Meter,SoldElectricEmissions:Source {[}J{]} | ||
Zone,Meter,SoldElectricityEmissions:Source {[}J{]} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The report variables transition file needs these two meters as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it, thanks for spotting these!
Windows CI tumbled there, but it was unrelated. The rest of the CI results look good, just MDD and MTD style diffs. I'll add those meters that @mjwitte pointed out, and if there's nothing else then I think this can merge in. |
@Myoldmopar This should probably get an entry in the output changes doc. |
Got the two meters added, and added an entry to the output changes doc. Should be good to go. |
OK, merging this in. If there is anything else, it can be added to the new #9207 issue. Thanks all. |
Correct and update all emissions meter source names from 'Electric' to 'Electricity' for consistency.
Pull request overview
ort->sourceTypeNames(iResource) + "Emissions:Source"
was being called in theGetInputOutputTableSummaryReports
function, wheresourceTypeNames(1)
is "Electricity". So it was looking for meter "ElectricityEmissions:Source", but the meter being created was actually called "ElectricEmissions:Source", so it wasn't being found for the reports. Changing this meter and other related meters to use "Electricity" instead of "Electric" as it's prefix removes this discrepancy.The below results are from the 'AirEconomizerFaults_RefBldgLargeOfficeNew2004_Chicago.idf' example file, which utilizes FuelFactors objects for the Source Energy calculations.
Develop
PR
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.