CSE 0.830

HPWH 1.3.3

Author: chipbarnaby

src/csevrsn.h

@@ -14,14 +14,15 @@
 // version # for current build
 // change ONLY here
 #define CSEVRSN_MAJOR 0
-#define CSEVRSN_MINOR 829
+#define CSEVRSN_MINOR 830
 
 // version # as quoted text ("x.xxx")
 #define CSEVRSN_TEXT MAKE_LIT(CSEVRSN_MAJOR##.##CSEVRSN_MINOR)
 
 // ONLY comments below here
 
 /* History:
+   0.830: HPWH 1.3.3 (rev GE2014_80DR); committed 4-8-2017
    0.829: HPWH 1.3.2; additional HPWH types; ASHP COP17 bug fix, committed 4-3-2017
    0.828: Top.exShadeModel; HPWH 1.3.1; add'l HPWH types, committed 3-24-2017
    0.827: tdv file error handling; Penumbra only-if-needed, committed 3-16-2017

vendor/hpwh/HPWH.cc

@@ -54,7 +54,7 @@ const float HPWH::HEATDIST_MINVALUE = 0.0001f;
 const float HPWH::UNINITIALIZED_LOCATIONTEMP = -500.f;
 
 //ugh, this should be in the header
-const std::string HPWH::version_maint = "2";
+const std::string HPWH::version_maint = "3";
 
 #define SETPOINT_FIX	// #define to include fixes for
 						// setpoint-below-water-temp issues
@@ -4106,8 +4106,8 @@ int HPWH::HPWHinit_presets(MODELS presetNum) {
 
 		//logic conditions
 		// resistiveElementTop.addTurnOnLogic(HeatSource::ONLOGIC_topThird, dF_TO_dC(20));
-		resistiveElementTop.addTurnOnLogic(HeatSource::ONLOGIC_topThird_absolute, F_TO_C(105));
-		resistiveElementTop.addShutOffLogic(HeatSource::OFFLOGIC_topNodeMaxTemp, F_TO_C(116.6358));
+		resistiveElementTop.addTurnOnLogic(HeatSource::ONLOGIC_topThird_absolute, F_TO_C(87));
+		// resistiveElementTop.addShutOffLogic(HeatSource::OFFLOGIC_topNodeMaxTemp, F_TO_C(116.6358));
 
 		compressor.addTurnOnLogic(HeatSource::ONLOGIC_bottomThird, dF_TO_dC(33.6883));
 		compressor.addTurnOnLogic(HeatSource::ONLOGIC_standby, dF_TO_dC(11.0648));