Propagate Plant Location Shortcuts (phase 3) by amirroth · Pull Request #11454 · NatLabRockies/EnergyPlus

amirroth · 2026-03-09T16:43:59Z

Propagates the PlantLocation shortcut idiom introduced earlier to (most of) the rest of the code.

amirroth

Simple walk-through, not much to see here.

amirroth · 2026-03-09T16:44:26Z

src/EnergyPlus/Plant/EquipAndOperations.cc

                            foundLoc.loopSideNum = DataPlant::LoopSideLocation::Demand;
                            foundLoc.branchNum = BranchNum;
                            foundLoc.compNum = CompNum;
+                            foundLoc.loop = &state.dataPlnt->PlantLoop(foundLoc.loopNum);


Set shortcuts.

amirroth · 2026-03-09T16:45:20Z

src/EnergyPlus/Plant/EquipAndOperations.cc

-                        .Branch(this->DedicatedHR_CoolingPLHP.loadSidePlantLoc.branchNum)
-                        .Comp(this->DedicatedHR_CoolingPLHP.loadSidePlantLoc.compNum)
-                        .CurOpSchemeType = this->Type;
+                    this->DedicatedHR_CoolingPLHP.loadSidePlantLoc.comp->OpScheme.allocate(1);


Use shortcuts. Using shortcuts to locate components saves a lot of code. And a little bit of time.

amirroth · 2026-03-09T16:46:11Z

src/EnergyPlus/Plant/EquipAndOperations.cc

        Real64 const CpCW =
-            state.dataPlnt->PlantLoop(this->DedicatedHR_HeatingPLHP.sourceSidePlantLoc.loopNum)
-                .glycol->getSpecificHeat(state, state.dataLoopNodes->Node(inletChWReturnNodeNum).Temp, "EvaluateChillerHeaterChangeoverOpScheme");
+            this->DedicatedHR_HeatingPLHP.sourceSidePlantLoc.loop->


This is the most common usage of shortcuts.

amirroth · 2026-03-09T16:46:53Z

src/EnergyPlus/Plant/LoopSide.cc

            for (int CompCounter = StartingComponent; CompCounter <= EndingComponent; ++CompCounter) {
                PlantLocation this_plantLoc = {this->plantLoc.loopNum, this->plantLoc.loopSideNum, BranchCounter, CompCounter};
-
+                this_plantLoc.loop = &state.dataPlnt->PlantLoop(this_plantLoc.loopNum);


Set shortcuts here.

amirroth · 2026-03-09T16:54:27Z

src/EnergyPlus/PlantCondLoopOperation.cc

                    int EquipBranchNum = this_op_scheme.EquipList(ListNum).Comp(CompIndex).BranchNumPtr;
                    int EquipCompNum = this_op_scheme.EquipList(ListNum).Comp(CompIndex).CompNumPtr;
-                    loop_side.Branch(EquipBranchNum).Comp(EquipCompNum).MyLoad = 0.0;
+                    plantLoc.side->Branch(EquipBranchNum).Comp(EquipCompNum).MyLoad = 0.0;


Don't need special shortcuts anymore. They're already all in plantLoc.

rraustad · 2026-03-09T20:44:49Z

src/EnergyPlus/PCMThermalStorage.cc

            useOutlet.Temp = useOutletTemp;
        } else if (mPlantReq > 0.0) {
-            plantOutlet.Temp = std::min(plantOutletTemp, state.dataPlnt->PlantLoop[this->sourcePlantLoc.loopNum].MaxTemp);
+          plantOutlet.Temp = std::min(plantOutletTemp, state.dataPlnt->PlantLoop[this->sourcePlantLoc.loopNum].MaxTemp); // Why is this in brackets?


This does look like a bug.

I'll change this to parentheses.

rraustad · 2026-03-09T20:48:25Z

src/EnergyPlus/PlantCondLoopOperation.cc

    Real64 HighestRange;

-    // Object Data
+    // Object Data≈ç


Interesting character.

rraustad · 2026-03-09T21:07:00Z

src/EnergyPlus/SetPointManager.cc

-
    for (int i = 1; i <= this->numTowers; i++) {
-        auto &towerComp = towerLoopSide.Branch(this->towerPlocs(i).branchNum).Comp(this->towerPlocs(i).compNum);
+      auto &towerComp = towerPlocs(1).side->Branch(this->towerPlocs(i).branchNum).Comp(this->towerPlocs(i).compNum);


towerPlocs(1) -> towerPlocs(i) ?

Either one, they are all on the same loop/side.

amirroth

Not much to see here.

mitchute

LGTM

mitchute · 2026-03-14T02:23:07Z

src/EnergyPlus/Plant/LoopSide.cc

                case DataPlant::OpScheme::FreeRejection: //~ other control types
                    EncounteredNonLBObjDuringPass2 = true;
-                    goto components2_end;       // don't do anymore components on this branch
+                    goto components2_end;       // don't do anymore components on this branch // This is not good


I suppose we should start excising the remaining 123 uses of goto 🙃

mitchute · 2026-03-14T02:23:44Z

src/EnergyPlus/Plant/EquipAndOperations.cc

+        this->DedicatedHR_CoolingPLHP.loadSidePlantLoc.comp->Available = false;
+        this->DedicatedHR_CoolingPLHP.loadSidePlantLoc.comp->ON = false;
+        this->DedicatedHR_CoolingPLHP.sourceSidePlantLoc.comp->Available = false;
+        this->DedicatedHR_CoolingPLHP.sourceSidePlantLoc.comp->ON = false;
+
+        this->DedicatedHR_HeatingPLHP.loadSidePlantLoc.comp->Available = false;
+        this->DedicatedHR_HeatingPLHP.loadSidePlantLoc.comp->ON = false;
+        this->DedicatedHR_HeatingPLHP.sourceSidePlantLoc.comp->Available = false;
+        this->DedicatedHR_HeatingPLHP.sourceSidePlantLoc.comp->ON = false;


Amir Roth added 2 commits March 8, 2026 15:05

Initial commit

9872984

second commit

817c297

amirroth commented Mar 9, 2026

View reviewed changes

amirroth added Refactoring Includes code changes that don't change the functionality of the program, just perform refactoring NotIDDChange Code does not impact IDD (can be merged after IO freeze) labels Mar 9, 2026

amirroth added this to the EnergyPlus 26.1 milestone Mar 9, 2026

rraustad reviewed Mar 9, 2026

View reviewed changes

mitchute modified the milestones: EnergyPlus 26.1, EnergyPlus 26.1 Bug Fix Freeze Mar 10, 2026

Amir Roth added 4 commits March 11, 2026 08:19

SetPlantLocationLinks

560cdd1

Fix issue

bbf0b96

Merge remote-tracking branch 'origin/develop' into PlantShortcut3

99826df

Fixed some possible issues

547d220

amirroth commented Mar 13, 2026

View reviewed changes

mitchute added 2 commits March 13, 2026 20:03

Merge branch 'develop' into PlantShortcut3

9dd2fbb

format

a130050

mitchute approved these changes Mar 14, 2026

View reviewed changes

Conversation

amirroth commented Mar 9, 2026

Uh oh!

amirroth left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

amirroth Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rraustad Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

amirroth left a comment

Choose a reason for hiding this comment

Uh oh!

mitchute left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

amirroth Mar 9, 2026 •

edited

Loading

rraustad Mar 9, 2026 •

edited

Loading