From 80f76e641f09d68716fde45cbb58dda12d7735b8 Mon Sep 17 00:00:00 2001 From: Chip Barnaby Date: Thu, 8 Jul 2021 18:06:34 -0400 Subject: [PATCH 1/2] Update HPWHsim --- vendor/HPWHsim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/HPWHsim b/vendor/HPWHsim index 7e0a1c1e8..f3d8238b3 160000 --- a/vendor/HPWHsim +++ b/vendor/HPWHsim @@ -1 +1 @@ -Subproject commit 7e0a1c1e8d7c4b253ebf9be2937f09b9a3ac4443 +Subproject commit f3d8238b34a84121a0f7d53aef73003394793aac From 458b596a9fe0f0908d72d9e06f3ebf1c70b34d03 Mon Sep 17 00:00:00 2001 From: Chip Barnaby Date: Fri, 16 Jul 2021 10:55:47 -0400 Subject: [PATCH 2/2] Add whResType=SwingTank; long name bug fix; autosize bug fix --- src/CGCOMP.CPP | 6 +- src/CNCULT.CPP | 1 + src/CNCULT4.CPP | 20 ++--- src/CNDTYPES.DEF | 5 ++ src/CNFIELDS.DEF | 1 + src/CNLOADS.CPP | 39 ++++++---- src/CNRECS.DEF | 8 +- src/CUL.CPP | 2 +- src/DHWCalc.cpp | 39 ++++++---- src/IMPF.CPP | 2 +- src/STRPAK.CPP | 34 +++++++-- src/STRPAK.H | 4 +- test/DHW_MFSizing.cse | 1 + test/ref/DHW_MFSIZING.REP | 156 +++++++++++++++++++------------------- 14 files changed, 184 insertions(+), 134 deletions(-) diff --git a/src/CGCOMP.CPP b/src/CGCOMP.CPP index d18bc2533..f55ecedc4 100644 --- a/src/CGCOMP.CPP +++ b/src/CGCOMP.CPP @@ -1264,8 +1264,10 @@ TI ZNR::zn_AddIZXFER( // add IZXFER coupled to this zone IZXRAT* ize; IzxR.add( &ize, ABT); - strcpy( ize->name, name); - strCatIf( ize->name, sizeof( ize->name), "-", nmSfx); + ize->SetName( name); + // append suffix + int catOption = 1; // attempt to truncate name size exceeded + strCatIf( ize->name, sizeof( ize->name), "-", nmSfx, catOption); ize->iz_zi1 = ss; // idx of this zone ize->iz_nvcntrl = ty; ize->iz_pAF = pAF; diff --git a/src/CNCULT.CPP b/src/CNCULT.CPP index 9d998593d..4652f152b 100644 --- a/src/CNCULT.CPP +++ b/src/CNCULT.CPP @@ -1852,6 +1852,7 @@ CULT( "whType", DAT, DHWHEATER_TYPE, 0, 0, VEOI, TYCH, 0, CULT( "whHeatSrc", DAT, DHWHEATER_HEATSRC, 0, 0, VEOI, TYCH, 0, C_WHHEATSRCCH_FUEL, N, N), CULT( "whZone", DAT, DHWHEATER_ZNTI, 0, 0, VEOI, TYREF, &ZiB, 0, N, N), CULT( "whTEx", DAT, DHWHEATER_TEX, 0, 0, VSUBHRLY,TYFL, 0, 70.f, N, N), +CULT( "whResType", DAT, DHWHEATER_RESTY, 0, 0, VEOI, TYCH, 0, C_WHRESTYCH_TYPICAL,N, N), CULT( "whASHPType", DAT, DHWHEATER_ASHPTY, 0, 0, VEOI, TYCH, 0, -1, N, N), CULT( "whASHPSrcZn", DAT, DHWHEATER_ASHPSRCZNTI,0, 0, VEOI, TYREF, &ZiB, 0, N, N), CULT( "whASHPSrcT", DAT, DHWHEATER_ASHPTSRC,0, 0, VSUBHRLY,TYFL, 0, 70.f, N, N), diff --git a/src/CNCULT4.CPP b/src/CNCULT4.CPP index 221d6da48..40779caa6 100644 --- a/src/CNCULT4.CPP +++ b/src/CNCULT4.CPP @@ -142,9 +142,9 @@ LOCAL RC addRep( TI rfi, char *name, RPTYCH rpTy, TI zi, IVLCH freq, SI putAtEnd UCH *fs; RC rc; - E( RiB.add( &rp, WRN) ) // add report input record (ancrec.cpp) / return if error - strncpy( rp->name, name, sizeof(ANAME)-1 ); // record name, for like/alter/delete - rp->zi = zi; // 0, TI_SUM, or TI_ALL (or reference to a zone) + E( RiB.add( &rp, WRN) ) // add report input record (ancrec.cpp) / return if error + rp->SetName( name); // record name, for like/alter/delete + rp->zi = zi; // 0, TI_SUM, or TI_ALL (or reference to a zone) rp->ownTi = rfi; // reference to report file rp->rpTy = rpTy; // type of report rp->rpFreq = freq; // 0 or frequency of report @@ -1817,10 +1817,10 @@ LOCAL void addHdayDate( char *name, DOY date) // add holiday celebrated on spe { // for topPrfHday HDAY *hdi; - if (HdayiB.add( &hdi, WRN)) return; // add holiday input record (ancrec.cpp) / return if error (msg issued) - strncpy( hdi->name, name, sizeof(ANAME)-1 ); // record name, for like/alter/delete and error messages - hdi->hdDateTrue = date; // store true date - hdi->hdOnMonday = C_NOYESCH_YES; // say observe on following monday if falls on weekend + if (HdayiB.add( &hdi, WRN)) return; // add holiday input record (ancrec.cpp) / return if error (msg issued) + hdi->SetName( name); // record name, for like/alter/delete and error messages + hdi->hdDateTrue = date; // store true date + hdi->hdOnMonday = C_NOYESCH_YES; // say observe on following monday if falls on weekend // topHday will set hdDateObs. } // addHdayDate //--------------------------------------------------------------------------------------------------------------------------- @@ -1829,9 +1829,9 @@ LOCAL void addHdayRule( char *name, HDAYCASECH hdCase, DOWCH dow, MONTH mon) { // for topPrfHday HDAY *hdi; - if (HdayiB.add( &hdi, WRN)) return; // add holiday input record (ancrec.cpp) / return if error (msg issued) - strncpy( hdi->name, name, sizeof(ANAME)-1 ); // record name, for like/alter/delete - hdi->hdCase = hdCase; // store arguments + if (HdayiB.add( &hdi, WRN)) return; // add holiday input record (ancrec.cpp) / return if error (msg issued) + hdi->SetName( name); // record name, for like/alter/delete + hdi->hdCase = hdCase; // store arguments hdi->hdDow = dow; hdi->hdMon = mon; // topHday will set hdDateTrue and hdDateObs. diff --git a/src/CNDTYPES.DEF b/src/CNDTYPES.DEF index d112752cc..75eace263 100644 --- a/src/CNDTYPES.DEF +++ b/src/CNDTYPES.DEF @@ -470,6 +470,11 @@ PIPESEGP -- "class PIPESEG*" 4 none SCALABLE_SP "Scalable_SP" // scalable type for autosized standard design } +*choicb WHRESTYCH { // resistance heater types + TYPICAL "Typical" + SWINGTANK "SwingTank" +} + *choicb DHWEUCH { // hot end uses FAUCET "Faucet" SHOWER "Shower" diff --git a/src/CNFIELDS.DEF b/src/CNFIELDS.DEF index 27dad5eb0..d0e5ff2c8 100644 --- a/src/CNFIELDS.DEF +++ b/src/CNFIELDS.DEF @@ -176,6 +176,7 @@ WHTYPECH WHTYPECH LMNONE UNNONE WHHEATSRCCH WHHEATSRCCH LMNONE UNNONE WSCALCMODECH WSCALCMODECH LMNONE UNNONE WHASHPTYCH WHASHPTYCH LMNONE UNNONE +WHRESTYCH WHRESTYCH LMNONE UNNONE DHWEUCH DHWEUCH LMNONE UNNONE DHWEUXCH DHWEUXCH LMNONE UNNONE DHWBRANCHMODELCH DHWBRANCHMODELCH LMNONE UNNONE diff --git a/src/CNLOADS.CPP b/src/CNLOADS.CPP index 35cc16507..7801c5eaa 100644 --- a/src/CNLOADS.CPP +++ b/src/CNLOADS.CPP @@ -2055,10 +2055,10 @@ void RSYS::rs_RddiInit() // init before each autosize design day ITERATION } } // RSYS::rs_RddiInit //----------------------------------------------------------------------------- -RC RSYS::rs_endP1DsdIter() +RC RSYS::rs_endP1DsdIter( // autosizing end of day + int auszMode) // rsmHEAT, rsmCOOL { RC rc = RCOK; - int auszMode = rs_IsAutoSizing(); if (auszMode == rsmHEAT) { // note: rs_fxCapHDay = 20 if no load float f = rs_fxCapHAsF / max( rs_fxCapHDay, .01f); @@ -2107,13 +2107,10 @@ RC RSYS::rs_endP1DsdIter() float fX = bracket( .9f, errX+1.f, 1.1f); rs_cap95 *= fX; -#if 1 - if (rs_cap95 < 1200.f) - rs_cap95 = 1200.f; // never < 0.1 ton - else -#endif - if (rs_cap95 < rs_auszC.az_b) - rs_cap95 = rs_auszC.az_b; // never < previous design day peak + float cap95min = max(rs_auszC.az_b, 1200.f); + if (rs_cap95 < cap95min) + rs_cap95 = cap95min; // never < 0.1 ton + // never < previous design day peak } setToMax( rs_auszC.ldPk, rs_cap95); // peak @@ -2819,8 +2816,13 @@ RC RSYS::rs_AfterHour() if (Top.isEndDay) { // last step of day - rc = rs_endP1DsdIter(); + int auszMode = rs_IsAutoSizing(); + if (auszMode != rsmOFF) + rc = rs_endP1DsdIter( auszMode); } + + // prior interval values: none + return rc; } // RSYS::rs_AfterHour //----------------------------------------------------------------------------- @@ -4336,15 +4338,21 @@ double RSYS::rs_ZoneAirRequest( // air quantity needed by zone if (znSupReq > 1.e10) // znSupReq = DBL_MAX if supplyDT is tiny znSupReq = rs_amf; else if (znSupReq < 0.) - // reverse flow (caused by "backwards" supplyDT) + // reverse flow + // caused by "flipped" supply DT + // due to e.g. big duct losses znSupReq = -#if 1 +#if 1 // attempt to fix small load sizing, 7-16-2021 + 2. * rs_amf; // request "a lot" +#else +#if 1 // unknown date Top.tp_autoSizing #else Top.tp_pass1A #endif ? 1. // autosize warmup: ignore : 2. * rs_amf; // simulation: request "a lot" +#endif double znAmfSys = znSupReq / rs_ducts[ rs_DsHC()].ductLkXF[ 0]; rs_amfReq[ iAux] += znAmfSys; // all-zone total at system @@ -4827,12 +4835,13 @@ static RC loadsIzxSh2() // interzone transfers, part 2 return rc; } // ::loadsIzxSh2 //-------------------------------------------------------------------- -static RC loadsXFans() +static RC loadsXFans() // SIMULATE zone exhaust fans (xfans) { + RC rc = RCOK; ZNR* zp; RLUP( ZrB, zp) - zp->zn_XFan(); - return RCOK; + rc |= zp->zn_XFan(); + return rc; } // ::loadsXFans //-------------------------------------------------------------------- RC ZNR::zn_XFan() // zone exhaust fan calcs (hourly) diff --git a/src/CNRECS.DEF b/src/CNRECS.DEF index c1a1dec3b..9a40fb214 100644 --- a/src/CNRECS.DEF +++ b/src/CNRECS.DEF @@ -3068,7 +3068,7 @@ RECORD RSYS "RSYS" *RAT // residential HVAC system *declare "void rs_RddiInit();" *declare "RC rs_pass1AtoB();" *declare "RC rs_begP1b();" -*declare "RC rs_endP1DsdIter();" +*declare "RC rs_endP1DsdIter( int auszMode);" *declare "RC rs_endAutosize();" *declare "void rs_AuszFinal();" *declare "float rs_ClgCapNomTons( float nearest=-1.f);" @@ -3939,7 +3939,7 @@ RECORD HPWHLINK "HPWHLink" *SUBSTRUCT // Ecotope's HPWH tank and heater *declare "static int hw_HPWHInfo( WHASHPTYCH ashpTy, int& attrs);" *declare "static int hw_IsAttr( WHASHPTYCH ashpTy, int attr) { int attrs; return hw_HPWHInfo( ashpTy, attrs) >= 0 ? (attr & attrs) != 0 : -1; }" *declare "RC hw_InitPreset( WHASHPTYCH ashpTy);" -*declare "RC hw_InitResistance( float vol, float EF, float resHt, float resHt2);" +*declare "RC hw_InitResistance( WHRESTYCH resTy, float vol, float EF, float resHt, float resHt2, float tUse);" *declare "RC hw_InitTank( float vol);" *declare "RC hw_AdjustUAIf( float UA, float insulR, float tankCount=1.f);" *declare "RC hw_InitFinalize( float inHtSupply, float inHtLoopRet);" @@ -4073,8 +4073,10 @@ RECORD DHWHEATER "DHWHeater" *RAT // input / runtime DHW heater *declare "int wh_GetFunction() const { return wh_fcn & 0xff; }" *declare "int wh_SetFunction();" *declare "bool wh_IsLastHeater() const { return (wh_fcn & whfcnLASTHEATER) != 0; }" - *i WHASHPTYCH wh_ashpTy; // air source heat pump (HPWH) type, required iff ASHPX, else ignored + *i WHASHPTYCH wh_ashpTy; // air source heat pump (HPWH) type, required iff wh_heatSrc=ASHPX, else ignored // C_WHASHPTYCH_xxx, etc + *i WHRESTYCH wh_resTy; // resistance heater type, used iff wh_heatSrc=_ELRESX, else ignored + // C_WHRESTYCH_xxx, etc *i TI wh_znTi; // DHWHEATER location zone re tank loss // 0 iff wh_tEx being used // heat losses go to half to zone air / half radiant diff --git a/src/CUL.CPP b/src/CUL.CPP index 1fd109cbe..dd03426b2 100644 --- a/src/CUL.CPP +++ b/src/CUL.CPP @@ -1293,7 +1293,7 @@ x name, strlen(name), sizeof(ANAME)-1 ); New record is all 0's (inits FsSET, FsVAL, FsERR, FsFROZ, etc to 0). Default data can be supplied via STAR entry: see nuCult. Still??7-92 */ if (name) // if name given - strncpy( e->name, name, sizeof(ANAME)-1); // copy name into record + e->SetName( name); // copy name into record // .fileIx & .line are set below, after LIKE/COPY/USETYPE // do LIKE/COPY if given: look up record in this basAnc, copy data after name diff --git a/src/DHWCalc.cpp b/src/DHWCalc.cpp index fd8d88e76..59af28eec 100644 --- a/src/DHWCalc.cpp +++ b/src/DHWCalc.cpp @@ -2661,17 +2661,25 @@ RC HPWHLINK::hw_InitGeneric( // init HPWH as generic ASHP } // HPWHLINK::hw_InitGeneric //----------------------------------------------------------------------------- RC HPWHLINK::hw_InitResistance( // set up HPWH has EF-rated resistance heater - float vol, // tank volume, gal - float EF, // rated EF - float resHtPwr, // upper resistance heat element power, W - float resHtPwr2)// lower resistance heat element power, W + WHRESTYCH resTy, // resistance heater type + float vol, // tank volume, gal + float EF, // rated EF + float resHtPwr, // upper resistance heat element power, W + float resHtPwr2, // lower resistance heat element power, W + float tUse) // use temp, F // returns RCOK iff success { RC rc = RCOK; - if (hw_pHPWH->HPWHinit_resTank(GAL_TO_L(max(vol, 1.f)), EF, - resHtPwr, resHtPwr2) != 0) + int ret = resTy == C_WHRESTYCH_SWINGTANK + ? hw_pHPWH->HPWHinit_resSwingTank(GAL_TO_L(max(vol, 1.f)), EF, + resHtPwr, resHtPwr2, F_TO_C( tUse)) + : hw_pHPWH->HPWHinit_resTank(GAL_TO_L(max(vol, 1.f)), EF, + resHtPwr, resHtPwr2); + + if (ret) rc |= RCBAD; + return rc; } // HPWHLINK::hw_InitResistance //----------------------------------------------------------------------------- @@ -3614,7 +3622,7 @@ RC DHWHEATER::wh_CkF() // water heater input check / default else if (wh_heatSrc == C_WHHEATSRCCH_ASHPX) { // STRGSML or BUILTUP HPWH model // TODO: more specific checking for ASHPX - ignoreN( whenHs, DHWHEATER_LDEF, DHWHEATER_RESHTPWR, DHWHEATER_RESHTPWR2, 0); + ignoreN( whenHs, DHWHEATER_LDEF, DHWHEATER_RESHTPWR, DHWHEATER_RESHTPWR2, DHWHEATER_RESTY, 0); RC rc1 = requireN( whenHs, DHWHEATER_ASHPTY, 0); rc |= rc1; if (!rc1) @@ -3703,7 +3711,7 @@ RC DHWHEATER::wh_CkF() // water heater input check / default if (IsSet(DHWHEATER_VOLRUNNING)) { if (!wh_CanSetVolFromVolRunning()) - rc |= disallow(DHWHEATER_VOLRUNNING, whenTy); + rc |= disallow(DHWHEATER_VOLRUNNING, whenHs); else if (IsSet(DHWHEATER_VOL)) rc |= oer("whVol and whVolRunning cannot both be specified"); } @@ -3753,13 +3761,14 @@ int DHWHEATER::wh_CanSetVolFromVolRunning() const // can volume be derived from // -1: maybe (re HPWH pending HPWHLINK setup) { int ret = 0; - if (wh_IsHPWHModel()) + if (wh_heatSrc == C_WHHEATSRCCH_ASHPX) { ret = -1; - if (wh_HPWH.hw_HasCompressor() + if (wh_HPWH.hw_HasCompressor() // redundant *but* false if !hw_pHPWH && !wh_HPWH.hw_pHPWH->isTankSizeFixed()) ret = 1; } // else + // Other type (including C_WHHEATSRCCH_ELRESX): volRunning not supported // ret = 0; return ret; @@ -4105,7 +4114,8 @@ RC DHWHEATER::wh_HPWHInit() // initialize HPWH model if (wh_heatSrc == C_WHHEATSRCCH_ELRESX) { // resistance tank (no preset) rc |= wh_HPWH.hw_InitResistance( - wh_vol, wh_EF, wh_resHtPwr, wh_resHtPwr2); + wh_resTy, wh_vol, wh_EF, wh_resHtPwr, wh_resHtPwr2, pWS->ws_tUse); + // bVolMaybeModifiable = true; } else if (wh_ashpTy == C_WHASHPTYCH_GENERIC) { // generic HPWH (no preset) @@ -4160,17 +4170,16 @@ RC DHWHEATER::wh_HPWHInit() // initialize HPWH model else if (IsSet(DHWHEATER_VOLRUNNING)) { // semi-redundant check if (!wh_CanSetVolFromVolRunning()) - rc |= ooer(DHWHEATER_VOLRUNNING, "no can do"); + oInfo("%s is ignored (tank volume is fixed at %0.0f gal)", + what, wh_HPWH.hw_pHPWH->getTankSize(HPWH::UNITS_GAL)); else - { - RC rc2 = wh_HPWH.hw_DeriveVolFromVolRunning( + { RC rc2 = wh_HPWH.hw_DeriveVolFromVolRunning( wh_volRunning, wh_heatingCap, pWS->ws_tSetpointDes - pWS->ws_tInletDes, vol); if (rc2) rc |= err(PERR, "DHWHEATER::wh_HPWHInit: hw_CanSetVolFromVolRunning() inconsistency."); - // else wh_vol already known } } else // IsSet( DHWHEATER_VOL) diff --git a/src/IMPF.CPP b/src/IMPF.CPP index 5dd60511d..b57c4fe58 100644 --- a/src/IMPF.CPP +++ b/src/IMPF.CPP @@ -442,7 +442,7 @@ LOCAL RC impFcnFile( // find or add IFFNM record *pIffnmi = iffnm->ss; // return added record subscript // use IMPORTFILE given object name as record name, for later association with IMPORTFILEs. - strncpy( iffnm->name, impfName, sizeof(ANAME)-1 ); + iffnm->SetName( impfName); // put source file index and line in record so (first) use can be reported in errmsg eg if no IMPF for IFFNM. iffnm->fileIx = fileIx; diff --git a/src/STRPAK.CPP b/src/STRPAK.CPP index eb7ca5037..8d9a2f9d0 100644 --- a/src/STRPAK.CPP +++ b/src/STRPAK.CPP @@ -560,7 +560,7 @@ x#endif // ==================================================================== char * FC strtemp( // allocate n+1 bytes in temp string buffer (Tmpstr[]) - SI n ) // number of bytes needed, less 1 (1 added here eg for null, 9-89) + size_t n ) // number of bytes needed, less 1 (1 added here eg for null) // returns pointer to space in Tmpstr : Valid for a (very) short while @@ -1038,8 +1038,13 @@ char* strTranslateEscapes( // translate standard escape sequences return d; } // strTranslateEscapes //---------------------------------------------------------------------------- -char* strCatIf( char* d, size_t dSize, const char *brk, const char* s) -// conditional concatenate +char* strCatIf( // conditional concatenation + char* d, // input / destination + size_t dSize, // dim of d (including space for \0) + const char* brk, // break, e.g. "-" or ", " + const char* s, // concat string + int options /*=0*/) // options + // 1: attempt to truncate d if dSize exceeded // adds break string iff both d and s non-null -- // d s result // --- --- ------- @@ -1048,16 +1053,31 @@ char* strCatIf( char* d, size_t dSize, const char *brk, const char* s) // "" "s" "s" // "d" "s" "d" + brk + "s" -// returns d +// returns NULL if combined result length exceeds dSize +// else d (updated) { +// 7-2021 prior code used strcat_s. However, library code +// throws on too long altho docs say it returns errno_t. +// Modified to check length here and use strcat() if ( s && *s) // if s contains a string - { if (*d) // if d not "" - strcat_s( d, dSize, brk); // add break string - strcat_s( d, dSize, s); // add s + { size_t dLen = strlen(d); + size_t len = dLen ? dLen + strlen(brk) + strlen(s) : 0; + if (len >= dSize) + { size_t dLenMax = dSize - (len - dLen) - 1; + if (dLen < dLenMax || !(options & 1)) + return NULL; // result does not fit + else + d[ dLenMax] = '\0'; + } + if (*d) // if d not "" + strcat(d, brk); // add break string + strcat( d, s); // add s } return d; } // strCatIf //------------------------------------------------------------------------- +// +//------------------------------------------------------------------------- char* strPluralize( // form plural of a word char* d, // returned: maybe pluralized word (case generally // preserved) diff --git a/src/STRPAK.H b/src/STRPAK.H index 14eacd806..6a2c58e10 100644 --- a/src/STRPAK.H +++ b/src/STRPAK.H @@ -84,7 +84,7 @@ char * FC strtBsDouble( char *s); char * FC strBsUnDouble( char *s); char * FC strsave( const char *s); char * strsave( char* &p, const char *s); -char * FC strtemp( SI n); +char * FC strtemp( size_t n); char * FC strtempPop( char *anS); char * FC strtmp( const char *s); char * CDEC strtcat( const char *s, ... ); @@ -137,7 +137,7 @@ BOOL IsBlank( const char* s, int len=999999); char* strFill( char* d, const char* s, int len=-1); const char* strSuffix(int n, int options = 0); char* strTranslateEscapes( char* d, const char* s=NULL); -char* strCatIf( char* d, size_t dSize, const char* brk, const char* s); +char* strCatIf( char* d, size_t dSize, const char* brk, const char* s, int options=0); char* strDeBar( char* d, const char* s=NULL); char* strDeQuote( char* d, const char* s=NULL); char* strDeWS( char* d, const char* s=NULL); diff --git a/test/DHW_MFSizing.cse b/test/DHW_MFSizing.cse index f38000026..857a30b25 100644 --- a/test/DHW_MFSizing.cse +++ b/test/DHW_MFSizing.cse @@ -9361,6 +9361,7 @@ DHWSYS "dhwsys1" DHWLOOPHEATER "dhwlphtr-LoopTank2" whType = "SmallStorage" // Type of water heater whHeatSrc = "ResistanceX" // Fuel source for water heater + whResType = "Swingtank" whMult = 1 // Water heater multiplier whXBUEndUse = "User2" // enduse to accumulate ASHPX backup heat elec use whEF = 0.97 // Water heater energy factor (for small storage & instantaneous) diff --git a/test/ref/DHW_MFSIZING.REP b/test/ref/DHW_MFSIZING.REP index 5fb77e372..48d9729b0 100644 --- a/test/ref/DHW_MFSIZING.REP +++ b/test/ref/DHW_MFSIZING.REP @@ -8,7 +8,7 @@ MF Sanden ! Log for Run 001: -! CSE 0.893.0+dhwszfctr.93fb8b5.1 for Win32 console +! CSE 0.894.0+dhwloopheater.80f76e6.1 for Win32 console @@ -60,7 +60,7 @@ MF Sanden ------------------------------------------------------------------------------ -! dhw_mfsizing 001 Fri 02-Jul-21 10:04:35 am Page 1 +! dhw_mfsizing 001 Wed 14-Jul-21 2:24:23 pm Page 1 @@ -123,7 +123,7 @@ Input for Run 001: # #define RefrTemp_WEH hourval( 0.0171,0.0156,0.0155,0.0154,0.0175,0.0181,0.0212,0.0201,0.0130,0.0176,0.0165,0.0171,0.0177,0.0176,0.0182,0.0139,0.0197,0.0180,0.0121,0.0135,0.0154,0.0150,0.0205,0.0129) ------------------------------------------------------------------------------ -! dhw_mfsizing 001 Fri 02-Jul-21 10:04:35 am Page 2 +! dhw_mfsizing 001 Wed 14-Jul-21 2:24:23 pm Page 2 @@ -186,7 +186,7 @@ MF Sanden wsShowerDayWasteF = 3 // used to determine ratio of Shower/Faucet water waste ------------------------------------------------------------------------------ -! dhw_mfsizing 001 Fri 02-Jul-21 10:04:35 am Page 3 +! dhw_mfsizing 001 Wed 14-Jul-21 2:24:23 pm Page 3 @@ -210,6 +210,7 @@ MF Sanden DHWLOOPHEATER "dhwlphtr-LoopTank2" whType = "SmallStorage" // Type of water heater whHeatSrc = "ResistanceX" // Fuel source for water heater + whResType = "Swingtank" whMult = 1 // Water heater multiplier whXBUEndUse = "User2" // enduse to accumulate ASHPX backup heat elec use whEF = 0.97 // Water heater energy factor (for small storage & instantaneous) @@ -246,16 +247,16 @@ MF Sanden wgFNoDraw = 0.4 // DHW loop segment fraction of hour when no draw flow occurs, frac wgExT = 70 // ambient temperature around DHW loop segment, °F wgExH = 1.5 // DHW loop pipe exterior surface conductance, Btuh/ft2-°F - ------------------------------------------------------------------------------ -! dhw_mfsizing 001 Fri 02-Jul-21 10:04:35 am Page 4 +! dhw_mfsizing 001 Wed 14-Jul-21 2:24:23 pm Page 4 MF Sanden ------------------------------------------------------------------------------ + DHWLOOPBRANCH "dhwlpbr2-DHW System 1" wbMult = 4 // DHW loop branch multiplier wbSize = 1 // DHW loop branch nominal pipe size (diameter), in @@ -309,16 +310,16 @@ MF Sanden wgExH = 1.5 // DHW loop pipe exterior surface conductance, Btuh/ft2-°F DHWLOOPSEG "dhwlpseg6-DHW System 1" - wgTy = "Return" // DHW loop segment type ------------------------------------------------------------------------------ -! dhw_mfsizing 001 Fri 02-Jul-21 10:04:35 am Page 5 +! dhw_mfsizing 001 Wed 14-Jul-21 2:24:23 pm Page 5 MF Sanden ------------------------------------------------------------------------------ + wgTy = "Return" // DHW loop segment type wgSize = 0.75 // DHW loop segment nominal pipe size (diameter), in wgLength = 17.015 // DHW loop segment length, ft wgInsulThk = 1.5 // DHW loop segment insulation thickness, in @@ -372,16 +373,16 @@ MF Sanden DHWSYS "dhwsys-2ndFlrTwoBR DU" wsCentralDHWSYS = "dhwsys1" // Central DHWSYS that this DHWSYS provides load info for wsDayUse = DHWMF2BR03 // Day use profile object - wsWF = 1 // Water usage waste factor (applies to both old and new style use/profiles), frac ------------------------------------------------------------------------------ -! dhw_mfsizing 001 Fri 02-Jul-21 10:04:35 am Page 6 +! dhw_mfsizing 001 Wed 14-Jul-21 2:24:23 pm Page 6 MF Sanden ------------------------------------------------------------------------------ + wsWF = 1 // Water usage waste factor (applies to both old and new style use/profiles), frac wsSDLM = 1.16233 // Standard distribution loss multiplier wsDSM = 1 // Distribution system multiplier @@ -396,8 +397,7 @@ MF Sanden RUN // prerun 1 = derive daywaste factors # #define WHCHAR(h) REPORT rptype=UDT rpFreq=YEAR rpTitle = "DHWHEATER Primary" \ -# ReportCol colhead = "loadMax" colVal = @DHWSYS[ 1].loadMax colWid=8 - +# ReportCol colhead = "loadMax" @@ -438,7 +438,7 @@ MF Sanden ------------------------------------------------------------------------------ -! dhw_mfsizing 001 Fri 02-Jul-21 10:04:35 am Page 7 +! dhw_mfsizing 001 Wed 14-Jul-21 2:24:23 pm Page 7 @@ -459,20 +459,20 @@ Monthly Energy Use, meter "MtrElec" Mon Tot Clg Htg HPBU Dhw DhwBU DhwMFL FanC FanH FanV Fan Aux Proc Lit Rcp Ext Refr Dish Dry Wash Cook User1 User2 BT PV --- ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ -Jan 3315.9 0 0 0 3265.2 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Feb 2899.9 0 0 0 2854.1 0 45.859 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Mar 3037.3 0 0 0 2986.6 0 50.704 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Apr 2921.3 0 0 0 2872.2 0 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -May 2427.5 0 0 0 2376.7 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Jun 2254.8 0 0 0 2205.7 0 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Jul 2153.6 0 0 0 2102.8 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Aug 2145.6 0 0 0 2094.8 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Sep 2066.8 0 0 0 2017.6 0 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Oct 2271.8 0 0 0 2221.0 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Nov 2606.0 0 0 0 2556.8 0 49.203 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Dec 3015.0 0 0 0 2964.2 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jan 3206.2 0 0 0 3155.4 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Feb 2796.1 0 0 0 2750.2 0 45.859 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Mar 2975.6 0 0 0 2924.9 0 50.704 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Apr 2829.6 0 0 0 2780.4 0 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +May 2386.0 0 0 0 2335.2 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jun 2164.9 0 0 0 2115.7 0 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jul 2069.8 0 0 0 2019.0 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Aug 2075.2 0 0 0 2024.5 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Sep 1987.9 0 0 0 1938.8 0 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Oct 2214.1 0 0 0 2163.3 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Nov 2523.6 0 0 0 2474.4 0 49.203 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Dec 2948.8 0 0 0 2898.1 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Yr 31116 0 0 0 30518 0 597.81 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Yr 30178 0 0 0 29580 0 597.81 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -480,20 +480,20 @@ Monthly Energy Use, meter "MtrElecLH" Mon Tot Clg Htg HPBU Dhw DhwBU DhwMFL FanC FanH FanV Fan Aux Proc Lit Rcp Ext Refr Dish Dry Wash Cook User1 User2 BT PV --- ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ -Jan 934.15 0 0 0 934.15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Feb 842.76 0 0 0 842.76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Mar 934.43 0 0 0 934.43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Apr 920.11 0 0 0 920.11 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -May 1007.4 0 0 0 1007.4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Jun 934.94 0 0 0 934.94 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Jul 958.01 0 0 0 958.01 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Aug 978.84 0 0 0 978.84 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Sep 944.39 0 0 0 944.39 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Oct 995.06 0 0 0 995.06 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Nov 940.98 0 0 0 940.98 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Dec 939.36 0 0 0 939.36 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jan 1129.3 0 0 0 1129.3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Feb 1029.5 0 0 0 1029.5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Mar 1139.6 0 0 0 1139.6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Apr 1093.0 0 0 0 1093.0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +May 1144.3 0 0 0 1144.3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jun 1145.5 0 0 0 1145.5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jul 1163.2 0 0 0 1163.2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Aug 1157.7 0 0 0 1157.7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Sep 1133.0 0 0 0 1133.0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Oct 1164.0 0 0 0 1164.0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Nov 1131.2 0 0 0 1131.2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Dec 1139.8 0 0 0 1139.8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Yr 11330 0 0 0 11330 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Yr 13570 0 0 0 13570 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -501,7 +501,7 @@ Yr 11330 0 0 0 11330 0 0 0 0 0 0 ------------------------------------------------------------------------------ -! dhw_mfsizing 002 Fri 02-Jul-21 10:04:36 am Page 8 +! dhw_mfsizing 002 Wed 14-Jul-21 2:24:25 pm Page 8 @@ -512,13 +512,13 @@ MF Sanden ! Log for Run 002: -! CSE 0.893.0+dhwszfctr.93fb8b5.1 for Win32 console +! CSE 0.894.0+dhwloopheater.80f76e6.1 for Win32 console Input for Run 001: -\ +colVal = @DHWSYS[ 1].loadMax colWid=8 \ # ReportCol colhead = "loadMaxDur" colVal = @DHWSYS[ 1].loadMaxDur colWid=10 \ # ReportCol colhead = "loadMaxAvg" colVal = @DHWSYS[ 1].loadMax/@DHWSYS[ 1].loadMaxDur colWid=10 \ # ReportCol colhead = "drawMax" colVal = @DHWSYS[ 1].drawMax colWid=8 \ @@ -564,7 +564,7 @@ Input for Run 001: ------------------------------------------------------------------------------ -! dhw_mfsizing 002 Fri 02-Jul-21 10:04:36 am Page 9 +! dhw_mfsizing 002 Wed 14-Jul-21 2:24:25 pm Page 9 @@ -585,20 +585,20 @@ Monthly Energy Use, meter "MtrElec" Mon Tot Clg Htg HPBU Dhw DhwBU DhwMFL FanC FanH FanV Fan Aux Proc Lit Rcp Ext Refr Dish Dry Wash Cook User1 User2 BT PV --- ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ -Jan 3151.6 0 0 0 3092.9 7.847 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Feb 2734.2 0 0 0 2673.4 15.011 45.859 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Mar 2914.9 0 0 0 2858.1 6.091 50.704 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Apr 2747.5 0 0 0 2694.3 4.094 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -May 2309.4 0 0 0 2258.6 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Jun 2110.7 0 0 0 2061.6 0 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Jul 2025.7 0 0 0 1972.4 2.581 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Aug 2007.7 0 0 0 1956.9 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Sep 1914.8 0 0 0 1865.7 0 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Oct 2125.4 0 0 0 2071.7 2.937 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Nov 2461.8 0 0 0 2411.9 0.682 49.203 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Dec 2863.5 0 0 0 2804.6 8.214 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jan 3069.8 0 0 0 3014.3 4.776 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Feb 2666.3 0 0 0 2607.5 12.964 45.859 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Mar 2829.2 0 0 0 2778.5 0 50.704 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Apr 2666.7 0 0 0 2614.4 3.079 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +May 2237.4 0 0 0 2186.7 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jun 2038.4 0 0 0 1985.5 3.760 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jul 1965.8 0 0 0 1912.3 2.674 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Aug 1931.6 0 0 0 1880.8 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Sep 1858.9 0 0 0 1809.8 0 49.135 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Oct 2058.3 0 0 0 2007.5 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Nov 2371.3 0 0 0 2322.1 0 49.203 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Dec 2792.7 0 0 0 2741.9 0 50.773 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Yr 29367 0 0 0 28722 47.459 597.81 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Yr 28486 0 0 0 27861 27.253 597.81 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -606,20 +606,20 @@ Monthly Energy Use, meter "MtrElecLH" Mon Tot Clg Htg HPBU Dhw DhwBU DhwMFL FanC FanH FanV Fan Aux Proc Lit Rcp Ext Refr Dish Dry Wash Cook User1 User2 BT PV --- ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ -Jan 799.45 0 0 0 799.45 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Feb 741.42 0 0 0 741.42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Mar 804.36 0 0 0 804.36 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Apr 779.57 0 0 0 779.57 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -May 842.92 0 0 0 842.92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Jun 797.46 0 0 0 797.46 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Jul 849.46 0 0 0 849.46 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Aug 826.19 0 0 0 826.19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Sep 849.60 0 0 0 849.60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Oct 857.98 0 0 0 857.98 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Nov 783.88 0 0 0 783.88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Dec 843.81 0 0 0 843.81 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jan 984.65 0 0 0 984.65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Feb 895.17 0 0 0 895.17 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Mar 1003.1 0 0 0 1003.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Apr 967.69 0 0 0 967.69 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +May 1016.4 0 0 0 1016.4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jun 983.23 0 0 0 983.23 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Jul 1016.5 0 0 0 1016.5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Aug 1021.5 0 0 0 1021.5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Sep 994.85 0 0 0 994.85 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Oct 1012.6 0 0 0 1012.6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Nov 997.71 0 0 0 997.71 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Dec 994.89 0 0 0 994.89 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -Yr 9776.1 0 0 0 9776.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +Yr 11888 0 0 0 11888 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -627,7 +627,7 @@ Yr 9776.1 0 0 0 9776.1 0 0 0 0 0 0 ------------------------------------------------------------------------------ -! dhw_mfsizing 003 Fri 02-Jul-21 10:04:37 am Page 10 +! dhw_mfsizing 003 Wed 14-Jul-21 2:24:26 pm Page 10 @@ -638,7 +638,7 @@ MF Sanden ! Log for Run 003: -! CSE 0.893.0+dhwszfctr.93fb8b5.1 for Win32 console +! CSE 0.894.0+dhwloopheater.80f76e6.1 for Win32 console @@ -690,7 +690,7 @@ Input for Run 003: ------------------------------------------------------------------------------ -! dhw_mfsizing 003 Fri 02-Jul-21 10:04:37 am Page 11 +! dhw_mfsizing 003 Wed 14-Jul-21 2:24:26 pm Page 11 @@ -699,21 +699,21 @@ MF Sanden -! CSE 0.893.0+dhwszfctr.93fb8b5.1 for Win32 console run(s) done: Fri 02-Jul-21 10:04:39 am +! CSE 0.894.0+dhwloopheater.80f76e6.1 for Win32 console run(s) done: Wed 14-Jul-21 2:24:27 pm ! Executable: d:\cse\msvc\cse.exe -! 02-Jul-21 10:04 am (VS 14.29 2640384 bytes) (HPWH 1.14.0+master.7e0a1c1.4) +! 14-Jul-21 2:18 pm (VS 14.29 2641920 bytes) (HPWH 1.14.0+master.f3d8238.7) ! Command line: -x! -t1 dhw_mfsizing ! Input file: D:\cse\test\dhw_mfsizing.cse ! Report file: D:\cse\test\dhw_mfsizing.rep ! Timing info -- -! Input: Time = 0.85 Calls = 3 T/C = 0.2827 +! Input: Time = 0.83 Calls = 3 T/C = 0.2767 ! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000 -! Simulation: Time = 3.23 Calls = 3 T/C = 1.0757 +! Simulation: Time = 3.00 Calls = 3 T/C = 1.0010 ! Reports: Time = 0.01 Calls = 3 T/C = 0.0037 -! Total: Time = 4.09 Calls = 1 T/C = 4.0940 +! Total: Time = 3.85 Calls = 1 T/C = 3.8510 @@ -753,5 +753,5 @@ MF Sanden ------------------------------------------------------------------------------ -! dhw_mfsizing 003 Fri 02-Jul-21 10:04:37 am Page 12 +! dhw_mfsizing 003 Wed 14-Jul-21 2:24:26 pm Page 12 \ No newline at end of file