Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/CNRECS.DEF
Original file line number Diff line number Diff line change
Expand Up @@ -3651,7 +3651,6 @@ RECORD RSYS "RSYS" *RAT // residential HVAC system
*f *e FLOAT_GEZ rs_capH_AsNov; // raw autoSized capH w/o oversizing (including fan), Btuh
// autoSize code ASSUMES x, x_As, x_AsNov together for access thru one ptr. cuprobe.cpp's name search also requires together.

// *r FLOAT rs_fanPwrRtdH // fan power include in ASHP rated cap/COP/HSPF, W/cfm
*r *array 2 FLOAT_GEZ rs_fanSFPRtd; // rated specific fan power, W/cfm (assumed included in rated capacities)
// [ 0] = heating [ 1] = cooling
*f *e FLOAT rs_fanHRtdH // fan heat included in ASHP rated cap/COP/HSPF, Btuh
Expand Down Expand Up @@ -3831,7 +3830,7 @@ RECORD RSYS "RSYS" *RAT // residential HVAC system
// used for both heating and cooling
*s *e DBL rs_outLat // average latent heat delivery rate, Btuh
*s *e DBL rs_outFan // average fan heat added to air stream, Btuh
*s *e DBL rs_outDefrost // averate defrost heat, Btuh
*s *e DBL rs_outDefrost // average defrost heat, Btuh
// = typically resistance heat added to prevent cold supply air
// 0 if not ASHP or if defrost not active
*s *e DBL rs_outAux // average auxiliary heat added to air stream, Btuh (for ASHP)
Expand Down
12 changes: 6 additions & 6 deletions src/cnloads.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3327,13 +3327,13 @@ float RSYS::rs_FanSpecificFanPowerRated(
// applies to both heating and cooling
// returns fan power assumed to be included in net ratings, W/cfm
{
float rsfp;
float sfpRated = 0.f;
if (rs_IsPM( iHC))
{ // if performance map type, assume variable capacity
// use updated assumptions
rsfp = rs_fan.fn_motTy == C_MOTTYCH_PSC ? 0.414f // permanent split capacitor
: rs_HasDucts( iHC) ? 0.281f // ducted brushless permanent magnet (BPM aka ECM)
: 0.171f; // ductless BPM
sfpRated = rs_fan.fn_motTy == C_MOTTYCH_PSC ? 0.414f // permanent split capacitor
: rs_HasDucts( iHC) ? 0.281f // ducted brushless permanent magnet (BPM aka ECM)
: 0.171f; // ductless BPM
}
else
{ // pre-2024 assumptions for non-ASHPPM types
Expand All @@ -3343,11 +3343,11 @@ float RSYS::rs_FanSpecificFanPowerRated(
: rs_IsPkgRoom() ? 0.f // package room: no fan power adjustment
: rs_fan.fn_motTy == C_MOTTYCH_PSC ? 500. // PSC: .365 W/cfm
: 283.f; // brushless permanent magnet (BPM aka ECM)
rsfp = (fanHeatPerTon / BtuperWh) / 400.f;
sfpRated = (fanHeatPerTon / BtuperWh) / 400.f;

}

return rsfp;
return sfpRated;

} // RSYS::rs_FanSpecificFanPowerRated
//-----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/curvemap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ RC PERFORMANCEMAP::pm_SetupBtwxt( // input -> Btwxt conversion
gridAxes.emplace_back(
Btwxt::GridAxis(
vGX[ iGX], // grid values
Btwxt::InterpolationMethod::linear, Btwxt::ExtrapolationMethod::constant,
Btwxt::InterpolationMethod::linear, Btwxt::ExtrapolationMethod::linear,
{ -DBL_MAX, DBL_MAX }, // extrapolation limits
pGX[ iGX]->pmx_type.CStr(), // axis name (from PMGRIDAXIS user input)
MX)); // message handler
Expand Down
3 changes: 1 addition & 2 deletions src/hvac.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,8 @@ float CoolingInpF1Spd( // input factor for 1 spd model

return fInpEER;
} // CoolingInpF1Spd

//------------------------------------------------------------------------------
void HeatingAdjust(
void HeatingAdjust( // heating off-rating adjustment
float tdbOut, // outdoor dry bulb, F
float tdbCoilIn, // coil entering dry bulb, F
float vfPerTon, // coil air flow std air cfm/ton
Expand Down
70 changes: 35 additions & 35 deletions test/ref-macos64-appleclang/CHDHW.REP

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions test/ref-win32-msvc/CHDHW.REP

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions test/ref-win32-msvc/PERFMAP.REP
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Error Messages for Run 001:

---------------
Warning: Zone 'House': Condensation occurred in 9041 subhours of run.
Total condensation heat = 911.303 kBtu.
Total condensation heat = 911.304 kBtu.
---------------
Info: Zone 'House': Temp control outcomes
Miss setpoint (hr) Avg Excursion (F) Max Excursion (F) Miss > 1.0 F tol (hr)
Expand Down Expand Up @@ -1320,7 +1320,7 @@ RSYS hours for Tue 06-Jan

! Log for Run 001:

! CSE 0.923.0+vchp-fanpower.148a22e8.1.dirty for Win32 console
! CSE 0.923.1+pmtest.cabde666.4.dirty for Win32 console



Expand Down Expand Up @@ -2649,18 +2649,18 @@ Input for Run 001:



! CSE 0.923.0+vchp-fanpower.148a22e8.1.dirty for Win32 console run(s) done: Sun 12-Jan-25 2:4 pm
! CSE 0.923.1+pmtest.cabde666.4.dirty for Win32 console run(s) done: Wed 26-Feb-25 4:0 pm

! Executable: d:\cse\builds\cse.exe
! 12-Jan-25 2:3 pm (VS 14.29 2941952 bytes) (HPWH 1.24.0)
! 26-Feb-25 3:5 pm (VS 14.29 2941952 bytes) (HPWH 1.24.0)
! Command line: -x! -t1 perfmap
! Input file: D:\cse\test\perfmap.cse
! Report file: D:\CSE\TEST\PERFMAP.REP

! Timing info --

! Input: Time = 0.09 Calls = 2 T/C = 0.0430
! Input: Time = 0.09 Calls = 2 T/C = 0.0440
! AutoSizing: Time = 0.13 Calls = 1 T/C = 0.1320
! Simulation: Time = 3.37 Calls = 1 T/C = 3.3650
! Reports: Time = 0.00 Calls = 1 T/C = 0.0040
! Total: Time = 3.59 Calls = 1 T/C = 3.5900
! Simulation: Time = 3.52 Calls = 1 T/C = 3.5240
! Reports: Time = 0.00 Calls = 1 T/C = 0.0030
! Total: Time = 3.75 Calls = 1 T/C = 3.7550