Merge pull request #161 from EcotopeResearch/sanco2

Sanden -> SANCO2 rebrand
bigladder · May 23, 2023 · fe7d67f · fe7d67f
2 parents eb22af1 + 1854d73
commit fe7d67f
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 43 deletions.
diff --git a/src/HPWH.cc b/src/HPWH.cc
@@ -3339,7 +3339,7 @@ void HPWH::HeatSource::addHeat(double externalT_C, double minutesToRun) {
 	break;
 
 	case CONFIG_EXTERNAL:
-		//Else the heat source is external. Sanden system is only current example
+		//Else the heat source is external. SANCO2 system is only current example
 		//capacity is calculated internal to this function, and cap/input_BTUperHr, cop are outputs
 		this->runtime_min = addHeatExternal(externalT_C, minutesToRun, cap_BTUperHr, input_BTUperHr, cop);
 		break;

diff --git a/src/HPWH.in.hh b/src/HPWH.in.hh
@@ -70,43 +70,51 @@ class HPWH {
 
   ///specifies the allowable preset HPWH models
   ///values may vary - names should be used
-  enum MODELS {
-	  // these models are used for testing purposes
-	  MODELS_restankNoUA = 1,       /**< a simple resistance tank, but with no tank losses  */
-	  MODELS_restankHugeUA = 2,     /**< a simple resistance tank, but with very large tank losses  */
-	  MODELS_restankRealistic = 3,  /**< a more-or-less realistic resistance tank  */
-	  MODELS_basicIntegrated = 4,   /**< a standard integrated HPWH  */
-	  MODELS_externalTest = 5,      /**< a single compressor tank, using "external" topology  */
-
-	  // these models are based on real tanks and measured lab data
-	  // AO Smith models
-	  MODELS_AOSmithPHPT60 = 102,         /**< this is the Ecotope model for the 60 gallon Voltex HPWH  */
-	  MODELS_AOSmithPHPT80 = 103,         /**<  Voltex 80 gallon tank  */
-	  MODELS_AOSmithHPTU50 = 104,    /**< 50 gallon AOSmith HPTU */
-	  MODELS_AOSmithHPTU66 = 105,    /**< 66 gallon AOSmith HPTU */
-	  MODELS_AOSmithHPTU80 = 106,    /**< 80 gallon AOSmith HPTU */
-	  MODELS_AOSmithHPTU80_DR = 107,    /**< 80 gallon AOSmith HPTU */
-	  MODELS_AOSmithCAHP120 = 108, /**< 12 gallon AOSmith CAHP commercial grade */
-
-	  MODELS_AOSmithHPTS50 = 1101,	 /**< 50 gallon, AOSmith HPTS */
-	  MODELS_AOSmithHPTS66 = 1102,	 /**< 66 gallon, AOSmith HPTS */
-	  MODELS_AOSmithHPTS80 = 1103,	 /**< 80 gallon, AOSmith HPTS */
-
-	  // GE Models
-	  MODELS_GE2012 = 110,      /**<  The 2012 era GeoSpring  */
-	  MODELS_GE2014STDMode = 111,    /**< 2014 GE model run in standard mode */
-	  MODELS_GE2014STDMode_80 = 113,    /**< 2014 GE model run in standard mode, 80 gallon unit */
-	  MODELS_GE2014 = 112,           /**< 2014 GE model run in the efficiency mode */
-	  MODELS_GE2014_80 = 114,           /**< 2014 GE model run in the efficiency mode, 80 gallon unit */
-	  MODELS_GE2014_80DR = 115,           /**< 2014 GE model run in the efficiency mode, 80 gallon unit */
-	  MODELS_BWC2020_65 = 116,    /**<  The 2020 Bradford White 65 gallon unit  */
-
-
-	  // Sanden CO2 transcritical heat pump water heaters
-	  MODELS_Sanden40 = 120,        /**<  Sanden 40 gallon CO2 external heat pump  */
-	  MODELS_Sanden80 = 121,        /**<  Sanden 80 gallon CO2 external heat pump  */
-	  MODELS_Sanden_GS3_45HPA_US_SP = 122,  /**<  Sanden 80 gallon CO2 external heat pump used for MF  */
-	  MODELS_Sanden120 = 123 ,/**<  Sanden 120 gallon CO2 external heat pump  */
+	enum MODELS {
+		// these models are used for testing purposes
+		MODELS_restankNoUA = 1,       /**< a simple resistance tank, but with no tank losses  */
+		MODELS_restankHugeUA = 2,     /**< a simple resistance tank, but with very large tank losses  */
+		MODELS_restankRealistic = 3,  /**< a more-or-less realistic resistance tank  */
+		MODELS_basicIntegrated = 4,   /**< a standard integrated HPWH  */
+		MODELS_externalTest = 5,      /**< a single compressor tank, using "external" topology  */
+
+		// these models are based on real tanks and measured lab data
+		// AO Smith models
+		MODELS_AOSmithPHPT60 = 102,         /**< this is the Ecotope model for the 60 gallon Voltex HPWH  */
+		MODELS_AOSmithPHPT80 = 103,         /**<  Voltex 80 gallon tank  */
+		MODELS_AOSmithHPTU50 = 104,    /**< 50 gallon AOSmith HPTU */
+		MODELS_AOSmithHPTU66 = 105,    /**< 66 gallon AOSmith HPTU */
+		MODELS_AOSmithHPTU80 = 106,    /**< 80 gallon AOSmith HPTU */
+		MODELS_AOSmithHPTU80_DR = 107,    /**< 80 gallon AOSmith HPTU */
+		MODELS_AOSmithCAHP120 = 108, /**< 12 gallon AOSmith CAHP commercial grade */
+
+		MODELS_AOSmithHPTS50 = 1101,	 /**< 50 gallon, AOSmith HPTS */
+		MODELS_AOSmithHPTS66 = 1102,	 /**< 66 gallon, AOSmith HPTS */
+		MODELS_AOSmithHPTS80 = 1103,	 /**< 80 gallon, AOSmith HPTS */
+
+		// GE Models
+		MODELS_GE2012 = 110,      /**<  The 2012 era GeoSpring  */
+		MODELS_GE2014STDMode = 111,    /**< 2014 GE model run in standard mode */
+		MODELS_GE2014STDMode_80 = 113,    /**< 2014 GE model run in standard mode, 80 gallon unit */
+		MODELS_GE2014 = 112,           /**< 2014 GE model run in the efficiency mode */
+		MODELS_GE2014_80 = 114,           /**< 2014 GE model run in the efficiency mode, 80 gallon unit */
+		MODELS_GE2014_80DR = 115,           /**< 2014 GE model run in the efficiency mode, 80 gallon unit */
+		MODELS_BWC2020_65 = 116,    /**<  The 2020 Bradford White 65 gallon unit  */
+
+
+		// SANCO2 CO2 transcritical heat pump water heaters
+		//   Rebranding Sanden -> SANCO2 5-23
+		MODELS_SANCO2_43 = 120,        /**<  SANCO2 43 gallon CO2 external heat pump  */
+		MODELS_SANCO2_83 = 121,        /**<  SANCO2 83 gallon CO2 external heat pump  */
+		MODELS_SANCO2_GS3_45HPA_US_SP = 122,  /**<  SANCO2 80 gallon CO2 external heat pump used for MF  */
+		MODELS_SANCO2_119 = 123,		/**<  SANCO2 120 gallon CO2 external heat pump  */
+
+		// Sanden synomyms for backward compatability
+		//  allow unmodified code using HPWHsim to build
+		MODELS_Sanden40 = MODELS_SANCO2_43,
+		MODELS_Sanden80 = MODELS_SANCO2_83,
+		MODELS_Sanden_GS3_45HPA_US_SP = MODELS_SANCO2_GS3_45HPA_US_SP,
+		MODELS_Sanden120 = MODELS_SANCO2_119,
 
 	  // The new-ish Rheem
 	  MODELS_RheemHB50 = 140,        /**< Rheem 2014 (?) Model */

diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc
@@ -1750,20 +1750,20 @@ int HPWH::HPWHinit_presets(MODELS presetNum) {
 
 	}
 
-	else if (presetNum == MODELS_Sanden80 || presetNum == MODELS_Sanden_GS3_45HPA_US_SP || presetNum == MODELS_Sanden120) {
+	else if (presetNum == MODELS_SANCO2_83 || presetNum == MODELS_SANCO2_GS3_45HPA_US_SP || presetNum == MODELS_SANCO2_119) {
 		numNodes = 96;
 		tankTemps_C = new double[numNodes];
 		setpoint_C = 65;
 		setpointFixed = true;
 
-		if (presetNum == MODELS_Sanden120) {
+		if (presetNum == MODELS_SANCO2_119) {
 			tankVolume_L = GAL_TO_L(119);
 			tankUA_kJperHrC = 9;
 		}
 		else {
 			tankVolume_L = 315;
 			tankUA_kJperHrC = 7;
-			if (presetNum == MODELS_Sanden_GS3_45HPA_US_SP) {
+			if (presetNum == MODELS_SANCO2_GS3_45HPA_US_SP) {
 				tankSizeFixed = false;
 			}
 		}
@@ -1824,7 +1824,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) {
 		std::vector<NodeWeight> nodeWeights;
 		nodeWeights.emplace_back(8);
 		compressor.addTurnOnLogic(std::make_shared<HPWH::TempBasedHeatingLogic>("eighth node absolute", nodeWeights, F_TO_C(113), this, true));
-		if (presetNum == MODELS_Sanden80 || presetNum == MODELS_Sanden120) {
+		if (presetNum == MODELS_SANCO2_83 || presetNum == MODELS_SANCO2_119) {
 			compressor.addTurnOnLogic(HPWH::standby(dF_TO_dC(8.2639)));
 			// Adds a bonus standby logic so the external heater does not cycle, recommended for any external heater with standby
 			std::vector<NodeWeight> nodeWeightStandby;
@@ -1841,7 +1841,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) {
 		//set everything in its places
 		setOfSources[0] = compressor;
 	}
-	else if (presetNum == MODELS_Sanden40) {
+	else if (presetNum == MODELS_SANCO2_43) {
 		numNodes = 96;
 		tankTemps_C = new double[numNodes];
 		setpoint_C = 65;