Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into vrfCoolingFan
Browse files Browse the repository at this point in the history
  • Loading branch information
Yujie Xu committed Jul 25, 2024
2 parents 19c4aae + 8c96cbb commit ba1f3cf
Show file tree
Hide file tree
Showing 49 changed files with 5,875 additions and 7,276 deletions.
62 changes: 0 additions & 62 deletions doc/output-details-and-examples/src/output-files/eplustbl-lt-ext-gt.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1018,8 +1018,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
Plantloop Branch Name
\end{itemize}

An example of the report is shown here

\begin{figure}[h!]
\centering
\includegraphics{media/boiler-table-example.PNG}
Expand Down Expand Up @@ -1053,8 +1051,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
Condenser Loop Branch Name
\end{itemize}

An example of the report is shown here

\begin{figure}[h!]
\centering
\includegraphics{media/cooling-tower-table-example.PNG}
Expand All @@ -1078,8 +1074,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
Minimum Loop Flow Rate [m3/s]
\end{itemize}

An example of the report is shown here

\begin{figure}[h!]
\centering
\includegraphics{media/plantloop-table-example.PNG}
Expand Down Expand Up @@ -1127,8 +1121,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
Minimum Outdoor Flow Schedule Name
\end{itemize}

An example of the report is shown here

\begin{figure}[h!]
\centering
\includegraphics{media/air-terminal-table-example.PNG}
Expand Down Expand Up @@ -1160,67 +1152,13 @@ \subsection{Equipment Summary}\label{equipment-summary}
Outdoor Airflow [kg/s]
\end{itemize}

An example of the report is shown here

\begin{figure}[h!]
\centering
\includegraphics{media/air-heat-recovery-table-example.PNG}
\caption{}
\end{figure}

{\scriptsize
\begin{longtable}[c]{>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}}
\toprule
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
~ & 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

\midrule
\endfirsthead

\toprule
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
\midrule
\endhead

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
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
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






SPACE1-1 ZONE COIL & Coil:Heating:Fuel & 17614.83 & 0.80 \tabularnewline
SPACE2-1 ZONE COIL & Coil:Heating:Fuel & 14619.82 & 0.80 \tabularnewline
SPACE3-1 ZONE COIL & Coil:Heating:Fuel & 16093.74 & 0.80 \tabularnewline
SPACE4-1 ZONE COIL & Coil:Heating:Fuel & 18942.35 & 0.80 \tabularnewline
SPACE5-1 ZONE COIL & Coil:Heating:Fuel & 19146.73 & 0.80 \tabularnewline
MAIN HEATING COIL 1 & Coil:Heating:Fuel & 19754.61 & 0.80 \tabularnewline
\bottomrule
\end{longtable}}

{\scriptsize
\begin{longtable}[c]{>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}}
\toprule
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
\midrule
\endfirsthead

\toprule
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
\midrule
\endhead

SPACE1-1 ZONE COIL & Coil:Heating:Fuel & 17614.83 & 0.80 \tabularnewline
SPACE2-1 ZONE COIL & Coil:Heating:Fuel & 14619.82 & 0.80 \tabularnewline
SPACE3-1 ZONE COIL & Coil:Heating:Fuel & 16093.74 & 0.80 \tabularnewline
SPACE4-1 ZONE COIL & Coil:Heating:Fuel & 18942.35 & 0.80 \tabularnewline
SPACE5-1 ZONE COIL & Coil:Heating:Fuel & 19146.73 & 0.80 \tabularnewline
MAIN HEATING COIL 1 & Coil:Heating:Fuel & 19754.61 & 0.80 \tabularnewline
\bottomrule
\end{longtable}}


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

Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/BoilerSteam.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ namespace BoilerSteam {
"Hot Steam Nodes");

