Central Heat Pump Refactor

src/EnergyPlus/CMakeLists.txt

@@ -510,8 +510,8 @@ set(SRC
     Plant/ReportLoopData.hh
     Plant/SplitterData.hh
     Plant/Subcomponents.hh
-    PlantCentralGSHP.cc
-    PlantCentralGSHP.hh
+    PlantCentralHeatPumpSystem.cc
+    PlantCentralHeatPumpSystem.hh
     PlantChillers.cc
     PlantChillers.hh
     PlantComponent.hh

src/EnergyPlus/Data/CommonIncludes.hh

@@ -228,7 +228,7 @@
 #include <EnergyPlus/Pipes.hh>
 #include <EnergyPlus/Plant/DataPlant.hh>
 #include <EnergyPlus/Plant/PlantManager.hh>
-#include <EnergyPlus/PlantCentralGSHP.hh>
+#include <EnergyPlus/PlantCentralHeatPumpSystem.hh>
 #include <EnergyPlus/PlantChillers.hh>
 #include <EnergyPlus/PlantComponentTemperatureSources.hh>
 #include <EnergyPlus/PlantCondLoopOperation.hh>

src/EnergyPlus/Data/EnergyPlusData.cc

@@ -204,7 +204,7 @@ EnergyPlusData::EnergyPlusData()
     this->dataPhotovoltaicThermalCollector = std::make_unique<PhotovoltaicThermalCollectorsData>();
     this->dataPipeHT = std::make_unique<PipeHeatTransferData>();
     this->dataPipes = std::make_unique<PipesData>();
-    this->dataPlantCentralGSHP = std::make_unique<PlantCentralGSHPData>();
+    this->dataPlantCentralHeatPumpSystem = std::make_unique<PlantCentralHeatPumpSystemData>();
     this->dataPlantChillers = std::make_unique<PlantChillersData>();
     this->dataPlantCompTempSrc = std::make_unique<PlantCompTempSrcData>();
     this->dataPlantCondLoopOp = std::make_unique<PlantCondLoopOperationData>();
@@ -464,7 +464,7 @@ void EnergyPlusData::clear_state()
     this->dataPhotovoltaicThermalCollector->clear_state();
     this->dataPipeHT->clear_state();
     this->dataPipes->clear_state();
-    this->dataPlantCentralGSHP->clear_state();
+    this->dataPlantCentralHeatPumpSystem->clear_state();
     this->dataPlantChillers->clear_state();
     this->dataPlantCompTempSrc->clear_state();
     this->dataPlantCondLoopOp->clear_state();
@@ -740,7 +740,7 @@ void EnergyPlusData::init_constant_state(EnergyPlusData &state)
     this->dataPhotovoltaicThermalCollector->init_constant_state(state);
     this->dataPipeHT->init_constant_state(state);
     this->dataPipes->init_constant_state(state);
-    this->dataPlantCentralGSHP->init_constant_state(state);
+    this->dataPlantCentralHeatPumpSystem->init_constant_state(state);
     this->dataPlantChillers->init_constant_state(state);
     this->dataPlantCompTempSrc->init_constant_state(state);
     this->dataPlantCondLoopOp->init_constant_state(state);
@@ -1005,7 +1005,7 @@ void EnergyPlusData::init_state(EnergyPlusData &state)
     this->dataPhotovoltaicThermalCollector->init_state(state);
     this->dataPipeHT->init_state(state);
     this->dataPipes->init_state(state);
-    this->dataPlantCentralGSHP->init_state(state);
+    this->dataPlantCentralHeatPumpSystem->init_state(state);
     this->dataPlantChillers->init_state(state);
     this->dataPlantCompTempSrc->init_state(state);
     this->dataPlantCondLoopOp->init_state(state);

src/EnergyPlus/Data/EnergyPlusData.hh

@@ -216,7 +216,7 @@ struct PhotovoltaicThermalCollectorsData;
 struct PhotovoltaicsData;
 struct PipeHeatTransferData;
 struct PipesData;
-struct PlantCentralGSHPData;
+struct PlantCentralHeatPumpSystemData;
 struct PlantChillersData;
 struct PlantCompTempSrcData;
 struct PlantCondLoopOperationData;
@@ -475,7 +475,7 @@ struct EnergyPlusData : BaseGlobalStruct
     std::unique_ptr<PhotovoltaicsData> dataPhotovoltaic;
     std::unique_ptr<PipeHeatTransferData> dataPipeHT;
     std::unique_ptr<PipesData> dataPipes;
-    std::unique_ptr<PlantCentralGSHPData> dataPlantCentralGSHP;
+    std::unique_ptr<PlantCentralHeatPumpSystemData> dataPlantCentralHeatPumpSystem;
     std::unique_ptr<PlantChillersData> dataPlantChillers;
     std::unique_ptr<PlantCompTempSrcData> dataPlantCompTempSrc;
     std::unique_ptr<PlantCondLoopOperationData> dataPlantCondLoopOp;

src/EnergyPlus/Plant/Enums.hh

@@ -199,7 +199,7 @@ enum class PlantEquipmentType
     GrndHtExchgHorizTrench,
     FluidToFluidPlantHtExchg,
     WaterSource,
-    CentralGroundSourceHeatPump,
+    CentralHeatPumpSystem,
     UnitarySysRecovery,
     PackagedTESCoolingCoil,
     CoolingTower_VarSpdMerkel,

src/EnergyPlus/Plant/PlantManager.cc

@@ -102,7 +102,7 @@
 #include <EnergyPlus/PipeHeatTransfer.hh>
 #include <EnergyPlus/Pipes.hh>
 #include <EnergyPlus/Plant/PlantManager.hh>
-#include <EnergyPlus/PlantCentralGSHP.hh>
+#include <EnergyPlus/PlantCentralHeatPumpSystem.hh>
 #include <EnergyPlus/PlantChillers.hh>
 #include <EnergyPlus/PlantComponentTemperatureSources.hh>
 #include <EnergyPlus/PlantHeatExchangerFluidToFluid.hh>
@@ -1342,8 +1342,8 @@ void GetPlantInput(EnergyPlusData &state)
                         this_comp.compPtr = PhotovoltaicThermalCollectors::PVTCollectorStruct::factory(state, CompNames(CompNum));
                         break;
                     }
-                    case PlantEquipmentType::CentralGroundSourceHeatPump: {
-                        this_comp.compPtr = PlantCentralGSHP::WrapperSpecs::factory(state, CompNames(CompNum));
+                    case PlantEquipmentType::CentralHeatPumpSystem: {
+                        this_comp.compPtr = PlantCentralHeatPumpSystem::CentralHeatPumpSystem::factory(state, CompNames(CompNum));
                         // now deal with demand components of the ZoneHVAC type served by ControlCompOutput
                         break;
                     }
@@ -4401,7 +4401,7 @@ void SetupBranchControlTypes(EnergyPlusData &state)
                             this_component.HowLoadServed = DataPlant::HowMet::PassiveCap;
                         }
                     } break;
-                    case DataPlant::PlantEquipmentType::CentralGroundSourceHeatPump: { // 86
+                    case DataPlant::PlantEquipmentType::CentralHeatPumpSystem: { // 86
                         this_component.FlowCtrl = DataBranchAirLoopPlant::ControlType::Active;
                         if (LoopSideCtr == LoopSideLocation::Demand) {
                             this_component.FlowPriority = DataPlant::LoopFlowStatus::NeedyAndTurnsLoopOn;