Skip to content

Commit f4c425b

Browse files
author
Yujie Xu
committed
Merge remote-tracking branch 'origin/develop' into vrfFluidCtrlFixCoolingCycling
2 parents 6253ece + 8c96cbb commit f4c425b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+5898
-7299
lines changed

‎doc/output-details-and-examples/src/output-files/eplustbl-lt-ext-gt.tex

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,8 +1018,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
10181018
Plantloop Branch Name
10191019
\end{itemize}
10201020

1021-
An example of the report is shown here
1022-
10231021
\begin{figure}[h!]
10241022
\centering
10251023
\includegraphics{media/boiler-table-example.PNG}
@@ -1053,8 +1051,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
10531051
Condenser Loop Branch Name
10541052
\end{itemize}
10551053

1056-
An example of the report is shown here
1057-
10581054
\begin{figure}[h!]
10591055
\centering
10601056
\includegraphics{media/cooling-tower-table-example.PNG}
@@ -1078,8 +1074,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
10781074
Minimum Loop Flow Rate [m3/s]
10791075
\end{itemize}
10801076

1081-
An example of the report is shown here
1082-
10831077
\begin{figure}[h!]
10841078
\centering
10851079
\includegraphics{media/plantloop-table-example.PNG}
@@ -1127,8 +1121,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
11271121
Minimum Outdoor Flow Schedule Name
11281122
\end{itemize}
11291123

1130-
An example of the report is shown here
1131-
11321124
\begin{figure}[h!]
11331125
\centering
11341126
\includegraphics{media/air-terminal-table-example.PNG}
@@ -1160,67 +1152,13 @@ \subsection{Equipment Summary}\label{equipment-summary}
11601152
Outdoor Airflow [kg/s]
11611153
\end{itemize}
11621154

1163-
An example of the report is shown here
11641155

11651156
\begin{figure}[h!]
11661157
\centering
11671158
\includegraphics{media/air-heat-recovery-table-example.PNG}
11681159
\caption{}
11691160
\end{figure}
11701161

1171-
{\scriptsize
1172-
\begin{longtable}[c]{>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}}
1173-
\toprule
1174-
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
1175-
~ & Type & Reference Capacity[W] & Type Reference Efficiency [W/W] & Rated Capacity [W] & Rated Efficiency [W/W] & IPLV in SI Units [W/W] & IPLV in IP Units [Btu/W-h] & Minimum Part Load Ratio & Fuel Type & Rated Entering Condenser Temperature [C] & Rated Leaving Evaporator Temperature [C] Reference Entering Condenser Temperature [C] Reference Leaving Evaporator Temperature [C] Design Size Reference Chilled Water Flow Rate [kg/s] Design Size Reference Condenser Fluid Flow Rate [kg/s] Plantloop Name Plantloop Branch Name Condenser Loop Name Condenser Loop Branch Name Heat Recovery Plantloop Name Heat Recovery Plantloop Branch Name Recovery Relative Capacity Fraction
1176-
1177-
\midrule
1178-
\endfirsthead
1179-
1180-
\toprule
1181-
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
1182-
\midrule
1183-
\endhead
1184-
1185-
Type Reference Capacity[W] TypeReference Efficiency [W/W] Rated Capacity [W] Rated Efficiency [W/W] IPLV in SI Units [W/W] IPLV in IP Units [Btu/W-h] Minimum Part Load Ratio Fuel Type Rated Entering Condenser Temperature [C] Rated Leaving Evaporator Temperature [C] Reference Entering Condenser Temperature [C] Reference Leaving Evaporator Temperature [C] Design Size Reference Chilled Water Flow Rate [kg/s] Design Size Reference Condenser Fluid Flow Rate [kg/s] Plantloop Name Plantloop Branch Name Condenser Loop Name Condenser Loop Branch Name Heat Recovery Plantloop Name Heat Recovery Plantloop Branch Name Recovery Relative Capacity Fraction
1186-
90.1-2004 WATERCOOLED CENTRIFUGAL CHILLER 0 416TONS 0.6KW/TON Chiller:Electric:EIR 1932343.27 6.10 1932343.27 6.10 6.88 6.92 0.00 Electricity 35.00 6.67 35.00 6.67 82.04 96.29 CHILLED WATER LOOP CHILLED WATER LOOP SUPPLY BRANCH 1 CONDENSER WATER LOOP CONDENSER WATER LOOP DEMAND BRANCH 2 N/A N/A 0.00
1187-
90.1-2004 WATERCOOLED CENTRIFUGAL CHILLER 1 416TONS 0.6KW/TON Chiller:Electric:EIR 1932343.27 6.10 1932343.27 6.10 6.88 6.92 0.00 Electricity 35.00 6.67 35.00 6.67 82.04 96.29 CHILLED WATER LOOP CHILLED WATER LOOP SUPPLY BRANCH 2 CONDENSER WATER LOOP CONDENSER WATER LOOP DEMAND BRANCH 3 N/A N/A 0.00
1188-
1189-
1190-
1191-
1192-
1193-
1194-
SPACE1-1 ZONE COIL & Coil:Heating:Fuel & 17614.83 & 0.80 \tabularnewline
1195-
SPACE2-1 ZONE COIL & Coil:Heating:Fuel & 14619.82 & 0.80 \tabularnewline
1196-
SPACE3-1 ZONE COIL & Coil:Heating:Fuel & 16093.74 & 0.80 \tabularnewline
1197-
SPACE4-1 ZONE COIL & Coil:Heating:Fuel & 18942.35 & 0.80 \tabularnewline
1198-
SPACE5-1 ZONE COIL & Coil:Heating:Fuel & 19146.73 & 0.80 \tabularnewline
1199-
MAIN HEATING COIL 1 & Coil:Heating:Fuel & 19754.61 & 0.80 \tabularnewline
1200-
\bottomrule
1201-
\end{longtable}}
1202-
1203-
{\scriptsize
1204-
\begin{longtable}[c]{>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}}
1205-
\toprule
1206-
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
1207-
\midrule
1208-
\endfirsthead
1209-
1210-
\toprule
1211-
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
1212-
\midrule
1213-
\endhead
1214-
1215-
SPACE1-1 ZONE COIL & Coil:Heating:Fuel & 17614.83 & 0.80 \tabularnewline
1216-
SPACE2-1 ZONE COIL & Coil:Heating:Fuel & 14619.82 & 0.80 \tabularnewline
1217-
SPACE3-1 ZONE COIL & Coil:Heating:Fuel & 16093.74 & 0.80 \tabularnewline
1218-
SPACE4-1 ZONE COIL & Coil:Heating:Fuel & 18942.35 & 0.80 \tabularnewline
1219-
SPACE5-1 ZONE COIL & Coil:Heating:Fuel & 19146.73 & 0.80 \tabularnewline
1220-
MAIN HEATING COIL 1 & Coil:Heating:Fuel & 19754.61 & 0.80 \tabularnewline
1221-
\bottomrule
1222-
\end{longtable}}
1223-
12241162

