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
21 changes: 14 additions & 7 deletions src/CGCOMP.CPP
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,9 @@ RC IZXRAT::iz_CkfIZXFER() // input checks
iz_exp = 0.f;
}

if (!iz_CanHaveAFCat())
ignore(IZXRAT_AFCAT, when);

// horizontal opening
// stairangle defaults
// L1 and L2 required else disallowed
Expand Down Expand Up @@ -1046,7 +1049,9 @@ x }
void IZXRAT::iz_SetupAfMtrs()
{
// Air flow category
if (!IsSet(IZXRAT_AFCAT))
if (!iz_CanHaveAFCat())
iz_afCat = -1;
else if (!IsSet(IZXRAT_AFCAT))
iz_afCat = iz_AfCatDefault(); // default category (may return -1)

// AFMTR ptrs: NULL if no meter specified -> no air flow accounting
Expand Down Expand Up @@ -1079,8 +1084,8 @@ void IZXRAT::iz_SetupAfMtrs()
AFCAT IZXRAT::iz_AfCatDefault() const
{
AFCAT afCat;
if (!iz_IsAirNet())
afCat = -1; // track only airnet flows
if (!iz_CanHaveAFCat())
afCat = -1; // not trackable
else if (iz_IsSysAir())
afCat = C_AFCAT_HVAC;
else if (iz_IsDuctLk())
Expand Down Expand Up @@ -1608,7 +1613,7 @@ RC AIRNET::an_Calc( // airnet flow balance
const int ANDBZMAX = 5;
double rVSave[ ANDBZMAX];
double jacSave[ ANDBZMAX*ANDBZMAX];
int bDbPrint = DbDo( dbdAIRNET);
bool bDbPrint = DbDo( dbdAIRNET);
#endif

TMRSTART( TMR_AIRNET);
Expand Down Expand Up @@ -1714,9 +1719,11 @@ RC AIRNET::an_Calc( // airnet flow balance
}
#if defined( DEBUGDUMP)
// save info for debug print (changed by gaussjb())
VCopy( rVSave, nzDb, rV);
for (zi=0; zi < nzDb; zi++)
VCopy( &jacSave[ zi*nzDb], nzDb, &an_jac[ zi*an_nz]);
if (bDbPrint)
{ VCopy(rVSave, nzDb, rV);
for (zi = 0; zi < nzDb; zi++)
VCopy(&jacSave[zi*nzDb], nzDb, &an_jac[zi*an_nz]);
}
#endif
// solve for pressure corrections
int gjRet = gaussjb( an_jac, an_nz, rV, 1);
Expand Down
1 change: 1 addition & 0 deletions src/CNRECS.DEF
Original file line number Diff line number Diff line change
Expand Up @@ -2788,6 +2788,7 @@ RECORD IZXRAT "izXfer" *RAT // interzone heat transfers: conductive and/or vent.
*declare "RC iz_EndSubhr();"
// CAUTION: the following depend on C_IZNVTYCH_xxx values
*declare "BOOL iz_IsAirNet() const { return iz_nvcntrl > C_IZNVTYCH_TWOWAY; }"
*declare "BOOL iz_CanHaveAFCat() const { return iz_IsAirNet(); }"
*declare "BOOL iz_IsExterior() const { return iz_nvcntrl == C_IZNVTYCH_ANEXT || iz_nvcntrl == C_IZNVTYCH_ANEXTFAN || iz_nvcntrl == C_IZNVTYCH_ANEXTFLOW; }"
*declare "BOOL iz_IsAirNetIZ() const { return iz_nvcntrl == C_IZNVTYCH_ANIZ || iz_nvcntrl == C_IZNVTYCH_ANIZFAN || iz_nvcntrl == C_IZNVTYCH_ANIZFLOW || iz_nvcntrl == C_IZNVTYCH_ANHORIZ; }"
*declare "BOOL iz_IsHERV() const { return iz_nvcntrl == C_IZNVTYCH_ANHERV; }"
Expand Down
2 changes: 1 addition & 1 deletion vendor/HPWHsim