Fix a few issues

NREL · Jan 7, 2025 · 6eba628 · 6eba628 · nrel-bot-2 · Jan 7, 2025
1 parent a812f38
commit 6eba628
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/EnergyPlus/FluidProperties.cc b/src/EnergyPlus/FluidProperties.cc
@@ -4002,6 +4002,7 @@ namespace FluidProperties {
             cTsh.sh = this->getSpecificHeat_raw(state, Temperature, CalledFrom);
         }
 
+        // print(state.files.eio, "SH,{},{},{}\n", this->Num, CalledFrom, cTsh.sh);
         return cTsh.sh; // saturation pressure {Pascals}
     }
 
@@ -4235,6 +4236,7 @@ namespace FluidProperties {
             }
         }
 
+        // print(state.files.eio, "D,{},{},{}\n", this->Num, CalledFrom, Rho);
         return Rho;
     }
 

diff --git a/src/EnergyPlus/IceThermalStorage.cc b/src/EnergyPlus/IceThermalStorage.cc
@@ -1680,9 +1680,10 @@ namespace IceThermalStorage {
         //----------------------------
         int loopNum = this->plantLoc.loopNum;
 
-        Real64 CpFluid = state.dataPlnt->PlantLoop(loopNum).glycol->getSpecificHeat(state, 
-                                                                                    state.dataLoopNodes->Node(this->PltInletNodeNum).Temp,
-                                                                                    RoutineName);
+        // BUG? I think this is supposed to be getSpecificHeat, not getDensity
+        Real64 CpFluid = state.dataPlnt->PlantLoop(loopNum).glycol->getDensity(state, 
+                                                                               state.dataLoopNodes->Node(this->PltInletNodeNum).Temp,
+                                                                               RoutineName);
 
         // Calculate Umyload based on MyLoad from E+
         Real64 Umyload = -myLoad * TimeInterval / this->ITSNomCap;

diff --git a/src/EnergyPlus/Plant/PlantManager.cc b/src/EnergyPlus/Plant/PlantManager.cc
@@ -408,12 +408,13 @@ void GetPlantLoopData(EnergyPlusData &state)
         } else if (Util::SameString(Alpha(2), "USERDEFINEDFLUIDTYPE")) {
             this_loop.FluidType = DataLoopNode::NodeFluidType::Water;
             this_loop.FluidName = Alpha(3);
-            this_loop.FluidIndex = 0;
             // check for valid fluid name
             this_loop.glycol = FluidProperties::GetGlycol(state, Alpha(3));
             if (this_loop.glycol == nullptr) {
                 ShowSevereItemNotFound(state, eoh, state.dataIPShortCut->cAlphaFieldNames(3), Alpha(3));
                 ErrorsFound = true;
+            } else {
+              this_loop.FluidIndex = this_loop.glycol->Num;
             }
 
         } else {