12251163
\subsection{Envelope Summary}\label{envelope-summary}
12261164

‎src/EnergyPlus/BoilerSteam.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ namespace BoilerSteam {
267267
"Hot Steam Nodes");
268268

269269
if (SteamFluidIndex == 0 && BoilerNum == 1) {
270-
SteamFluidIndex = FluidProperties::FindRefrigerant(state, fluidNameSteam);
270+
SteamFluidIndex = FluidProperties::GetRefrigNum(state, fluidNameSteam); // Steam is a refrigerant?
271271
if (SteamFluidIndex == 0) {
272272
ShowSevereError(
273273
state, format("{}{}=\"{}\",", RoutineName, state.dataIPShortCut->cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)));

‎src/EnergyPlus/ChillerAbsorption.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ void GetBLASTAbsorberInput(EnergyPlusData &state)
385385
state.dataIPShortCut->cAlphaArgs(7),
386386
"Hot Water Nodes");
387387
} else {
388-
thisChiller.SteamFluidIndex = FluidProperties::FindRefrigerant(state, fluidNameSteam);
388+
thisChiller.SteamFluidIndex = FluidProperties::GetRefrigNum(state, fluidNameSteam);
389389
thisChiller.GeneratorInletNodeNum = NodeInputManager::GetOnlySingleNode(state,
390390
state.dataIPShortCut->cAlphaArgs(6),
391391
ErrorsFound,

‎src/EnergyPlus/ChillerIndirectAbsorption.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ void GetIndirectAbsorberInput(EnergyPlusData &state)
396396
state.dataIPShortCut->cAlphaArgs(10),
397397
"Hot Water Nodes");
398398
} else {
399-
thisChiller.SteamFluidIndex = FluidProperties::FindRefrigerant(state, fluidNameSteam);
399+
thisChiller.SteamFluidIndex = FluidProperties::GetRefrigNum(state, fluidNameSteam);
400400
thisChiller.GeneratorInletNodeNum = NodeInputManager::GetOnlySingleNode(state,
401401
state.dataIPShortCut->cAlphaArgs(9),
402402
ErrorsFound,

‎src/EnergyPlus/Data/EnergyPlusData.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ EnergyPlusData::EnergyPlusData()
117117
this->dataFans = std::make_unique<FansData>();
118118
this->dataFaultsMgr = std::make_unique<FaultsManagerData>();
119119
this->dataFluidCoolers = std::make_unique<FluidCoolersData>();
120-
this->dataFluidProps = std::make_unique<FluidPropertiesData>();
120+
this->dataFluidProps = std::make_unique<FluidData>();
121121
this->dataFourPipeBeam = std::make_unique<FourPipeBeamData>();
122122
this->dataFuelCellElectGen = std::make_unique<FuelCellElectricGeneratorData>();
123123
this->dataFurnaces = std::make_unique<FurnacesData>();

‎src/EnergyPlus/Data/EnergyPlusData.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ struct FanCoilUnitsData;
134134
struct FansData;
135135
struct FaultsManagerData;
136136
struct FluidCoolersData;
137-
struct FluidPropertiesData;
137+
struct FluidData;
138138
struct FourPipeBeamData;
139139
struct FuelCellElectricGeneratorData;
140140
struct FurnacesData;
@@ -390,7 +390,7 @@ struct EnergyPlusData : BaseGlobalStruct
390390
std::unique_ptr<FansData> dataFans;
391391
std::unique_ptr<FaultsManagerData> dataFaultsMgr;
392392
std::unique_ptr<FluidCoolersData> dataFluidCoolers;
393-
std::unique_ptr<FluidPropertiesData> dataFluidProps;
393+
std::unique_ptr<FluidData> dataFluidProps;
394394
std::unique_ptr<FourPipeBeamData> dataFourPipeBeam;
395395
std::unique_ptr<FuelCellElectricGeneratorData> dataFuelCellElectGen;
396396
std::unique_ptr<FurnacesData> dataFurnaces;

0 commit comments

Comments
 (0)