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 placing all solar thermal collectors on a PlantEquipmentList #3762

Merged
merged 2 commits into from
Nov 14, 2019
Merged

Allow placing all solar thermal collectors on a PlantEquipmentList #3762

merged 2 commits into from
Nov 14, 2019

Conversation

jmarrec
Copy link
Collaborator

@jmarrec jmarrec commented Nov 14, 2019 •
edited
Loading

Pull request overview

Pull Request Author

  • Model API Changes / Additions: N/A
  • Any new or modified fields have been implemented in the EnergyPlus ForwardTranslator (and ReverseTranslator as appropriate): N/A
  • Model API methods are tested (in src/model/test): N/A
  • EnergyPlus ForwardTranslator Tests (in src/energyplus/Test): Yes, added some
  • If a new object or method, added a test in NREL/OpenStudio-resources: Add missing tests for flat plate PVT and IntegralCollector OpenStudio-resources#85
  • If needed, added VersionTranslation rules for the objects (src/osversion/VersionTranslator.cpp): N/A (no model API changes)
  • Checked behavior in OpenStudioApplication, adjusted policies as needed (src/openstudio_lib/library/OpenStudioPolicy.xml): N/A
  • Verified that C# bindings built fine on Windows, partial classes used as needed, etc.: N/A
  • All new and existing tests passes: Yes
  • If methods have been deprecated, update rest of code to use the new methods: N/A

Labels:

  • If change to an IDD file, add the label IDDChange
  • If breaking existing API, add the label APIChange
  • If deemed ready, add label Pull Request - Ready for CI so that CI builds your PR

Review Checklist

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • Code Style, strip trailing whitespace, etc.
  • All related changes have been implemented: model changes, model tests, FT changes, FT tests, VersionTranslation, OS App
  • Labeling is ok
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified

@jmarrec jmarrec changed the title Allow placing all solar collectors on a PlantEquipmentList (SolarCollectorFlatPlatePhotovoltaicThermal and SolarCollectorntegralCollectorStorage) Allow placing all solar thermal collectors on a PlantEquipmentList Nov 14, 2019
@jmarrec jmarrec added IDDChange Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. labels Nov 14, 2019
jmarrec
jmarrec commented Nov 14, 2019
View reviewed changes
openstudiocore/resources/energyplus/ProposedEnergy+.idd
\reference-class-name validBranchEquipmentTypes
\reference validBranchEquipmentNames
\reference-class-name validPlantEquipmentTypes ! Need to be able to place it on PlantEquipmentList
\reference validPlantEquipmentNames ! Need to be able to place it on PlantEquipmentList
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No change really here, they were already there, just trying to be consistent

openstudiocore/resources/energyplus/ProposedEnergy+.idd
@@ -40284,6 +40284,8 @@ SolarCollector:FlatPlate:PhotovoltaicThermal,
\reference validOASysEquipmentNames
\reference-class-name validBranchEquipmentTypes
\reference validBranchEquipmentNames
\reference-class-name validPlantEquipmentTypes ! Need to be able to place it on PlantEquipmentList
\reference validPlantEquipmentNames ! Need to be able to place it on PlantEquipmentList
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fix 1/2

openstudiocore/resources/energyplus/ProposedEnergy+.idd
@@ -40351,6 +40353,8 @@ SolarCollector:IntegralCollectorStorage,
\type alpha
\reference-class-name validBranchEquipmentTypes
\reference validBranchEquipmentNames
\reference-class-name validPlantEquipmentTypes ! Need to be able to place it on PlantEquipmentList
\reference validPlantEquipmentNames ! Need to be able to place it on PlantEquipmentList
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fix 2/2

openstudiocore/src/energyplus/Test/PlantEquipmentOperationSchemes_GTest.cpp

idf_eg = idf_peq_list.extensibleGroups()[2];
EXPECT_EQ("SolarCollector:IntegralCollectorStorage", idf_eg.getString(PlantEquipmentListExtensibleFields::EquipmentObjectType).get());
EXPECT_EQ(collector_integralcollectorstorage.name().get(), idf_eg.getString(PlantEquipmentListExtensibleFields::EquipmentName).get());
Copy link
Collaborator Author

@jmarrec jmarrec Nov 14, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Before fix:

PlantEquipmentList,
  Plant Loop 1 Heating Equipment List,    !- Name
  SolarCollector:FlatPlate:Water,         !- Equipment Object Type 1
  Solar Collector Flat Plate Water 1,     !- Equipment Name 1
  SolarCollector:FlatPlate:PhotovoltaicThermal, !- Equipment Object Type 2
  ,                                       !- Equipment Name 2
  SolarCollector:IntegralCollectorStorage, !- Equipment Object Type 3
  ;                                       !- Equipment Name 3

After fix :

PlantEquipmentList,
  Plant Loop 1 Heating Equipment List,    !- Name
  SolarCollector:FlatPlate:Water,         !- Equipment Object Type 1
  Solar Collector Flat Plate Water 1,     !- Equipment Name 1
  SolarCollector:FlatPlate:PhotovoltaicThermal, !- Equipment Object Type 2
  Solar Collector Flat Plate Photovoltaic Thermal 1, !- Equipment Name 2
  SolarCollector:IntegralCollectorStorage, !- Equipment Object Type 3
  Solar Collector Integral Collector Storage 1; !- Equipment Name 3

@jmarrec jmarrec requested a review from kbenne November 14, 2019 12:32
@jmarrec jmarrec mentioned this pull request Nov 14, 2019
Merged
17 tasks
@tijcolem tijcolem added this to the OpenStudio 2.9.1 milestone Nov 14, 2019
@tijcolem tijcolem merged commit 52c211f into NREL:develop Nov 14, 2019
@shorowit
Copy link
Contributor

Thanks!

@jmarrec jmarrec deleted the PR_opened/3761_SolarCollectorFix branch November 14, 2019 21:25
jmarrec added a commit to NREL/EnergyPlus that referenced this pull request Jan 24, 2020
@jmarrec
Propagate Changes we had to do in OpenStudio (as of 2.9.1) to make th…
f714cee 
…ings work: missing plant equipment references etc

Note that for solar collectors, technically E+ does say it expects them on the demand side, but it works on the supply...

NREL/OpenStudio#3762
NREL/OpenStudio#3761 (comment)
NREL/OpenStudio#2880
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kbenne kbenne Awaiting requested review from kbenne

Assignees
No one assigned
Labels
IDDChange Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge.
Projects
None yet
Milestone
OpenStudio 2.9.1
Development

Successfully merging this pull request may close these issues.

IntegratedCollectorStorage object being incorrectly added to the PlantEquipmentList
3 participants
@jmarrec @shorowit @tijcolem