Merge pull request #402 from cse-sim/chdhwfix

Fixe CHDHW heating duct loss

Author: chipbarnaby

src/cnloads.cpp

@@ -6450,6 +6450,7 @@ x				rs_inPrimary = rs_outSen / (rs_effHt * rs_PLF);
 
 			rs_outFan = rs_runF * fanPwr * Top.tp_subhrDur * BtuperWh;
 			rs_outSen = max(0., rs_outSenTot - rs_outFan);		// net -> gross
+			runFFan = rs_runF;
 
 			// flow (gpm) needed for gross output
 			float waterVolFlow = rs_pCHDHW->hvt_WaterVolFlow(rs_outSen, rs_tCoilEW);

test/chdhw.cse

@@ -6679,15 +6679,18 @@ RSYS   "rsys1"
    rsSrcSideLoadMtr = "MtrSSLoads"
 
 
-#if 1
-#define DUCTAF 0
-#define DUCTLF 0
+// optionally 0-out duct losses
+// #define DUCTAF 0
+// #define DUCTLF 0
+
 #if !defined( DUCTAF)
 #define DUCTAF 1
 #endif
+
 #if !defined( DUCTR)
 #define DUCTR 4
 #endif
+
 #if !defined( DUCTLF)
 #define DUCTLF 1
 #endif
@@ -6712,7 +6715,6 @@ RSYS   "rsys1"
       dsAdjZn = "Attic-atc"
       dsInsulR = DUCTR
       dsLeakF = .1 * DUCTLF
-#endif
 
 DELETE Report "eb"    // move from end of CSE file