-
Notifications
You must be signed in to change notification settings - Fork 396
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
Steam features part 1 (#9260) follow-up #10222
Conversation
…amPart1Followup
…ct cooling, district heating water and steam
…amPart1Followup
…amPart1Followup
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.
OK, this is fine, lots of good documentation. I don't have time to scrutinize every line of it, but it's certainly good to have it in place for this release. There are a couple TeX warnings that need to be cleaned up, luckily it's a 1 minute fix. I'm marking it request changes, but if you need me to fix those labels, just let me know and I can do it.
@@ -568,83 +564,6 @@ namespace ExteriorEnergyUse { | |||
} | |||
} | |||
|
|||
void ValidateFuelType(EnergyPlusData &state, |
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.
A function removed. Nice.
@@ -325,21 +325,19 @@ void OutsideEnergySourceSpecs::initialize(EnergyPlusData &state, Real64 MyLoad) | |||
// The mass flow rate could be an inter-connected-loop side trigger. This is not really the type of | |||
// interconnect that that routine was written for, but it is the clearest example of using it. | |||
|
|||
auto &loop = state.dataPlnt->PlantLoop(this->plantLoc.loopNum); |
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.
Good reference here, helps readability for sure.
@@ -560,7 +553,7 @@ void OutsideEnergySourceSpecs::oneTimeInit_new(EnergyPlusData &state) | |||
meterTypeKey = "DistrictHeatingSteam"; | |||
} | |||
SetupOutputVariable(state, | |||
reportVarPrefix + "Energy", | |||
format("{}Energy", reportVarPrefix), |
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.
Although format might not be saving a lot here since it was just one concatenation, it's still a good move.
} else if (resourceType == "ELECTRICITYPRODUCEDONSITE") { | ||
sResourceType = "ElectricityProduced"; | ||
} else if (resourceType == "SOLARWATERHEATING") { | ||
sResourceType = "SolarWater"; | ||
} else if (resourceType == "SOLARAIRHEATING") { | ||
sResourceType = "SolarAir"; | ||
} else { | ||
ShowSevereError(state, format("Invalid input for PythonPlugin:OutputVariable, unexpected Resource Type = {}", resourceType)); | ||
ShowFatalError(state, "Python plugin output variable input problem causes program termination"); | ||
if (static_cast<Constant::eResource>(getEnumValue(Constant::eResourceNamesUC, resourceType)) != Constant::eResource::Invalid) { |
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.
Nice.
\subsubsection{Inputs}\label{inputs-17-006} | ||
|
||
\paragraph{Field: Name}\label{field-name-16-006} | ||
|
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.
There are a couple TeX labels which are repeated, throwing warnings. These need to be tidied up before merge. It looks like if you just modify these two labels it will be fixed. You can also just remove the label
command entirely if these aren't being referenced anywhere.
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.
👍
\subsubsection{Inputs}\label{inputs-17-006} | ||
|
||
\paragraph{Field: Name}\label{field-name-16-006} | ||
|
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.
👍
Thanks for the doc fix @dareumnam, I'll do a quick build with develop since I just merged a different PR. |
…amPart1Followup
I noticed a failing unit test locally and confirmed Decent is also showing it, so I'll hold here. I think it's a unit test that @jmarrec just added, so let me know if we need to coordinate to discuss the needed change to the code or the test. Thanks! |
Thanks for fixing that @dareumnam, Windows is now all happy, and I'm going to merge this in. The Linux debug builds will "fail" but I don't want to waste their time repeating tests. Thanks! |
Pull request overview
ExteriorEnergyUse::ExteriorFuelUsage
and replace it withConstant::eFuel
(the combined fuel type enum)OutsideEnergySources.unit.cc
andPlantLoadProfile.unit.cc
and unit testsNOTE: ENHANCEMENTS MUST FOLLOW A SUBMISSION PROCESS INCLUDING A FEATURE PROPOSAL AND DESIGN DOCUMENT PRIOR TO SUBMITTING CODE
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.