Skip to content

Commit

Permalink
Merge branch 'develop' into 10630-AFN-fan-array-bounds
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgu1234
lgu1234 committed Aug 1, 2024
2 parents f968a2c + 342372b commit ee34a3c
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions src/EnergyPlus/Construction.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,15 @@ void ConstructionProps::calculateTransferFunction(EnergyPlusData &state, bool &E
// greater than this, then the coefficients will not yield a valid steady
// state solution.

constexpr Real64 MaxAllowedTimeStep(4.0); // Sets the maximum allowed time step
// for CTF calculations to be 4 hours. This is done in response to some
constexpr Real64 MaxAllowedTimeStep = 7.0; // Sets the maximum allowed time step
// for CTF calculations to be 7 hours. This is done in response to some
// rare situations where odd or faulty input will cause the routine to
// go off and get some huge time step (in excess of 20 hours). This value
// is a compromise that does not really solve any input problems. One run
// indicated that 2 meters of concrete will result in a time step of slightly
// more than 3 hours. So, 4 hours was arbitrarily picked as a ceiling for
// more than 3 hours. So, 7 hours was arbitrarily picked as a ceiling for
// time steps so that an error message can be produced to warn the user
// that something isn't right. Note that the 4 hour limit does not guarantee
// that something isn't right. Note that the 7 hour limit does not guarantee
// that problems won't exist and it does not necessarily avoid any problems
// that interpolated temperature histories might cause.

Expand Down
8 changes: 4 additions & 4 deletions src/EnergyPlus/DXCoils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8290,7 +8290,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
CompType = thisDXCoil.DXCoilType;
// Sizing rated air flow rate
if (Mode == thisDXCoil.NumOfSpeeds) {
FieldNum = 12 + (Mode - 1) * 5;
FieldNum = 12 + (Mode - 1) * 6;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(1).FieldNames(FieldNum) + " [m3/s]";
TempSize = thisDXCoil.MSRatedAirVolFlowRate(Mode);
state.dataSize->DataEMSOverrideON = thisDXCoil.RatedAirVolFlowRateEMSOverrideON(Mode);
Expand All @@ -8313,7 +8313,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
bPRINT = true;
}
} else {
FieldNum = 12 + (Mode - 1) * 5;
FieldNum = 12 + (Mode - 1) * 6;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(1).FieldNames(FieldNum) + " [m3/s]";
if (IsAutoSize || !HardSizeNoDesRun) {
SizingMethod = HVAC::AutoCalculateSizing;
Expand Down Expand Up @@ -8407,7 +8407,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
if (Mode == thisDXCoil.NumOfSpeeds) {
SizingMethod = HVAC::HeatingCapacitySizing;
state.dataSize->DataFlowUsedForSizing = thisDXCoil.MSRatedAirVolFlowRate(Mode);
FieldNum = 10 + (Mode - 1) * 5;
FieldNum = 10 + (Mode - 1) * 6;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(1).FieldNames(FieldNum) + " [W]";
state.dataSize->DataTotCapCurveIndex = thisDXCoil.MSCCapFTemp(Mode);
if (IsAutoSize || !HardSizeNoDesRun) {
Expand Down Expand Up @@ -8448,7 +8448,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
} else {
PrintFlag = true;
SizingMethod = HVAC::HeatingCapacitySizing;
FieldNum = 10 + (Mode - 1) * 5;
FieldNum = 10 + (Mode - 1) * 6;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(1).FieldNames(FieldNum) + " [W]";
if (IsAutoSize || !HardSizeNoDesRun) {
SizingMethod = HVAC::AutoCalculateSizing;
Expand Down
4 changes: 2 additions & 2 deletions src/EnergyPlus/FluidProperties.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2843,13 +2843,13 @@ namespace FluidProperties {
// and linearly interpolates the corresponding saturation temperature values.

// Return value
Real64 ReturnValue;
Real64 ReturnValue = 0.0;

// FUNCTION PARAMETER DEFINITIONS:
static constexpr std::string_view routineName = "RefrigProps::getSatTemperature";

// FUNCTION LOCAL VARIABLE DECLARATIONS:
bool ErrorFlag; // error flag for current call
bool ErrorFlag = false; // error flag for current call

auto &df = state.dataFluidProps;

Expand Down
6 changes: 3 additions & 3 deletions tst/EnergyPlus/unit/DXCoils.unit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ TEST_F(EnergyPlusFixture, DXCoils_Test1)

state->dataDXCoils->DXCoilNumericFields.allocate(state->dataDXCoils->NumDXCoils);
state->dataDXCoils->DXCoilNumericFields(2).PerfMode.allocate(1);
state->dataDXCoils->DXCoilNumericFields(2).PerfMode(1).FieldNames.allocate(17);
state->dataDXCoils->DXCoilNumericFields(2).PerfMode(1).FieldNames.allocate(18);
state->dataDXCoils->DXCoil(2).DefrostStrategy = StandardRatings::DefrostStrat::Resistive;
state->dataDXCoils->DXCoil(2).DefrostCapacity = 5000.0;
state->dataDXCoils->DXCoil(2).Name = "DX Heating coil";
Expand Down Expand Up @@ -4648,9 +4648,9 @@ TEST_F(EnergyPlusFixture, TestMultiSpeedCoilsAutoSizingOutput)
EXPECT_NEAR(16365.95, state->dataDXCoils->DXCoil(2).MSRatedTotCap(1), 0.01);
// Check EIO reporting
const std::string htg_coil_eio_output =
R"EIO( Component Sizing Information, Coil:Heating:DX:MultiSpeed, ASHP HTG COIL, Design Size Speed 2 Gross Rated Heating COP [m3/s], 1.75000
R"EIO( Component Sizing Information, Coil:Heating:DX:MultiSpeed, ASHP HTG COIL, Design Size Speed 2 Rated Air Flow Rate [m3/s], 1.75000
Component Sizing Information, Coil:Heating:DX:MultiSpeed, ASHP HTG COIL, Design Size Speed 1 Rated Air Flow Rate [m3/s], 0.87500
Component Sizing Information, Coil:Heating:DX:MultiSpeed, ASHP HTG COIL, Design Size Speed 1 Rated Waste Heat Fraction of Power Input [W], 32731.91226
Component Sizing Information, Coil:Heating:DX:MultiSpeed, ASHP HTG COIL, Design Size Speed 2 Gross Rated Heating Capacity [W], 32731.91226
Component Sizing Information, Coil:Heating:DX:MultiSpeed, ASHP HTG COIL, Design Size Speed 1 Gross Rated Heating Capacity [W], 16365.95613
Component Sizing Information, Coil:Heating:DX:MultiSpeed, ASHP HTG COIL, Design Size Resistive Defrost Heater Capacity, 0.00000
! <DX Heating Coil Standard Rating Information>, Component Type, Component Name, High Temperature Heating (net) Rating Capacity {W}, Low Temperature Heating (net) Rating Capacity {W}, HSPF {Btu/W-h}, Region Number
Expand Down

5 comments on commit ee34a3c

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

10630-AFN-fan-array-bounds (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3695 of 3695 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.

10630-AFN-fan-array-bounds (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (2070 of 2070 tests passed, 0 test warnings)

Build Badge Test Badge Coverage 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.

10630-AFN-fan-array-bounds (lgu1234) - Win64-Windows-10-VisualStudio-16: OK (2862 of 2862 tests passed, 0 test warnings)

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.

10630-AFN-fan-array-bounds (lgu1234) - x86_64-MacOS-10.18-clang-15.0.0: OK (3654 of 3654 tests passed, 0 test warnings)

Build Badge Test 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.

10630-AFN-fan-array-bounds (lgu1234) - 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.