Change hpwh model enum.

src/HPWHMain.cc

@@ -862,7 +862,7 @@ bool HPWH::isNewSetpointPossible(double newSetpoint,double& maxAllowedSetpoint,s
 				returnVal = true;
 			}
 		} else if(lowestElementIndex == -1 && !hasACompressor()) { // There are no heat sources here!
-			if(hpwhModel == MODELS_StorageTank) {
+			if(hpwhModel == MODELS::StorageTank) {
 				returnVal = true; // The one pass the storage tank doesn't have any heating elements so sure change the setpoint it does nothing!
 			} else {
 				why = "There aren't any heat sources to check the new setpoint against!";
@@ -1977,7 +1977,7 @@ double HPWH::getLocationTemp_C() const {
 	return locationTemperature_C;
 }
 
-int HPWH::getHPWHModel() const {
+HPWH::MODELS HPWH::getHPWHModel() const {
 	return hpwhModel;
 }
 int HPWH::getCompressorCoilConfig() const {
@@ -2811,7 +2811,7 @@ int HPWH::checkInputs() {
 	int returnVal = 0;
 	//use a returnVal so that all checks are processed and error messages written
 
-	if(getNumHeatSources() <= 0 && hpwhModel != MODELS_StorageTank) {
+	if(getNumHeatSources() <= 0 && hpwhModel != MODELS::StorageTank) {
 		if(hpwhVerbosity >= VRB_reluctant) {
 			msg("You must have at least one HeatSource.\n");
 		}
@@ -3515,7 +3515,7 @@ int HPWH::HPWHinit_file(string configFile) {
 
 
 	//take care of the non-input processing
-	hpwhModel = MODELS_CustomFile;
+	hpwhModel = MODELS::CustomFile;
 
 	tankTemps_C.resize(num_nodes);
 	resetTankToSetpoint();

src/HPWHMain.hh

@@ -57,7 +57,7 @@ public:
 						  every x minutes, where x is defined by timer_TOT. */
 	};
 
-	enum MODELS;
+	enum class MODELS;
 
 	///specifies the modes for writing output
 	///the specified values are used for >= comparisons, so the numerical order is relevant
@@ -69,7 +69,6 @@ public:
 		VRB_emetic = 30      /**< print all the things  */
 	};
 
-
 	enum UNITS{
 		UNITS_C,          /**< celsius  */
 		UNITS_F,          /**< fahrenheit  */
@@ -499,7 +498,7 @@ public:
 	/**< get the heat content of the tank, relative to zero celsius
 	 * returns using kilojoules */
 
-	int getHPWHModel() const;
+	MODELS getHPWHModel() const;
 	/**< get the model number of the HPWHsim model number of the hpwh */
 
 	int getCompressorCoilConfig() const;