Merge pull request #7717 from NREL/7711_WaterThermalTanks_Crash

#7711 - Fix crash when using both WaterHeat:HeatPump:PumpedCondenser and WaterHeater:HeatPump:WrappedCondenser

src/EnergyPlus/WaterThermalTanks.cc

@@ -1035,6 +1035,9 @@ namespace WaterThermalTanks {
         int nNumPossibleNumericArgs; // the number of possible numeric arguments in the idd
         int nNumPossibleAlphaArgs;   // the number of possible numeric arguments in the idd
 
+        // For looking up in IDF/epJSON, you need the index that corresponds to the actual object type (Pumped or Wrapped)
+        int HPWaterHeaterNumOfSpecificType;
+
         for (int HPWaterHeaterNum = 1; HPWaterHeaterNum <= numHeatPumpWaterHeater; ++HPWaterHeaterNum) {
 
             // Create reference to current HPWH object in array.
@@ -1043,25 +1046,30 @@ namespace WaterThermalTanks {
             // Initialize the offsets to zero
             nAlphaOffset = 0;
             nNumericOffset = 0;
+
             if (HPWaterHeaterNum <= NumPumpedCondenser) {
                 // Pumped Condenser
                 DataIPShortCuts::cCurrentModuleObject = cHPWHPumpedCondenser;
                 HPWH.TypeNum = DataPlant::TypeOf_HeatPumpWtrHeaterPumped;
                 nNumPossibleAlphaArgs = 29;
                 nNumPossibleNumericArgs = 9;
+                // Actual index of Pumped type
+                HPWaterHeaterNumOfSpecificType = HPWaterHeaterNum;
             } else {
                 // Wrapped Condenser
                 DataIPShortCuts::cCurrentModuleObject = cHPWHWrappedCondenser;
                 HPWH.TypeNum = DataPlant::TypeOf_HeatPumpWtrHeaterWrapped;
                 nNumPossibleAlphaArgs = 27;
                 nNumPossibleNumericArgs = 10;
+                // Actual index of Wrapped type
+                HPWaterHeaterNumOfSpecificType = HPWaterHeaterNum - NumPumpedCondenser;
             }
 
             int NumAlphas;
             int NumNums;
             int IOStat;
             inputProcessor->getObjectItem(DataIPShortCuts::cCurrentModuleObject,
-                                          HPWaterHeaterNum,
+                                          HPWaterHeaterNumOfSpecificType,
                                           DataIPShortCuts::cAlphaArgs,
                                           NumAlphas,
                                           DataIPShortCuts::rNumericArgs,
@@ -11337,7 +11345,7 @@ namespace WaterThermalTanks {
 
         // PURPOSE OF THIS SUBROUTINE:
         // Calculates the water heater standard ratings, such as Energy Factor and Recovery Efficiency.  Results are written
-        // to the EIO file.  Standard ratings are not calculated for storage-only tanks, i.e., MaxCapacity = 0.
+        // to the EIO file.  Standard ratings are not calculated for storage-only tanks, i.e., MaxCapacity = 0, nor for Integrated Heat Pumps
 
         // METHODOLOGY EMPLOYED:
         // Water heater inputs are set to the specified test conditions. For HPWHs, the heating capacity and COP are assumed
@@ -11378,7 +11386,6 @@ namespace WaterThermalTanks {
             FirstTimeFlag = true;
 
             int TimeStepPerHour = int(1.0 / DataHVACGlobals::TimeStepSys);
-            int HPNum = 0;
             // Simulate 24 hour test
             for (int Step = 1; Step <= TimeStepPerHour * 24; ++Step) {
 
@@ -11417,7 +11424,7 @@ namespace WaterThermalTanks {
 
                 } else {
 
-                    HPNum = this->HeatPumpNum;
+                    int HPNum = this->HeatPumpNum; // Convenience variable
                     Real64 AmbientHumRat = 0.00717; // Humidity ratio at 67.5 F / 50% RH
 
                     //       set the heat pump air- and water-side mass flow rate
@@ -11679,7 +11686,8 @@ namespace WaterThermalTanks {
             } else {
                 RecoveryEfficiency = 0.0;
                 EnergyFactor = 0.0;
-                if (HPWaterHeater.empty() || !HPWaterHeater(HPNum).bIsIHP) {
+                // If this a regular tank, or an HPWH that's not an Integrated one
+                if ((this->HeatPumpNum == 0) || !HPWaterHeater(this->HeatPumpNum).bIsIHP) {
                     ShowWarningError("Water heater = " + this->Name +
                                      ":  Recovery Efficiency and Energy Factor could not be calculated during the test for standard ratings");
                     ShowContinueError("Setpoint was never recovered and/or heater never turned on");