if (SteamFluidIndex == 0 && BoilerNum == 1) {
SteamFluidIndex = FluidProperties::FindRefrigerant(state, fluidNameSteam);
SteamFluidIndex = FluidProperties::GetRefrigNum(state, fluidNameSteam); // Steam is a refrigerant?
if (SteamFluidIndex == 0) {
ShowSevereError(
state, format("{}{}=\"{}\",", RoutineName, state.dataIPShortCut->cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)));
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChillerAbsorption.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ void GetBLASTAbsorberInput(EnergyPlusData &state)
state.dataIPShortCut->cAlphaArgs(7),
"Hot Water Nodes");
} else {
thisChiller.SteamFluidIndex = FluidProperties::FindRefrigerant(state, fluidNameSteam);
thisChiller.SteamFluidIndex = FluidProperties::GetRefrigNum(state, fluidNameSteam);
thisChiller.GeneratorInletNodeNum = NodeInputManager::GetOnlySingleNode(state,
state.dataIPShortCut->cAlphaArgs(6),
ErrorsFound,
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChillerIndirectAbsorption.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ void GetIndirectAbsorberInput(EnergyPlusData &state)
state.dataIPShortCut->cAlphaArgs(10),
"Hot Water Nodes");
} else {
thisChiller.SteamFluidIndex = FluidProperties::FindRefrigerant(state, fluidNameSteam);
thisChiller.SteamFluidIndex = FluidProperties::GetRefrigNum(state, fluidNameSteam);
thisChiller.GeneratorInletNodeNum = NodeInputManager::GetOnlySingleNode(state,
state.dataIPShortCut->cAlphaArgs(9),
ErrorsFound,
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/Data/EnergyPlusData.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ EnergyPlusData::EnergyPlusData()
this->dataFans = std::make_unique<FansData>();
this->dataFaultsMgr = std::make_unique<FaultsManagerData>();
this->dataFluidCoolers = std::make_unique<FluidCoolersData>();
this->dataFluidProps = std::make_unique<FluidPropertiesData>();
this->dataFluidProps = std::make_unique<FluidData>();
this->dataFourPipeBeam = std::make_unique<FourPipeBeamData>();
this->dataFuelCellElectGen = std::make_unique<FuelCellElectricGeneratorData>();
this->dataFurnaces = std::make_unique<FurnacesData>();
Expand Down
4 changes: 2 additions & 2 deletions src/EnergyPlus/Data/EnergyPlusData.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ struct FanCoilUnitsData;
struct FansData;
struct FaultsManagerData;
struct FluidCoolersData;
struct FluidPropertiesData;
struct FluidData;
struct FourPipeBeamData;
struct FuelCellElectricGeneratorData;
struct FurnacesData;
Expand Down Expand Up @@ -390,7 +390,7 @@ struct EnergyPlusData : BaseGlobalStruct
std::unique_ptr<FansData> dataFans;
std::unique_ptr<FaultsManagerData> dataFaultsMgr;
std::unique_ptr<FluidCoolersData> dataFluidCoolers;
std::unique_ptr<FluidPropertiesData> dataFluidProps;
std::unique_ptr<FluidData> dataFluidProps;
std::unique_ptr<FourPipeBeamData> dataFourPipeBeam;
std::unique_ptr<FuelCellElectricGeneratorData> dataFuelCellElectGen;
std::unique_ptr<FurnacesData> dataFurnaces;
Expand Down
Loading

5 comments on commit ba1f3cf

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vrfCoolingFan (Unknown) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3681 of 3685 tests passed, 0 test warnings)

Messages:\n

  • 4 tests had: AUD diffs.
  • 4 tests had: BND diffs.
  • 4 tests had: EIO diffs.
  • 1 test had: ERR diffs.
  • 2 tests had: ESO small diffs.
  • 1 test had: MDD diffs.
  • 1 test had: MTD diffs.
  • 4 tests had: Table big diffs.
  • 4 tests had: Table string diffs.
  • 1 test had: IDF diffs.
  • 2 tests had: ESO big diffs.
  • 1 test had: MTR small diffs.
  • 1 test had: MTR big diffs.

Failures:\n

regression Test Summary

  • Passed: 807
  • Failed: 4

Build Badge Test Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vrfCoolingFan (Unknown) - x86_64-MacOS-10.18-clang-15.0.0: OK (3640 of 3644 tests passed, 0 test warnings)

Messages:\n

  • 4 tests had: AUD diffs.
  • 4 tests had: BND diffs.
  • 4 tests had: EIO diffs.
  • 2 tests had: ESO small diffs.
  • 4 tests had: Table big diffs.
  • 4 tests had: Table string diffs.
  • 2 tests had: ESO big diffs.
  • 1 test had: MTR small diffs.
  • 1 test had: MTR big diffs.
  • 1 test had: ERR diffs.
  • 1 test had: MDD diffs.
  • 1 test had: MTD diffs.
  • 1 test had: IDF diffs.

Failures:\n

regression Test Summary

  • Passed: 787
  • Failed: 4

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vrfCoolingFan (Unknown) - Win64-Windows-10-VisualStudio-16: OK (2852 of 2852 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vrfCoolingFan (Unknown) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (2060 of 2060 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vrfCoolingFan (Unknown) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (795 of 795 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.