From 99efbed7e81f26eac30df8ffd9b126b72881106d Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Wed, 1 Nov 2023 09:31:43 -0600 Subject: [PATCH 01/23] Restart heat exchange model. --- src/HPWH.cc | 115 ++++++++++++++++++++--------------------- src/HPWH.in.hh | 9 ++-- src/HPWHpresets.cc | 53 ++++++++++++++++++- test/AquaThermAire.txt | 39 ++++++++++++++ 4 files changed, 154 insertions(+), 62 deletions(-) create mode 100644 test/AquaThermAire.txt diff --git a/src/HPWH.cc b/src/HPWH.cc index afffbab7..30b064f4 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -194,6 +194,7 @@ void HPWH::setAllDefaults() { usesSoCLogic = false; setMinutesPerStep(1.0); hpwhVerbosity = VRB_minuteOut; + waterIsDrawnFromTank = true; } HPWH::HPWH(const HPWH &hpwh) { @@ -2412,11 +2413,8 @@ int HPWH::getResistancePosition(int elementIndex) const { //the privates void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbientT_C, double inletVol2_L,double inletT2_C) { - //set up some useful variables for calculations - double drawFraction; - this->outletTemp_C = 0.; - double nodeInletFraction,cumInletFraction,drawVolume_N; - double nodeInletTV = 0.; + + outletTemp_C = 0.; if(drawVolume_L > 0.) { @@ -2449,75 +2447,77 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien lowInletT = inletT_C; lowInletV = drawVolume_L - inletVol2_L; } - //calculate how many nodes to draw (drawVolume_N) - drawVolume_N = drawVolume_L / nodeVolume_L; - if(drawVolume_L > tankVolume_L) { - //if (hpwhVerbosity >= VRB_reluctant) { - // //msg("WARNING: Drawing more than the tank volume in one step is undefined behavior. Terminating simulation. \n"); - // msg("WARNING: Drawing more than the tank volume in one step is undefined behavior. Continuing simulation at your own risk. \n"); - //} - //simHasFailed = true; - //return; - for(int i = 0; i < getNumNodes(); i++){ - outletTemp_C += tankTemps_C[i]; - tankTemps_C[i] = (inletT_C * (drawVolume_L - inletVol2_L) + inletT2_C * inletVol2_L) / drawVolume_L; - } - outletTemp_C = (outletTemp_C / getNumNodes() * tankVolume_L + tankTemps_C[0] * (drawVolume_L - tankVolume_L)) - / drawVolume_L * drawVolume_N; - - drawVolume_N = 0.; - } - ///////////////////////////////////////////////////////////////////////////////////////////////// + if (waterIsDrawnFromTank) { + //calculate how many nodes to draw (drawVolume_N) + double drawVolume_N = drawVolume_L / nodeVolume_L; + if(drawVolume_L > tankVolume_L) { + //if (hpwhVerbosity >= VRB_reluctant) { + // //msg("WARNING: Drawing more than the tank volume in one step is undefined behavior. Terminating simulation. \n"); + // msg("WARNING: Drawing more than the tank volume in one step is undefined behavior. Continuing simulation at your own risk. \n"); + //} + //simHasFailed = true; + //return; + for(int i = 0; i < getNumNodes(); i++){ + outletTemp_C += tankTemps_C[i]; + tankTemps_C[i] = (inletT_C * (drawVolume_L - inletVol2_L) + inletT2_C * inletVol2_L) / drawVolume_L; + } + outletTemp_C = (outletTemp_C / getNumNodes() * tankVolume_L + tankTemps_C[0] * (drawVolume_L - tankVolume_L)) + / drawVolume_L * drawVolume_N; - while(drawVolume_N > 0) { + drawVolume_N = 0.; + } - // Draw one node at a time - drawFraction = drawVolume_N > 1. ? 1. : drawVolume_N; + ///////////////////////////////////////////////////////////////////////////////////////////////// - //add temperature for outletT average - outletTemp_C += drawFraction * tankTemps_C[getNumNodes() - 1]; + while(drawVolume_N > 0) { - cumInletFraction = 0.; - for(int i = getNumNodes() - 1; i >= lowInletH; i--) { + // Draw one node at a time + double drawFraction = drawVolume_N > 1. ? 1. : drawVolume_N; + double nodeInletTV = 0.; - // Reset inlet inputs at this node. - nodeInletFraction = 0.; - nodeInletTV = 0.; + //add temperature for outletT average + outletTemp_C += drawFraction * tankTemps_C[getNumNodes() - 1]; - // Sum of all inlets Vi*Ti at this node - if(i == highInletH) { - nodeInletTV += highInletV * drawFraction / drawVolume_L * highInletT; - nodeInletFraction += highInletV * drawFraction / drawVolume_L; - } - if(i == lowInletH) { - nodeInletTV += lowInletV * drawFraction / drawVolume_L * lowInletT; - nodeInletFraction += lowInletV * drawFraction / drawVolume_L; + double cumInletFraction = 0.; + for(int i = getNumNodes() - 1; i >= lowInletH; i--) { - break; // if this is the bottom inlet break out of the four loop and use the boundary condition equation. - } + // Reset inlet inputs at this node. + double nodeInletFraction = 0.; + nodeInletTV = 0.; - // Look at the volume and temperature fluxes into this node - tankTemps_C[i] = (1. - (drawFraction - cumInletFraction)) * tankTemps_C[i] + - nodeInletTV + - (drawFraction - (cumInletFraction + nodeInletFraction)) * tankTemps_C[i - 1]; + // Sum of all inlets Vi*Ti at this node + if(i == highInletH) { + nodeInletTV += highInletV * drawFraction / drawVolume_L * highInletT; + nodeInletFraction += highInletV * drawFraction / drawVolume_L; + } + if(i == lowInletH) { + nodeInletTV += lowInletV * drawFraction / drawVolume_L * lowInletT; + nodeInletFraction += lowInletV * drawFraction / drawVolume_L; - cumInletFraction += nodeInletFraction; + break; // if this is the bottom inlet break out of the four loop and use the boundary condition equation. + } - } + // Look at the volume and temperature fluxes into this node + tankTemps_C[i] = (1. - (drawFraction - cumInletFraction)) * tankTemps_C[i] + + nodeInletTV + + (drawFraction - (cumInletFraction + nodeInletFraction)) * tankTemps_C[i - 1]; - // Boundary condition equation because it shouldn't take anything from tankTemps_C[i - 1] but it also might not exist. - tankTemps_C[lowInletH] = (1. - (drawFraction - cumInletFraction)) * tankTemps_C[lowInletH] + nodeInletTV; + cumInletFraction += nodeInletFraction; - drawVolume_N -= drawFraction; + } - mixTankInversions(); - } + // Boundary condition equation because it shouldn't take anything from tankTemps_C[i - 1] but it also might not exist. + tankTemps_C[lowInletH] = (1. - (drawFraction - cumInletFraction)) * tankTemps_C[lowInletH] + nodeInletTV; + drawVolume_N -= drawFraction; - //fill in average outlet T - it is a weighted averaged, with weights == nodes drawn - this->outletTemp_C /= (drawVolume_L / nodeVolume_L); + mixTankInversions(); + } + //fill in average outlet T - it is a weighted averaged, with weights == nodes drawn + outletTemp_C /= (drawVolume_L / nodeVolume_L); + } ///////////////////////////////////////////////////////////////////////////////////////////////// //Account for mixing at the bottom of the tank @@ -2528,7 +2528,6 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien } //end if(draw_volume_L > 0) - if(doConduction) { // Get the "constant" tau for the stability condition and the conduction calculation diff --git a/src/HPWH.in.hh b/src/HPWH.in.hh index 3281d3dc..a5eb134e 100644 --- a/src/HPWH.in.hh +++ b/src/HPWH.in.hh @@ -219,7 +219,9 @@ public: MODELS_RHEEM_HPHD60HNU_201_MP = 350, MODELS_RHEEM_HPHD60VNU_201_MP = 351, MODELS_RHEEM_HPHD135HNU_483_MP = 352, // really bad fit to data due to inconsistency in data - MODELS_RHEEM_HPHD135VNU_483_MP = 353 // really bad fit to data due to inconsistency in data + MODELS_RHEEM_HPHD135VNU_483_MP = 353, // really bad fit to data due to inconsistency in data + + MODELS_AQUATHERMAIRE = 400 // heat exchanger model }; ///specifies the modes for writing output @@ -1002,9 +1004,10 @@ private: /// Generates a vector of logical nodes std::vector getNodeWeightRange(double bottomFraction,double topFraction); -}; //end of HPWH class - + /// True: water is drawn from the tank itself; False: tank provides heat exchange only + bool waterIsDrawnFromTank; +}; //end of HPWH class class HPWH::HeatSource { diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 402c4cd8..e5b05ed0 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3819,8 +3819,59 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { heatSources[1].followedByHeatSource = &heatSources[2]; heatSources[0].companionHeatSource = &heatSources[2]; - } + } + else if (presetNum == MODELS_AQUATHERMAIRE) { // AquaThermAire + setNumNodes(1); + setpoint_C = F_TO_C(120.); + + tankVolume_L = 50.; + tankUA_kJperHrC = 7.31; + + doTempDepression = false; + tankMixesOnDraw = true; + + HeatSource compressor(this); + + //compressor values + compressor.isOn = false; + compressor.isVIP = false; + compressor.typeOfHeatSource = TYPE_compressor; + + compressor.setCondensity({1.}); + + //voltex60 tier 1 values + compressor.perfMap.reserve(2); + + compressor.perfMap.push_back({ + 47, // Temperature (T_F) + {0.467 * 1000, 0.00281 * 1000, 0.0000072 * 1000}, // Input Power Coefficients (inputPower_coeffs) + {4.86, -0.0222, -0.00001} // COP Coefficients (COP_coeffs) + }); + compressor.perfMap.push_back({ + 67, // Temperature (T_F) + {0.541 * 1000, 0.00147 * 1000, 0.0000176 * 1000}, // Input Power Coefficients (inputPower_coeffs) + {6.58, -0.0392, 0.0000407} // COP Coefficients (COP_coeffs) + }); + + compressor.minT = F_TO_C(45.0); + compressor.maxT = F_TO_C(120.); + compressor.hysteresis_dC = dF_TO_dC(4); + compressor.configuration = HeatSource::CONFIG_WRAPPED; + compressor.maxSetpoint_C = MAXOUTLET_R134A; + + //logic conditions + double compStart = dF_TO_dC(43.6); + double standbyT = dF_TO_dC(23.8); + compressor.addTurnOnLogic(HPWH::bottomThird(compStart)); + compressor.addTurnOnLogic(HPWH::standby(standbyT)); + + //set everything in its places + heatSources.resize(1); + heatSources[0] = compressor; + + waterIsDrawnFromTank = false; + } else { if (hpwhVerbosity >= VRB_reluctant) { msg("You have tried to select a preset model which does not exist. \n"); diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt new file mode 100644 index 00000000..a1a048f7 --- /dev/null +++ b/test/AquaThermAire.txt @@ -0,0 +1,39 @@ +verbosity silent +numNodes 1 #number of nodes +setpoint 120 F +volume 50 gal +UA 7.31 kJperHrC +depressTemp false +mixOnDraw true +waterIsDrawnFromTank false + +#a test comment +numHeatSources 1 + +heatsource 0 isVIP false +heatsource 0 isOn false +heatsource 0 type compressor +heatsource 0 condensity 1 +heatsource 0 nTemps 2 +heatsource 0 T1 47 F +heatsource 0 T2 67 F +heatsource 0 inPowT1const 280 +heatsource 0 inPowT1lin 4.97342 +heatsource 0 inPowT1quad 0 +heatsource 0 inPowT2const 280 +heatsource 0 inPowT2lin 5.35992 +heatsource 0 inPowT2quad 0 +heatsource 0 copT1const 5.634009 +heatsource 0 copT1lin -0.029485 +heatsource 0 copT1quad 0.0 +heatsource 0 copT2const 6.3 +heatsource 0 copT2lin -0.03 +heatsource 0 copT2quad 0.0 +heatsource 0 minT 40 F +heatsource 0 maxT 120 F +heatsource 0 hysteresis 1 F +heatsource 0 coilConfig wrapped + +heatsource 0 onlogic bottomThird 43.6 F +heatsource 0 onlogic standby 23.8 F + From 86188613e09efbad133f544529708722c2de21fe Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Wed, 1 Nov 2023 10:03:45 -0600 Subject: [PATCH 02/23] Add heat exchange params. --- src/HPWH.cc | 36 ++++++++++++++++++++++++++++++++++-- src/HPWH.in.hh | 2 ++ src/HPWHpresets.cc | 14 ++++++++------ test/AquaThermAire.txt | 7 ++++--- 4 files changed, 48 insertions(+), 11 deletions(-) diff --git a/src/HPWH.cc b/src/HPWH.cc index 30b064f4..8b46f225 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -195,6 +195,7 @@ void HPWH::setAllDefaults() { setMinutesPerStep(1.0); hpwhVerbosity = VRB_minuteOut; waterIsDrawnFromTank = true; + heatExchangeEfficiency = 0.9; } HPWH::HPWH(const HPWH &hpwh) { @@ -2416,6 +2417,7 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien outletTemp_C = 0.; + ///////////////////////////////////////////////////////////////////////////////////////////////// if(drawVolume_L > 0.) { //calculate how many nodes to draw (wholeNodesToDraw), and the remainder (drawFraction) @@ -2468,7 +2470,6 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien drawVolume_N = 0.; } - ///////////////////////////////////////////////////////////////////////////////////////////////// while(drawVolume_N > 0) { @@ -2518,7 +2519,22 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien //fill in average outlet T - it is a weighted averaged, with weights == nodes drawn outletTemp_C /= (drawVolume_L / nodeVolume_L); } - ///////////////////////////////////////////////////////////////////////////////////////////////// + else { // heat-exchange models + const double densityTank_kgperL = DENSITYWATER_kgperL; + const double CpTank_kJperkgC = CPWATER_kJperkgC; + + double C_Node_kJperC = CpTank_kJperkgC * densityTank_kgperL * nodeVolume_L; + double C_draw_kJperC = CPWATER_kJperkgC * DENSITYWATER_kgperL * drawVolume_L; + + outletTemp_C = inletT_C; + for (auto &nodeTemp: tankTemps_C) { + double maxHeatExchange_kJ = (nodeTemp - outletTemp_C) / (1. / C_Node_kJperC + 1. / C_draw_kJperC); + double heatExchange_kJ = heatExchangeEfficiency * maxHeatExchange_kJ; + + nodeTemp -= heatExchange_kJ / C_Node_kJperC; + outletTemp_C += heatExchange_kJ / C_draw_kJperC; + } + } //Account for mixing at the bottom of the tank if(tankMixesOnDraw && drawVolume_L > 0.) { @@ -2528,6 +2544,7 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien } //end if(draw_volume_L > 0) + ///////////////////////////////////////////////////////////////////////////////////////////////// if(doConduction) { // Get the "constant" tau for the stability condition and the conduction calculation @@ -3229,6 +3246,21 @@ int HPWH::HPWHinit_file(string configFile) { } return HPWH_ABORT; } + } else if(token == "waterIsDrawnFromTank") { + // false of this model uses heat exchange + line_ss >> tempString; + if(tempString == "true") waterIsDrawnFromTank = true; + else if(tempString == "false") waterIsDrawnFromTank = false; + else { + if(hpwhVerbosity >= VRB_reluctant) { + msg("Improper value for %s\n",token.c_str()); + } + return HPWH_ABORT; + } + } else if(token == "heatExchangeEfficiency") { + // applies to heat-exchange models only + line_ss >> tempDouble; + heatExchangeEfficiency = tempDouble; } else if(token == "verbosity") { line_ss >> token; if(token == "silent") { diff --git a/src/HPWH.in.hh b/src/HPWH.in.hh index a5eb134e..cd1788f9 100644 --- a/src/HPWH.in.hh +++ b/src/HPWH.in.hh @@ -1007,6 +1007,8 @@ private: /// True: water is drawn from the tank itself; False: tank provides heat exchange only bool waterIsDrawnFromTank; + double heatExchangeEfficiency; + }; //end of HPWH class diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index e5b05ed0..f374d4d4 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3822,14 +3822,18 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { } else if (presetNum == MODELS_AQUATHERMAIRE) { // AquaThermAire setNumNodes(1); - setpoint_C = F_TO_C(120.); + setpoint_C = F_TO_C(125.); - tankVolume_L = 50.; - tankUA_kJperHrC = 7.31; + tankVolume_L = 54.4; + tankUA_kJperHrC = 10.35; doTempDepression = false; tankMixesOnDraw = true; + // heat exchangers only + waterIsDrawnFromTank = false; + heatExchangeEfficiency = 0.9; + HeatSource compressor(this); //compressor values @@ -3855,7 +3859,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { }); compressor.minT = F_TO_C(45.0); - compressor.maxT = F_TO_C(120.); + compressor.maxT = F_TO_C(125.); compressor.hysteresis_dC = dF_TO_dC(4); compressor.configuration = HeatSource::CONFIG_WRAPPED; compressor.maxSetpoint_C = MAXOUTLET_R134A; @@ -3869,8 +3873,6 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { //set everything in its places heatSources.resize(1); heatSources[0] = compressor; - - waterIsDrawnFromTank = false; } else { if (hpwhVerbosity >= VRB_reluctant) { diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt index a1a048f7..a0a5152c 100644 --- a/test/AquaThermAire.txt +++ b/test/AquaThermAire.txt @@ -1,11 +1,12 @@ verbosity silent numNodes 1 #number of nodes -setpoint 120 F -volume 50 gal -UA 7.31 kJperHrC +setpoint 125 F +volume 54.4 gal +UA 10.35 kJperHrC depressTemp false mixOnDraw true waterIsDrawnFromTank false +heatExchangeEfficiency 0.9 #a test comment numHeatSources 1 From 508b54468ccdbc7c6cb01ec49a91e8682b45c356 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Wed, 1 Nov 2023 11:38:21 -0600 Subject: [PATCH 03/23] AquaThermAire fails file and regression tests. --- src/HPWH.cc | 45 +- src/HPWH.in.hh | 5 +- src/HPWHHeatSources.cc | 35 +- src/HPWHpresets.cc | 4 +- test/AquaThermAire.txt | 26 +- test/CMakeLists.txt | 1 + test/testUtilityFcts.cc | 3 + test/villara_24hr67/DRschedule.csv | 2 + test/villara_24hr67/ambientTschedule.csv | 1442 +++++++++++++++++++ test/villara_24hr67/drawschedule.csv | 55 + test/villara_24hr67/evaporatorTschedule.csv | 1442 +++++++++++++++++++ test/villara_24hr67/inletTschedule.csv | 1442 +++++++++++++++++++ test/villara_24hr67/testInfo.txt | 2 + 13 files changed, 4432 insertions(+), 72 deletions(-) create mode 100644 test/villara_24hr67/DRschedule.csv create mode 100644 test/villara_24hr67/ambientTschedule.csv create mode 100644 test/villara_24hr67/drawschedule.csv create mode 100644 test/villara_24hr67/evaporatorTschedule.csv create mode 100644 test/villara_24hr67/inletTschedule.csv create mode 100644 test/villara_24hr67/testInfo.txt diff --git a/src/HPWH.cc b/src/HPWH.cc index 8b46f225..21767edd 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -1745,35 +1745,13 @@ double HPWH::getNthSimTcouple(int iTCouple,int nTCouple,UNITS units /*=UNITS_C* msg("You have attempted to access a simulated thermocouple that does not exist. \n"); } return double(HPWH_ABORT); - } else if(nTCouple > getNumNodes()) { - if(hpwhVerbosity >= VRB_reluctant) { - msg("You have more simulated thermocouples than nodes. \n"); - } + } else if(nTCouple < 1) { return double(HPWH_ABORT); } else { - double weight = getNumNodes() / static_cast(nTCouple); - double start_ind = (iTCouple - 1.) * weight; - int ind = (int)std::ceil(start_ind); - - double averageTemp_C = 0.0; - // Check any intial fraction of nodes - averageTemp_C += getTankNodeTemp((int)std::floor(start_ind),UNITS_C) * ((double)ind - start_ind); - weight -= ((double)ind - start_ind); - - // Check the full nodes - while(weight >= 1.0) { - averageTemp_C += getTankNodeTemp(ind,UNITS_C); - weight -= 1.0; - ind += 1; - } - - // Check any leftover - if(weight > 0.) { - averageTemp_C += getTankNodeTemp(ind,UNITS_C) * weight; - } - // Divide by the original weight to get the true average - averageTemp_C /= ((double)getNumNodes() / (double)nTCouple); + double fracBegin = static_cast(iTCouple - 1.) / nTCouple; + double fracEnd = static_cast(iTCouple) / nTCouple; + double averageTemp_C = getResampledValue(tankTemps_C, fracBegin, fracEnd); if(units == UNITS_C) { return averageTemp_C; @@ -2729,7 +2707,7 @@ double HPWH::tankAvg_C(const std::vector nodeWeights) const { double sum = 0; double totWeight = 0; - std::vector resampledTankTemps(12); + std::vector resampledTankTemps(LOGIC_NODE_SIZE); resample(resampledTankTemps, tankTemps_C); for (auto &nodeWeight : nodeWeights) { @@ -2737,7 +2715,7 @@ double HPWH::tankAvg_C(const std::vector nodeWeights) const { sum += tankTemps_C.front() * nodeWeight.weight; totWeight += nodeWeight.weight; } - else if (nodeWeight.nodeNum == 13) { // top node only + else if (nodeWeight.nodeNum > LOGIC_NODE_SIZE) { // top node only sum += tankTemps_C.back() * nodeWeight.weight; totWeight += nodeWeight.weight; } @@ -2832,19 +2810,16 @@ void HPWH::calcDerivedHeatingValues(){ //lowest node int lowest = 0; + double nodeRatio = getNumNodes() / CONDENSITY_SIZE; for(int i = 0; i < getNumHeatSources(); i++) { lowest = 0; if(hpwhVerbosity >= VRB_emetic) { msg(outputString,"Heat Source %d \n",i); } - for(int j = 0; j < getNumNodes(); j++) { - if(hpwhVerbosity >= VRB_emetic) { - msg(outputString,"j: %d j/ (numNodes/CONDENSITY_SIZE) %d \n",j,j / (getNumNodes() / CONDENSITY_SIZE)); - } - - if(heatSources[i].condensity[(j / (getNumNodes() / CONDENSITY_SIZE))] > 0) { - lowest = j; + for(auto j = 0; j < CONDENSITY_SIZE; ++j) { + if(heatSources[i].condensity[j] > 0) { + lowest = static_cast(nodeRatio * j); break; } } diff --git a/src/HPWH.in.hh b/src/HPWH.in.hh index cd1788f9..7897e4f5 100644 --- a/src/HPWH.in.hh +++ b/src/HPWH.in.hh @@ -1296,9 +1296,8 @@ private: void calcHeatDist(std::vector &heatDistribution); - double getCondenserTemp() const; - /**< returns the temperature of the condensor - it's a weighted average of the - tank temperature, using the condensity as weights */ + double getTankTemp() const; + /**< returns the tank temperature weighted by the condensity for this heat source */ void sortPerformanceMap(); /**< sorts the Performance Map by increasing external temperatures */ diff --git a/src/HPWHHeatSources.cc b/src/HPWHHeatSources.cc index 5f9087e0..ccafa098 100644 --- a/src/HPWHHeatSources.cc +++ b/src/HPWHHeatSources.cc @@ -394,11 +394,11 @@ void HPWH::HeatSource::addHeat(double externalT_C,double minutesToRun) { calcHeatDist(heatDistribution); if(isACompressor()) { - hpwh->condenserInlet_C = getCondenserTemp(); - getCapacity(externalT_C,getCondenserTemp(),input_BTUperHr,cap_BTUperHr,cop); + hpwh->condenserInlet_C = getTankTemp(); + getCapacity(externalT_C,getTankTemp(),input_BTUperHr,cap_BTUperHr,cop); } else { - getCapacity(externalT_C,getCondenserTemp(),input_BTUperHr,cap_BTUperHr,cop); + getCapacity(externalT_C,getTankTemp(),input_BTUperHr,cap_BTUperHr,cop); } // calculate capacity btu/hr, input btu/hr, and cop @@ -423,7 +423,7 @@ void HPWH::HeatSource::addHeat(double externalT_C,double minutesToRun) { } if(isACompressor()) { // outlet temperature is the condenser temperature after heat has been added - hpwh->condenserOutlet_C = getCondenserTemp(); + hpwh->condenserOutlet_C = getTankTemp(); } //after you've done everything, any leftover capacity is time that didn't run @@ -482,26 +482,23 @@ void HPWH::HeatSource::normalize(std::vector &distribution) { } } -double HPWH::HeatSource::getCondenserTemp() const{ - double condenserTemp_C = 0.0; - int tempNodesPerCondensityNode = hpwh->getNumNodes() / CONDENSITY_SIZE; - int j = 0; +double HPWH::HeatSource::getTankTemp() const{ - for(int i = 0; i < hpwh->getNumNodes(); i++) { - j = i / tempNodesPerCondensityNode; - if(condensity[j] != 0) { - condenserTemp_C += (condensity[j] / tempNodesPerCondensityNode) * hpwh->tankTemps_C[i]; - //the weights don't need to be added to divide out later because they should always sum to 1 + std::vector resampledTankTemps(CONDENSITY_SIZE); + resample(resampledTankTemps, hpwh->tankTemps_C); - if(hpwh->hpwhVerbosity >= VRB_emetic) { - hpwh->msg("condenserTemp_C:\t %.2lf \ti:\t %d \tj\t %d \tcondensity[j]:\t %.2lf \ttankTemps_C[i]:\t %.2lf\n",condenserTemp_C,i,j,condensity[j],hpwh->tankTemps_C[i]); - } - } + double tankTemp_C = 0.; + + std::size_t j = 0; + for(auto &resampledNodeTemp: resampledTankTemps) { + tankTemp_C += condensity[j] * resampledNodeTemp; + // Note that condensity is normalized. + ++j; } if(hpwh->hpwhVerbosity >= VRB_typical) { - hpwh->msg("condenser temp %.2lf \n",condenserTemp_C); + hpwh->msg("tank temp %.2lf \n",tankTemp_C); } - return condenserTemp_C; + return tankTemp_C; } void HPWH::HeatSource::getCapacity(double externalT_C,double condenserTemp_C,double setpointTemp_C,double &input_BTUperHr,double &cap_BTUperHr,double &cop) { diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index f374d4d4..093a17b7 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3843,7 +3843,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.setCondensity({1.}); - //voltex60 tier 1 values + //AOSmithPHPT60 values compressor.perfMap.reserve(2); compressor.perfMap.push_back({ @@ -3858,7 +3858,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { {6.58, -0.0392, 0.0000407} // COP Coefficients (COP_coeffs) }); - compressor.minT = F_TO_C(45.0); + compressor.minT = F_TO_C(40.); compressor.maxT = F_TO_C(125.); compressor.hysteresis_dC = dF_TO_dC(4); compressor.configuration = HeatSource::CONFIG_WRAPPED; diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt index a0a5152c..13cda0ca 100644 --- a/test/AquaThermAire.txt +++ b/test/AquaThermAire.txt @@ -18,20 +18,20 @@ heatsource 0 condensity 1 heatsource 0 nTemps 2 heatsource 0 T1 47 F heatsource 0 T2 67 F -heatsource 0 inPowT1const 280 -heatsource 0 inPowT1lin 4.97342 -heatsource 0 inPowT1quad 0 -heatsource 0 inPowT2const 280 -heatsource 0 inPowT2lin 5.35992 -heatsource 0 inPowT2quad 0 -heatsource 0 copT1const 5.634009 -heatsource 0 copT1lin -0.029485 -heatsource 0 copT1quad 0.0 -heatsource 0 copT2const 6.3 -heatsource 0 copT2lin -0.03 -heatsource 0 copT2quad 0.0 +heatsource 0 inPowT1const 467 +heatsource 0 inPowT1lin 2.81 +heatsource 0 inPowT1quad 0.0072 +heatsource 0 inPowT2const 541 +heatsource 0 inPowT2lin 1.47 +heatsource 0 inPowT2quad 0.0176 +heatsource 0 copT1const 4.86 +heatsource 0 copT1lin -0.0222 +heatsource 0 copT1quad -0.00001 +heatsource 0 copT2const 6.58 +heatsource 0 copT2lin -0.0392 +heatsource 0 copT2quad 0.0000407 heatsource 0 minT 40 F -heatsource 0 maxT 120 F +heatsource 0 maxT 125 F heatsource 0 hysteresis 1 F heatsource 0 coilConfig wrapped diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 523b56cf..964229b8 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -75,6 +75,7 @@ set(modelNames Rheem2020Prem40 Rheem2020Prem50 Rheem2020Build50 + AquaThermAire # RheemPlugInDedicated50 ) set(lockoutTestModels diff --git a/test/testUtilityFcts.cc b/test/testUtilityFcts.cc index e46b797e..4cca9e05 100644 --- a/test/testUtilityFcts.cc +++ b/test/testUtilityFcts.cc @@ -297,6 +297,9 @@ HPWH::MODELS mapStringToPreset(string modelName) { else if (modelName == "AWHSTier3Generic80") { hpwhModel = HPWH::MODELS_AWHSTier3Generic80; } + else if (modelName == "AquaThermAire") { + hpwhModel = HPWH::MODELS_AQUATHERMAIRE; + } else { hpwhModel = HPWH::MODELS_basicIntegrated; cout << "Couldn't find model " << modelName << ". Exiting...\n"; diff --git a/test/villara_24hr67/DRschedule.csv b/test/villara_24hr67/DRschedule.csv new file mode 100644 index 00000000..0fae0f27 --- /dev/null +++ b/test/villara_24hr67/DRschedule.csv @@ -0,0 +1,2 @@ +default 1 +minutes,OnOff diff --git a/test/villara_24hr67/ambientTschedule.csv b/test/villara_24hr67/ambientTschedule.csv new file mode 100644 index 00000000..1bcc4b16 --- /dev/null +++ b/test/villara_24hr67/ambientTschedule.csv @@ -0,0 +1,1442 @@ +default 67.5, +minutes,temperature +1,67.28315 +2,67.3284 +3,67.37848 +4,67.45485 +5,67.45412 +6,67.30761 +7,67.12637 +8,67.18246 +9,67.1868 +10,67.21343 +11,67.21535 +12,67.15785 +13,67.16241 +14,67.35531 +15,67.29267 +16,67.25365 +17,67.18422 +18,67.18721 +19,67.18055 +20,67.16505 +21,67.09311 +22,67.1366 +23,67.24177 +24,67.2541 +25,67.16316 +26,67.14007 +27,67.17348 +28,67.19661 +29,67.19999 +30,67.23907 +31,67.21378 +32,67.32257 +33,67.27809 +34,67.18491 +35,67.34405 +36,67.30149 +37,67.34415 +38,67.21259 +39,67.32129 +40,67.37061 +41,67.28255 +42,67.32346 +43,67.29215 +44,67.23927 +45,67.21572 +46,67.24843 +47,67.25526 +48,67.24344 +49,67.22066 +50,67.23169 +51,67.22906 +52,67.22253 +53,67.29514 +54,67.28191 +55,67.22148 +56,67.22105 +57,67.21169 +58,67.26269 +59,67.21466 +60,67.18014 +61,67.18269 +62,67.23352 +63,67.15137 +64,67.32146 +65,67.33404 +66,67.34781 +67,67.31873 +68,67.26029 +69,67.22739 +70,67.32249 +71,67.35124 +72,67.33225 +73,67.27674 +74,67.2897 +75,67.32126 +76,67.33494 +77,67.24704 +78,67.28519 +79,67.34291 +80,67.34919 +81,67.41381 +82,67.46752 +83,67.46306 +84,67.47807 +85,67.47678 +86,67.3783 +87,67.37211 +88,67.369 +89,67.33711 +90,67.28002 +91,67.32143 +92,67.31763 +93,67.31792 +94,67.27464 +95,67.32878 +96,67.29559 +97,67.32603 +98,67.4652 +99,67.55562 +100,67.56523 +101,67.45151 +102,67.38894 +103,67.39752 +104,67.33105 +105,67.23556 +106,67.1732 +107,67.12367 +108,67.10297 +109,67.13461 +110,67.22528 +111,67.3043 +112,67.36492 +113,67.23952 +114,67.4109 +115,67.48538 +116,67.46617 +117,67.36505 +118,67.43651 +119,67.32363 +120,67.42442 +121,67.38281 +122,67.34606 +123,67.40769 +124,67.46423 +125,67.5414 +126,67.45592 +127,67.35045 +128,67.30896 +129,67.36341 +130,67.4295 +131,67.29053 +132,67.32894 +133,67.37399 +134,67.42236 +135,67.52719 +136,67.48099 +137,67.47454 +138,67.38197 +139,67.18442 +140,67.1347 +141,67.13355 +142,67.16867 +143,67.2172 +144,67.24693 +145,67.18006 +146,67.21268 +147,67.32011 +148,67.34021 +149,67.33997 +150,67.3023 +151,67.23561 +152,67.16631 +153,67.18465 +154,67.22002 +155,67.27415 +156,67.31395 +157,67.31492 +158,67.2292 +159,67.26322 +160,67.34174 +161,67.34156 +162,67.23624 +163,67.2503 +164,67.27892 +165,67.29626 +166,67.47116 +167,67.49728 +168,67.56127 +169,67.4771 +170,67.34253 +171,67.38469 +172,67.38748 +173,67.40744 +174,67.41016 +175,67.43563 +176,67.45676 +177,67.4312 +178,67.46767 +179,67.39628 +180,67.45993 +181,67.48104 +182,67.44968 +183,67.46853 +184,67.39716 +185,67.4501 +186,67.46369 +187,67.46315 +188,67.45118 +189,67.37273 +190,67.46207 +191,67.42358 +192,67.38055 +193,67.40004 +194,67.40195 +195,67.45037 +196,67.40067 +197,67.31334 +198,67.21465 +199,67.26051 +200,67.40639 +201,67.54031 +202,67.40512 +203,67.28709 +204,67.30239 +205,67.45384 +206,67.3239 +207,67.24693 +208,67.27061 +209,67.30849 +210,67.40517 +211,67.64081 +212,67.521 +213,67.44157 +214,67.43269 +215,67.33911 +216,67.37727 +217,67.37268 +218,67.32021 +219,67.26873 +220,67.25411 +221,67.45874 +222,67.50282 +223,67.3784 +224,67.27431 +225,67.33359 +226,67.49818 +227,67.55161 +228,67.39916 +229,67.28979 +230,67.27021 +231,67.28572 +232,67.39331 +233,67.30009 +234,67.25822 +235,67.34859 +236,67.53671 +237,67.47654 +238,67.44636 +239,67.422 +240,67.39211 +241,67.35567 +242,67.37268 +243,67.4152 +244,67.32281 +245,67.36624 +246,67.37088 +247,67.45028 +248,67.35603 +249,67.4224 +250,67.5158 +251,67.4127 +252,67.36851 +253,67.38433 +254,67.41561 +255,67.41425 +256,67.3959 +257,67.3689 +258,67.37198 +259,67.48215 +260,67.37759 +261,67.41226 +262,67.36012 +263,67.4147 +264,67.38885 +265,67.28056 +266,67.28286 +267,67.24844 +268,67.24242 +269,67.25951 +270,67.4109 +271,67.41502 +272,67.32991 +273,67.25406 +274,67.37669 +275,67.29859 +276,67.31481 +277,67.19997 +278,67.17394 +279,67.17474 +280,67.18555 +281,67.33587 +282,67.32304 +283,67.26855 +284,67.28331 +285,67.24728 +286,67.24285 +287,67.2859 +288,67.53765 +289,67.51125 +290,67.39973 +291,67.30977 +292,67.34917 +293,67.43411 +294,67.42382 +295,67.36582 +296,67.32005 +297,67.33183 +298,67.52543 +299,67.50048 +300,67.42454 +301,67.35871 +302,67.34757 +303,67.35999 +304,67.37251 +305,67.42146 +306,67.35941 +307,67.43257 +308,67.48736 +309,67.44902 +310,67.45061 +311,67.48132 +312,67.44115 +313,67.4188 +314,67.40034 +315,67.45879 +316,67.42589 +317,67.38441 +318,67.40083 +319,67.37914 +320,67.41718 +321,67.44191 +322,67.30887 +323,67.26675 +324,67.36716 +325,67.40809 +326,67.41615 +327,67.29771 +328,67.24358 +329,67.31816 +330,67.38274 +331,67.4098 +332,67.35583 +333,67.39432 +334,67.44707 +335,67.39461 +336,67.42299 +337,67.40974 +338,67.41961 +339,67.38674 +340,67.39763 +341,67.36958 +342,67.3405 +343,67.29431 +344,67.32027 +345,67.20464 +346,67.35652 +347,67.4172 +348,67.41594 +349,67.37864 +350,67.28642 +351,67.28805 +352,67.36157 +353,67.40604 +354,67.24715 +355,67.19567 +356,67.26061 +357,67.25937 +358,67.29939 +359,67.25597 +360,67.27996 +361,67.3612 +362,67.37778 +363,67.38348 +364,67.27244 +365,67.26895 +366,67.36359 +367,67.36208 +368,67.31566 +369,67.25064 +370,67.29198 +371,67.30563 +372,67.23374 +373,67.31059 +374,67.3592 +375,67.42157 +376,67.37693 +377,67.33764 +378,67.30113 +379,67.28139 +380,67.31219 +381,67.42191 +382,67.31969 +383,67.22976 +384,67.21565 +385,67.25162 +386,67.2377 +387,67.24618 +388,67.30108 +389,67.4173 +390,67.48788 +391,67.4146 +392,67.35107 +393,67.36311 +394,67.38694 +395,67.31663 +396,67.35695 +397,67.34568 +398,67.3651 +399,67.33852 +400,67.31371 +401,67.26481 +402,67.26783 +403,67.24908 +404,67.2397 +405,67.2584 +406,67.25568 +407,67.2917 +408,67.36469 +409,67.47717 +410,67.43424 +411,67.35585 +412,67.34817 +413,67.37794 +414,67.35688 +415,67.32021 +416,67.41709 +417,67.3287 +418,67.3639 +419,67.34475 +420,67.35722 +421,67.37032 +422,67.40723 +423,67.35249 +424,67.3144 +425,67.29852 +426,67.28021 +427,67.18015 +428,67.18658 +429,67.30309 +430,67.48403 +431,67.44513 +432,67.37994 +433,67.37191 +434,67.33821 +435,67.32032 +436,67.28511 +437,67.28961 +438,67.33398 +439,67.38964 +440,67.36638 +441,67.32674 +442,67.2776 +443,67.29131 +444,67.32362 +445,67.35614 +446,67.3056 +447,67.38084 +448,67.2798 +449,67.24155 +450,67.23619 +451,67.16014 +452,67.21045 +453,67.21776 +454,67.23215 +455,67.29787 +456,67.30974 +457,67.46785 +458,67.46272 +459,67.35175 +460,67.36221 +461,67.27914 +462,67.34045 +463,67.30753 +464,67.45969 +465,67.37353 +466,67.30084 +467,67.35703 +468,67.32455 +469,67.31933 +470,67.31271 +471,67.35233 +472,67.27924 +473,67.3327 +474,67.39471 +475,67.34001 +476,67.39608 +477,67.28882 +478,67.37189 +479,67.36599 +480,67.38719 +481,67.32774 +482,67.31533 +483,67.35287 +484,67.35009 +485,67.31236 +486,67.14233 +487,67.14842 +488,67.26605 +489,67.3259 +490,67.37592 +491,67.30859 +492,67.17994 +493,67.10403 +494,67.16597 +495,67.2827 +496,67.18345 +497,67.15319 +498,67.20947 +499,67.233 +500,67.2791 +501,67.24157 +502,67.33463 +503,67.31535 +504,67.33089 +505,67.37086 +506,67.31207 +507,67.38922 +508,67.43734 +509,67.40028 +510,67.35358 +511,67.39671 +512,67.4091 +513,67.33654 +514,67.31081 +515,67.25478 +516,67.28275 +517,67.37498 +518,67.37563 +519,67.35639 +520,67.34682 +521,67.31152 +522,67.30154 +523,67.35225 +524,67.36008 +525,67.30479 +526,67.26225 +527,67.28769 +528,67.29901 +529,67.14817 +530,67.13154 +531,67.13269 +532,67.15188 +533,67.18815 +534,67.2933 +535,67.31092 +536,67.24566 +537,67.35493 +538,67.31837 +539,67.33146 +540,67.37133 +541,67.31898 +542,67.29527 +543,67.32121 +544,67.4201 +545,67.38996 +546,67.35352 +547,67.42341 +548,67.34813 +549,67.32396 +550,67.35328 +551,67.36757 +552,67.35675 +553,67.38316 +554,67.33711 +555,67.32374 +556,67.38184 +557,67.35668 +558,67.37504 +559,67.33154 +560,67.36497 +561,67.36752 +562,67.36998 +563,67.32171 +564,67.31309 +565,67.31782 +566,67.34878 +567,67.30084 +568,67.33308 +569,67.35986 +570,67.4098 +571,67.37981 +572,67.39442 +573,67.38424 +574,67.35194 +575,67.31578 +576,67.34494 +577,67.33601 +578,67.29845 +579,67.38226 +580,67.38197 +581,67.30277 +582,67.34032 +583,67.3223 +584,67.23396 +585,67.32334 +586,67.25668 +587,67.1504 +588,67.13303 +589,67.27644 +590,67.38494 +591,67.33719 +592,67.3054 +593,67.38366 +594,67.39902 +595,67.35023 +596,67.31902 +597,67.28839 +598,67.35009 +599,67.29752 +600,67.29226 +601,67.34821 +602,67.27769 +603,67.24148 +604,67.30963 +605,67.41599 +606,67.41525 +607,67.38906 +608,67.37166 +609,67.31017 +610,67.29811 +611,67.31274 +612,67.37987 +613,67.36745 +614,67.32694 +615,67.32925 +616,67.32594 +617,67.30705 +618,67.33566 +619,67.32426 +620,67.32172 +621,67.30132 +622,67.27404 +623,67.31922 +624,67.43024 +625,67.41776 +626,67.28513 +627,67.23768 +628,67.31913 +629,67.35931 +630,67.32354 +631,67.39597 +632,67.32792 +633,67.35014 +634,67.29671 +635,67.33395 +636,67.30618 +637,67.29182 +638,67.3922 +639,67.36793 +640,67.30036 +641,67.2336 +642,67.24001 +643,67.3239 +644,67.35643 +645,67.30405 +646,67.32057 +647,67.19549 +648,67.19349 +649,67.17085 +650,67.15494 +651,67.2515 +652,67.31602 +653,67.40373 +654,67.31294 +655,67.29301 +656,67.21756 +657,67.21761 +658,67.26677 +659,67.28786 +660,67.23757 +661,67.21963 +662,67.212 +663,67.18995 +664,67.16255 +665,67.18053 +666,67.1491 +667,67.19652 +668,67.24368 +669,67.24558 +670,67.52518 +671,67.51584 +672,67.56754 +673,67.50652 +674,67.49616 +675,67.4627 +676,67.38762 +677,67.30554 +678,67.34046 +679,67.36201 +680,67.44588 +681,67.45798 +682,67.44398 +683,67.42092 +684,67.48067 +685,67.55947 +686,67.48592 +687,67.44465 +688,67.47794 +689,67.45714 +690,67.45921 +691,67.38588 +692,67.41234 +693,67.363 +694,67.39223 +695,67.31528 +696,67.30356 +697,67.3691 +698,67.52977 +699,67.44114 +700,67.38301 +701,67.25849 +702,67.25235 +703,67.29131 +704,67.35239 +705,67.34584 +706,67.34628 +707,67.29217 +708,67.32797 +709,67.27241 +710,67.26823 +711,67.20885 +712,67.20931 +713,67.30214 +714,67.26614 +715,67.19783 +716,67.16318 +717,67.12754 +718,67.29352 +719,67.31013 +720,67.37211 +721,67.40294 +722,67.30884 +723,67.25198 +724,67.23928 +725,67.25827 +726,67.35915 +727,67.37206 +728,67.29874 +729,67.30036 +730,67.35916 +731,67.36948 +732,67.30565 +733,67.22949 +734,67.26031 +735,67.23054 +736,67.27246 +737,67.3088 +738,67.37173 +739,67.34809 +740,67.26231 +741,67.35619 +742,67.37463 +743,67.34149 +744,67.31544 +745,67.28074 +746,67.33273 +747,67.32441 +748,67.25864 +749,67.28821 +750,67.29573 +751,67.26096 +752,67.28887 +753,67.27714 +754,67.16793 +755,67.10239 +756,67.14371 +757,67.1554 +758,67.25408 +759,67.24631 +760,67.23307 +761,67.18365 +762,67.228 +763,67.21709 +764,67.20881 +765,67.26416 +766,67.31539 +767,67.21228 +768,67.20985 +769,67.15839 +770,67.18816 +771,67.34003 +772,67.20012 +773,67.22712 +774,67.37808 +775,67.56591 +776,67.44558 +777,67.20465 +778,67.11301 +779,67.23707 +780,67.30615 +781,67.35567 +782,67.35893 +783,67.33897 +784,67.33739 +785,67.37999 +786,67.25876 +787,67.21106 +788,67.34547 +789,67.46358 +790,67.52267 +791,67.44603 +792,67.20865 +793,67.25433 +794,67.35979 +795,67.28437 +796,67.2618 +797,67.3868 +798,67.3103 +799,67.30198 +800,67.30606 +801,67.27228 +802,67.34021 +803,67.33472 +804,67.28468 +805,67.27727 +806,67.27049 +807,67.33247 +808,67.25178 +809,67.27842 +810,67.42564 +811,67.3565 +812,67.29667 +813,67.3545 +814,67.2755 +815,67.31384 +816,67.39668 +817,67.48489 +818,67.52158 +819,67.44074 +820,67.38374 +821,67.38902 +822,67.39606 +823,67.39408 +824,67.41572 +825,67.42346 +826,67.32196 +827,67.41806 +828,67.40951 +829,67.35986 +830,67.42803 +831,67.3081 +832,67.28249 +833,67.2885 +834,67.41484 +835,67.42434 +836,67.3003 +837,67.27435 +838,67.2654 +839,67.35429 +840,67.42982 +841,67.33488 +842,67.30799 +843,67.24231 +844,67.24799 +845,67.19562 +846,67.22878 +847,67.16842 +848,67.23176 +849,67.28353 +850,67.2299 +851,67.2291 +852,67.26819 +853,67.29703 +854,67.25793 +855,67.25811 +856,67.28394 +857,67.31825 +858,67.36289 +859,67.44612 +860,67.51654 +861,67.47757 +862,67.23262 +863,67.14817 +864,67.1525 +865,67.2213 +866,67.24783 +867,67.2328 +868,67.27735 +869,67.33441 +870,67.27975 +871,67.22668 +872,67.23392 +873,67.28104 +874,67.33017 +875,67.31506 +876,67.32314 +877,67.29991 +878,67.32898 +879,67.36874 +880,67.31802 +881,67.34829 +882,67.35418 +883,67.36566 +884,67.31738 +885,67.3356 +886,67.35549 +887,67.3286 +888,67.35492 +889,67.34441 +890,67.28104 +891,67.29301 +892,67.32838 +893,67.32273 +894,67.359 +895,67.36435 +896,67.36916 +897,67.3603 +898,67.38069 +899,67.31096 +900,67.33042 +901,67.34761 +902,67.27577 +903,67.18008 +904,67.18411 +905,67.16831 +906,67.32115 +907,67.42764 +908,67.34318 +909,67.30946 +910,67.2776 +911,67.27024 +912,67.36296 +913,67.33749 +914,67.32363 +915,67.29402 +916,67.29602 +917,67.39981 +918,67.29316 +919,67.25111 +920,67.24418 +921,67.26738 +922,67.33343 +923,67.2424 +924,67.16921 +925,67.20982 +926,67.24476 +927,67.19815 +928,67.27895 +929,67.18552 +930,67.19538 +931,67.24628 +932,67.29557 +933,67.47127 +934,67.34116 +935,67.26918 +936,67.23225 +937,67.2645 +938,67.24843 +939,67.2049 +940,67.20419 +941,67.20278 +942,67.21964 +943,67.2231 +944,67.2569 +945,67.2038 +946,67.19144 +947,67.22227 +948,67.29431 +949,67.35017 +950,67.36247 +951,67.3684 +952,67.31508 +953,67.2513 +954,67.41282 +955,67.52827 +956,67.41515 +957,67.34048 +958,67.26832 +959,67.40123 +960,67.44776 +961,67.37859 +962,67.34604 +963,67.37878 +964,67.35303 +965,67.36246 +966,67.35143 +967,67.34055 +968,67.37268 +969,67.33956 +970,67.36406 +971,67.43313 +972,67.36667 +973,67.29978 +974,67.34291 +975,67.34309 +976,67.37743 +977,67.39853 +978,67.43093 +979,67.37713 +980,67.34336 +981,67.49297 +982,67.44338 +983,67.49775 +984,67.52859 +985,67.46479 +986,67.48365 +987,67.43507 +988,67.51141 +989,67.44785 +990,67.49252 +991,67.42416 +992,67.40794 +993,67.41336 +994,67.45834 +995,67.56329 +996,67.51195 +997,67.50901 +998,67.44695 +999,67.37113 +1000,67.45338 +1001,67.55418 +1002,67.5863 +1003,67.59798 +1004,67.54067 +1005,67.48345 +1006,67.46925 +1007,67.44605 +1008,67.52624 +1009,67.53369 +1010,67.45757 +1011,67.38073 +1012,67.40447 +1013,67.54397 +1014,67.60402 +1015,67.42757 +1016,67.44405 +1017,67.51009 +1018,67.43048 +1019,67.43091 +1020,67.39736 +1021,67.3034 +1022,67.21925 +1023,67.23254 +1024,67.24818 +1025,67.28364 +1026,67.32109 +1027,67.37182 +1028,67.41594 +1029,67.33236 +1030,67.32539 +1031,67.33989 +1032,67.32244 +1033,67.30468 +1034,67.36742 +1035,67.35175 +1036,67.40735 +1037,67.51395 +1038,67.45991 +1039,67.45622 +1040,67.44938 +1041,67.44463 +1042,67.46808 +1043,67.42249 +1044,67.42055 +1045,67.46171 +1046,67.42848 +1047,67.39214 +1048,67.40249 +1049,67.42625 +1050,67.43766 +1051,67.28013 +1052,67.22175 +1053,67.32677 +1054,67.343 +1055,67.51607 +1056,67.48488 +1057,67.32763 +1058,67.37923 +1059,67.42103 +1060,67.40231 +1061,67.4125 +1062,67.43386 +1063,67.4462 +1064,67.4435 +1065,67.45158 +1066,67.47463 +1067,67.42068 +1068,67.26482 +1069,67.26927 +1070,67.30851 +1071,67.2791 +1072,67.29613 +1073,67.30167 +1074,67.31623 +1075,67.3596 +1076,67.37672 +1077,67.38746 +1078,67.4276 +1079,67.39387 +1080,67.36185 +1081,67.37486 +1082,67.33796 +1083,67.43986 +1084,67.46225 +1085,67.36462 +1086,67.25149 +1087,67.28286 +1088,67.34012 +1089,67.29732 +1090,67.35823 +1091,67.4335 +1092,67.34891 +1093,67.32127 +1094,67.33445 +1095,67.33301 +1096,67.41524 +1097,67.33121 +1098,67.42841 +1099,67.42042 +1100,67.49758 +1101,67.40639 +1102,67.40157 +1103,67.33409 +1104,67.32244 +1105,67.40166 +1106,67.39082 +1107,67.33369 +1108,67.33739 +1109,67.34606 +1110,67.38224 +1111,67.35 +1112,67.3626 +1113,67.39147 +1114,67.46103 +1115,67.38755 +1116,67.38003 +1117,67.2773 +1118,67.27744 +1119,67.22939 +1120,67.34577 +1121,67.33951 +1122,67.34025 +1123,67.2748 +1124,67.21792 +1125,67.27251 +1126,67.27208 +1127,67.25824 +1128,67.36292 +1129,67.34177 +1130,67.40024 +1131,67.39606 +1132,67.38285 +1133,67.34507 +1134,67.33211 +1135,67.3624 +1136,67.3713 +1137,67.33168 +1138,67.28128 +1139,67.31289 +1140,67.35925 +1141,67.32653 +1142,67.34708 +1143,67.3104 +1144,67.36386 +1145,67.30222 +1146,67.33371 +1147,67.33996 +1148,67.19099 +1149,67.21763 +1150,67.28786 +1151,67.3396 +1152,67.23322 +1153,67.24358 +1154,67.15514 +1155,67.14169 +1156,67.154 +1157,67.15695 +1158,67.21102 +1159,67.16372 +1160,67.1659 +1161,67.3268 +1162,67.51499 +1163,67.49229 +1164,67.30457 +1165,67.27071 +1166,67.24648 +1167,67.2017 +1168,67.17733 +1169,67.23291 +1170,67.35143 +1171,67.32767 +1172,67.26922 +1173,67.34152 +1174,67.33778 +1175,67.35222 +1176,67.30349 +1177,67.37762 +1178,67.42243 +1179,67.45827 +1180,67.31458 +1181,67.30421 +1182,67.38699 +1183,67.2919 +1184,67.37412 +1185,67.36863 +1186,67.32019 +1187,67.29818 +1188,67.32041 +1189,67.3137 +1190,67.31373 +1191,67.34315 +1192,67.33326 +1193,67.3804 +1194,67.22936 +1195,67.33707 +1196,67.3812 +1197,67.35365 +1198,67.3525 +1199,67.26844 +1200,67.30975 +1201,67.24213 +1202,67.24995 +1203,67.31713 +1204,67.38441 +1205,67.27122 +1206,67.22046 +1207,67.24378 +1208,67.25539 +1209,67.29316 +1210,67.31593 +1211,67.37675 +1212,67.3394 +1213,67.23414 +1214,67.31226 +1215,67.30087 +1216,67.34856 +1217,67.29382 +1218,67.36529 +1219,67.41385 +1220,67.36388 +1221,67.34804 +1222,67.3619 +1223,67.34531 +1224,67.30615 +1225,67.34568 +1226,67.32053 +1227,67.31718 +1228,67.28609 +1229,67.34626 +1230,67.34766 +1231,67.28265 +1232,67.23956 +1233,67.2638 +1234,67.16655 +1235,67.24332 +1236,67.26299 +1237,67.30311 +1238,67.35281 +1239,67.32239 +1240,67.33184 +1241,67.49775 +1242,67.38627 +1243,67.37905 +1244,67.36932 +1245,67.35017 +1246,67.38449 +1247,67.34908 +1248,67.33479 +1249,67.26285 +1250,67.215 +1251,67.35551 +1252,67.2651 +1253,67.34997 +1254,67.22798 +1255,67.18132 +1256,67.30511 +1257,67.30814 +1258,67.27748 +1259,67.395 +1260,67.48974 +1261,67.38866 +1262,67.39407 +1263,67.33053 +1264,67.33711 +1265,67.262 +1266,67.2854 +1267,67.36945 +1268,67.24924 +1269,67.38924 +1270,67.36208 +1271,67.33961 +1272,67.3185 +1273,67.0757 +1274,67.0177 +1275,67.10956 +1276,67.30673 +1277,67.22749 +1278,67.14273 +1279,67.19482 +1280,67.18777 +1281,67.19225 +1282,67.21754 +1283,67.25608 +1284,67.22928 +1285,67.32556 +1286,67.5323 +1287,67.48389 +1288,67.45413 +1289,67.3387 +1290,67.25591 +1291,67.36369 +1292,67.3913 +1293,67.32854 +1294,67.40344 +1295,67.37218 +1296,67.34998 +1297,67.36692 +1298,67.36951 +1299,67.36298 +1300,67.28772 +1301,67.24501 +1302,67.25233 +1303,67.34151 +1304,67.32768 +1305,67.25754 +1306,67.30914 +1307,67.33906 +1308,67.34363 +1309,67.26569 +1310,67.22572 +1311,67.15762 +1312,67.22765 +1313,67.26807 +1314,67.14999 +1315,67.17934 +1316,67.22498 +1317,67.27197 +1318,67.35238 +1319,67.37997 +1320,67.33804 +1321,67.29108 +1322,67.30826 +1323,67.22507 +1324,67.19612 +1325,67.34376 +1326,67.40443 +1327,67.34287 +1328,67.2914 +1329,67.28666 +1330,67.29926 +1331,67.29337 +1332,67.34447 +1333,67.37234 +1334,67.35576 +1335,67.32059 +1336,67.31245 +1337,67.30603 +1338,67.33044 +1339,67.30824 +1340,67.31828 +1341,67.25275 +1342,67.18868 +1343,67.27906 +1344,67.46364 +1345,67.47001 +1346,67.40237 +1347,67.34492 +1348,67.29137 +1349,67.32008 +1350,67.35283 +1351,67.33575 +1352,67.3634 +1353,67.31926 +1354,67.37299 +1355,67.345 +1356,67.29879 +1357,67.33922 +1358,67.32439 +1359,67.33414 +1360,67.32347 +1361,67.3279 +1362,67.34538 +1363,67.25786 +1364,67.25822 +1365,67.3416 +1366,67.33611 +1367,67.29296 +1368,67.26102 +1369,67.29696 +1370,67.19537 +1371,67.12536 +1372,67.16683 +1373,67.18357 +1374,67.24542 +1375,67.3552 +1376,67.29744 +1377,67.23401 +1378,67.25239 +1379,67.24265 +1380,67.26886 +1381,67.29917 +1382,67.29917 +1383,67.29917 +1384,67.29917 +1385,67.29917 +1386,67.29917 +1387,67.29917 +1388,67.29917 +1389,67.29917 +1390,67.29917 +1391,67.29917 +1392,67.29917 +1393,67.29917 +1394,67.29917 +1395,67.29917 +1396,67.29917 +1397,67.29917 +1398,67.29917 +1399,67.29917 +1400,67.29917 +1401,67.29917 +1402,67.29917 +1403,67.29917 +1404,67.29917 +1405,67.29917 +1406,67.29917 +1407,67.29917 +1408,67.29917 +1409,67.29917 +1410,67.29917 +1411,67.29917 +1412,67.29917 +1413,67.29917 +1414,67.29917 +1415,67.29917 +1416,67.29917 +1417,67.29917 +1418,67.29917 +1419,67.29917 +1420,67.29917 +1421,67.29917 +1422,67.29917 +1423,67.29917 +1424,67.29917 +1425,67.29917 +1426,67.29917 +1427,67.29917 +1428,67.29917 +1429,67.29917 +1430,67.29917 +1431,67.29917 +1432,67.29917 +1433,67.29917 +1434,67.29917 +1435,67.29917 +1436,67.29917 +1437,67.29917 +1438,67.29917 +1439,67.29917 +1440,67.29917 diff --git a/test/villara_24hr67/drawschedule.csv b/test/villara_24hr67/drawschedule.csv new file mode 100644 index 00000000..b61189ab --- /dev/null +++ b/test/villara_24hr67/drawschedule.csv @@ -0,0 +1,55 @@ +default 0, +minutes,flow +1,1.3349102 +2,2.8913854 +3,3.0124772 +4,3.0023251 +5,3.0111803 +6,3.0010218 +7,3.0069499 +8,3.0063591 +9,3.0017903 +10,1.8039873 +31,0.37899702 +32,0.94744504 +33,0.63037963 +41,0.38995912 +42,0.5368643 +101,0.65925425 +102,1.7165944 +103,1.7083723 +104,1.7090602 +105,1.7091726 +106,1.3943032 +631,1.1355289 +632,2.9009642 +633,3.0374659 +634,3.0470733 +635,3.0387555 +636,1.7740286 +691,0.65034432 +692,1.6432731 +693,1.7106795 +694,0.9123426 +721,0.42550981 +722,0.53087469 +766,0.37718415 +767,0.56562094 +771,0.41616712 +772,0.56491452 +961,0.43046225 +962,0.9971379 +963,0.51245331 +976,0.40423453 +977,0.96119296 +978,0.60220512 +991,0.72326202 +992,1.23663 +1006,0.67108812 +1007,1.2519566 +1021,1.1236753 +1022,2.9326025 +1023,3.016118 +1024,3.0076832 +1025,3.0115812 +1026,0.80231295 diff --git a/test/villara_24hr67/evaporatorTschedule.csv b/test/villara_24hr67/evaporatorTschedule.csv new file mode 100644 index 00000000..1bcc4b16 --- /dev/null +++ b/test/villara_24hr67/evaporatorTschedule.csv @@ -0,0 +1,1442 @@ +default 67.5, +minutes,temperature +1,67.28315 +2,67.3284 +3,67.37848 +4,67.45485 +5,67.45412 +6,67.30761 +7,67.12637 +8,67.18246 +9,67.1868 +10,67.21343 +11,67.21535 +12,67.15785 +13,67.16241 +14,67.35531 +15,67.29267 +16,67.25365 +17,67.18422 +18,67.18721 +19,67.18055 +20,67.16505 +21,67.09311 +22,67.1366 +23,67.24177 +24,67.2541 +25,67.16316 +26,67.14007 +27,67.17348 +28,67.19661 +29,67.19999 +30,67.23907 +31,67.21378 +32,67.32257 +33,67.27809 +34,67.18491 +35,67.34405 +36,67.30149 +37,67.34415 +38,67.21259 +39,67.32129 +40,67.37061 +41,67.28255 +42,67.32346 +43,67.29215 +44,67.23927 +45,67.21572 +46,67.24843 +47,67.25526 +48,67.24344 +49,67.22066 +50,67.23169 +51,67.22906 +52,67.22253 +53,67.29514 +54,67.28191 +55,67.22148 +56,67.22105 +57,67.21169 +58,67.26269 +59,67.21466 +60,67.18014 +61,67.18269 +62,67.23352 +63,67.15137 +64,67.32146 +65,67.33404 +66,67.34781 +67,67.31873 +68,67.26029 +69,67.22739 +70,67.32249 +71,67.35124 +72,67.33225 +73,67.27674 +74,67.2897 +75,67.32126 +76,67.33494 +77,67.24704 +78,67.28519 +79,67.34291 +80,67.34919 +81,67.41381 +82,67.46752 +83,67.46306 +84,67.47807 +85,67.47678 +86,67.3783 +87,67.37211 +88,67.369 +89,67.33711 +90,67.28002 +91,67.32143 +92,67.31763 +93,67.31792 +94,67.27464 +95,67.32878 +96,67.29559 +97,67.32603 +98,67.4652 +99,67.55562 +100,67.56523 +101,67.45151 +102,67.38894 +103,67.39752 +104,67.33105 +105,67.23556 +106,67.1732 +107,67.12367 +108,67.10297 +109,67.13461 +110,67.22528 +111,67.3043 +112,67.36492 +113,67.23952 +114,67.4109 +115,67.48538 +116,67.46617 +117,67.36505 +118,67.43651 +119,67.32363 +120,67.42442 +121,67.38281 +122,67.34606 +123,67.40769 +124,67.46423 +125,67.5414 +126,67.45592 +127,67.35045 +128,67.30896 +129,67.36341 +130,67.4295 +131,67.29053 +132,67.32894 +133,67.37399 +134,67.42236 +135,67.52719 +136,67.48099 +137,67.47454 +138,67.38197 +139,67.18442 +140,67.1347 +141,67.13355 +142,67.16867 +143,67.2172 +144,67.24693 +145,67.18006 +146,67.21268 +147,67.32011 +148,67.34021 +149,67.33997 +150,67.3023 +151,67.23561 +152,67.16631 +153,67.18465 +154,67.22002 +155,67.27415 +156,67.31395 +157,67.31492 +158,67.2292 +159,67.26322 +160,67.34174 +161,67.34156 +162,67.23624 +163,67.2503 +164,67.27892 +165,67.29626 +166,67.47116 +167,67.49728 +168,67.56127 +169,67.4771 +170,67.34253 +171,67.38469 +172,67.38748 +173,67.40744 +174,67.41016 +175,67.43563 +176,67.45676 +177,67.4312 +178,67.46767 +179,67.39628 +180,67.45993 +181,67.48104 +182,67.44968 +183,67.46853 +184,67.39716 +185,67.4501 +186,67.46369 +187,67.46315 +188,67.45118 +189,67.37273 +190,67.46207 +191,67.42358 +192,67.38055 +193,67.40004 +194,67.40195 +195,67.45037 +196,67.40067 +197,67.31334 +198,67.21465 +199,67.26051 +200,67.40639 +201,67.54031 +202,67.40512 +203,67.28709 +204,67.30239 +205,67.45384 +206,67.3239 +207,67.24693 +208,67.27061 +209,67.30849 +210,67.40517 +211,67.64081 +212,67.521 +213,67.44157 +214,67.43269 +215,67.33911 +216,67.37727 +217,67.37268 +218,67.32021 +219,67.26873 +220,67.25411 +221,67.45874 +222,67.50282 +223,67.3784 +224,67.27431 +225,67.33359 +226,67.49818 +227,67.55161 +228,67.39916 +229,67.28979 +230,67.27021 +231,67.28572 +232,67.39331 +233,67.30009 +234,67.25822 +235,67.34859 +236,67.53671 +237,67.47654 +238,67.44636 +239,67.422 +240,67.39211 +241,67.35567 +242,67.37268 +243,67.4152 +244,67.32281 +245,67.36624 +246,67.37088 +247,67.45028 +248,67.35603 +249,67.4224 +250,67.5158 +251,67.4127 +252,67.36851 +253,67.38433 +254,67.41561 +255,67.41425 +256,67.3959 +257,67.3689 +258,67.37198 +259,67.48215 +260,67.37759 +261,67.41226 +262,67.36012 +263,67.4147 +264,67.38885 +265,67.28056 +266,67.28286 +267,67.24844 +268,67.24242 +269,67.25951 +270,67.4109 +271,67.41502 +272,67.32991 +273,67.25406 +274,67.37669 +275,67.29859 +276,67.31481 +277,67.19997 +278,67.17394 +279,67.17474 +280,67.18555 +281,67.33587 +282,67.32304 +283,67.26855 +284,67.28331 +285,67.24728 +286,67.24285 +287,67.2859 +288,67.53765 +289,67.51125 +290,67.39973 +291,67.30977 +292,67.34917 +293,67.43411 +294,67.42382 +295,67.36582 +296,67.32005 +297,67.33183 +298,67.52543 +299,67.50048 +300,67.42454 +301,67.35871 +302,67.34757 +303,67.35999 +304,67.37251 +305,67.42146 +306,67.35941 +307,67.43257 +308,67.48736 +309,67.44902 +310,67.45061 +311,67.48132 +312,67.44115 +313,67.4188 +314,67.40034 +315,67.45879 +316,67.42589 +317,67.38441 +318,67.40083 +319,67.37914 +320,67.41718 +321,67.44191 +322,67.30887 +323,67.26675 +324,67.36716 +325,67.40809 +326,67.41615 +327,67.29771 +328,67.24358 +329,67.31816 +330,67.38274 +331,67.4098 +332,67.35583 +333,67.39432 +334,67.44707 +335,67.39461 +336,67.42299 +337,67.40974 +338,67.41961 +339,67.38674 +340,67.39763 +341,67.36958 +342,67.3405 +343,67.29431 +344,67.32027 +345,67.20464 +346,67.35652 +347,67.4172 +348,67.41594 +349,67.37864 +350,67.28642 +351,67.28805 +352,67.36157 +353,67.40604 +354,67.24715 +355,67.19567 +356,67.26061 +357,67.25937 +358,67.29939 +359,67.25597 +360,67.27996 +361,67.3612 +362,67.37778 +363,67.38348 +364,67.27244 +365,67.26895 +366,67.36359 +367,67.36208 +368,67.31566 +369,67.25064 +370,67.29198 +371,67.30563 +372,67.23374 +373,67.31059 +374,67.3592 +375,67.42157 +376,67.37693 +377,67.33764 +378,67.30113 +379,67.28139 +380,67.31219 +381,67.42191 +382,67.31969 +383,67.22976 +384,67.21565 +385,67.25162 +386,67.2377 +387,67.24618 +388,67.30108 +389,67.4173 +390,67.48788 +391,67.4146 +392,67.35107 +393,67.36311 +394,67.38694 +395,67.31663 +396,67.35695 +397,67.34568 +398,67.3651 +399,67.33852 +400,67.31371 +401,67.26481 +402,67.26783 +403,67.24908 +404,67.2397 +405,67.2584 +406,67.25568 +407,67.2917 +408,67.36469 +409,67.47717 +410,67.43424 +411,67.35585 +412,67.34817 +413,67.37794 +414,67.35688 +415,67.32021 +416,67.41709 +417,67.3287 +418,67.3639 +419,67.34475 +420,67.35722 +421,67.37032 +422,67.40723 +423,67.35249 +424,67.3144 +425,67.29852 +426,67.28021 +427,67.18015 +428,67.18658 +429,67.30309 +430,67.48403 +431,67.44513 +432,67.37994 +433,67.37191 +434,67.33821 +435,67.32032 +436,67.28511 +437,67.28961 +438,67.33398 +439,67.38964 +440,67.36638 +441,67.32674 +442,67.2776 +443,67.29131 +444,67.32362 +445,67.35614 +446,67.3056 +447,67.38084 +448,67.2798 +449,67.24155 +450,67.23619 +451,67.16014 +452,67.21045 +453,67.21776 +454,67.23215 +455,67.29787 +456,67.30974 +457,67.46785 +458,67.46272 +459,67.35175 +460,67.36221 +461,67.27914 +462,67.34045 +463,67.30753 +464,67.45969 +465,67.37353 +466,67.30084 +467,67.35703 +468,67.32455 +469,67.31933 +470,67.31271 +471,67.35233 +472,67.27924 +473,67.3327 +474,67.39471 +475,67.34001 +476,67.39608 +477,67.28882 +478,67.37189 +479,67.36599 +480,67.38719 +481,67.32774 +482,67.31533 +483,67.35287 +484,67.35009 +485,67.31236 +486,67.14233 +487,67.14842 +488,67.26605 +489,67.3259 +490,67.37592 +491,67.30859 +492,67.17994 +493,67.10403 +494,67.16597 +495,67.2827 +496,67.18345 +497,67.15319 +498,67.20947 +499,67.233 +500,67.2791 +501,67.24157 +502,67.33463 +503,67.31535 +504,67.33089 +505,67.37086 +506,67.31207 +507,67.38922 +508,67.43734 +509,67.40028 +510,67.35358 +511,67.39671 +512,67.4091 +513,67.33654 +514,67.31081 +515,67.25478 +516,67.28275 +517,67.37498 +518,67.37563 +519,67.35639 +520,67.34682 +521,67.31152 +522,67.30154 +523,67.35225 +524,67.36008 +525,67.30479 +526,67.26225 +527,67.28769 +528,67.29901 +529,67.14817 +530,67.13154 +531,67.13269 +532,67.15188 +533,67.18815 +534,67.2933 +535,67.31092 +536,67.24566 +537,67.35493 +538,67.31837 +539,67.33146 +540,67.37133 +541,67.31898 +542,67.29527 +543,67.32121 +544,67.4201 +545,67.38996 +546,67.35352 +547,67.42341 +548,67.34813 +549,67.32396 +550,67.35328 +551,67.36757 +552,67.35675 +553,67.38316 +554,67.33711 +555,67.32374 +556,67.38184 +557,67.35668 +558,67.37504 +559,67.33154 +560,67.36497 +561,67.36752 +562,67.36998 +563,67.32171 +564,67.31309 +565,67.31782 +566,67.34878 +567,67.30084 +568,67.33308 +569,67.35986 +570,67.4098 +571,67.37981 +572,67.39442 +573,67.38424 +574,67.35194 +575,67.31578 +576,67.34494 +577,67.33601 +578,67.29845 +579,67.38226 +580,67.38197 +581,67.30277 +582,67.34032 +583,67.3223 +584,67.23396 +585,67.32334 +586,67.25668 +587,67.1504 +588,67.13303 +589,67.27644 +590,67.38494 +591,67.33719 +592,67.3054 +593,67.38366 +594,67.39902 +595,67.35023 +596,67.31902 +597,67.28839 +598,67.35009 +599,67.29752 +600,67.29226 +601,67.34821 +602,67.27769 +603,67.24148 +604,67.30963 +605,67.41599 +606,67.41525 +607,67.38906 +608,67.37166 +609,67.31017 +610,67.29811 +611,67.31274 +612,67.37987 +613,67.36745 +614,67.32694 +615,67.32925 +616,67.32594 +617,67.30705 +618,67.33566 +619,67.32426 +620,67.32172 +621,67.30132 +622,67.27404 +623,67.31922 +624,67.43024 +625,67.41776 +626,67.28513 +627,67.23768 +628,67.31913 +629,67.35931 +630,67.32354 +631,67.39597 +632,67.32792 +633,67.35014 +634,67.29671 +635,67.33395 +636,67.30618 +637,67.29182 +638,67.3922 +639,67.36793 +640,67.30036 +641,67.2336 +642,67.24001 +643,67.3239 +644,67.35643 +645,67.30405 +646,67.32057 +647,67.19549 +648,67.19349 +649,67.17085 +650,67.15494 +651,67.2515 +652,67.31602 +653,67.40373 +654,67.31294 +655,67.29301 +656,67.21756 +657,67.21761 +658,67.26677 +659,67.28786 +660,67.23757 +661,67.21963 +662,67.212 +663,67.18995 +664,67.16255 +665,67.18053 +666,67.1491 +667,67.19652 +668,67.24368 +669,67.24558 +670,67.52518 +671,67.51584 +672,67.56754 +673,67.50652 +674,67.49616 +675,67.4627 +676,67.38762 +677,67.30554 +678,67.34046 +679,67.36201 +680,67.44588 +681,67.45798 +682,67.44398 +683,67.42092 +684,67.48067 +685,67.55947 +686,67.48592 +687,67.44465 +688,67.47794 +689,67.45714 +690,67.45921 +691,67.38588 +692,67.41234 +693,67.363 +694,67.39223 +695,67.31528 +696,67.30356 +697,67.3691 +698,67.52977 +699,67.44114 +700,67.38301 +701,67.25849 +702,67.25235 +703,67.29131 +704,67.35239 +705,67.34584 +706,67.34628 +707,67.29217 +708,67.32797 +709,67.27241 +710,67.26823 +711,67.20885 +712,67.20931 +713,67.30214 +714,67.26614 +715,67.19783 +716,67.16318 +717,67.12754 +718,67.29352 +719,67.31013 +720,67.37211 +721,67.40294 +722,67.30884 +723,67.25198 +724,67.23928 +725,67.25827 +726,67.35915 +727,67.37206 +728,67.29874 +729,67.30036 +730,67.35916 +731,67.36948 +732,67.30565 +733,67.22949 +734,67.26031 +735,67.23054 +736,67.27246 +737,67.3088 +738,67.37173 +739,67.34809 +740,67.26231 +741,67.35619 +742,67.37463 +743,67.34149 +744,67.31544 +745,67.28074 +746,67.33273 +747,67.32441 +748,67.25864 +749,67.28821 +750,67.29573 +751,67.26096 +752,67.28887 +753,67.27714 +754,67.16793 +755,67.10239 +756,67.14371 +757,67.1554 +758,67.25408 +759,67.24631 +760,67.23307 +761,67.18365 +762,67.228 +763,67.21709 +764,67.20881 +765,67.26416 +766,67.31539 +767,67.21228 +768,67.20985 +769,67.15839 +770,67.18816 +771,67.34003 +772,67.20012 +773,67.22712 +774,67.37808 +775,67.56591 +776,67.44558 +777,67.20465 +778,67.11301 +779,67.23707 +780,67.30615 +781,67.35567 +782,67.35893 +783,67.33897 +784,67.33739 +785,67.37999 +786,67.25876 +787,67.21106 +788,67.34547 +789,67.46358 +790,67.52267 +791,67.44603 +792,67.20865 +793,67.25433 +794,67.35979 +795,67.28437 +796,67.2618 +797,67.3868 +798,67.3103 +799,67.30198 +800,67.30606 +801,67.27228 +802,67.34021 +803,67.33472 +804,67.28468 +805,67.27727 +806,67.27049 +807,67.33247 +808,67.25178 +809,67.27842 +810,67.42564 +811,67.3565 +812,67.29667 +813,67.3545 +814,67.2755 +815,67.31384 +816,67.39668 +817,67.48489 +818,67.52158 +819,67.44074 +820,67.38374 +821,67.38902 +822,67.39606 +823,67.39408 +824,67.41572 +825,67.42346 +826,67.32196 +827,67.41806 +828,67.40951 +829,67.35986 +830,67.42803 +831,67.3081 +832,67.28249 +833,67.2885 +834,67.41484 +835,67.42434 +836,67.3003 +837,67.27435 +838,67.2654 +839,67.35429 +840,67.42982 +841,67.33488 +842,67.30799 +843,67.24231 +844,67.24799 +845,67.19562 +846,67.22878 +847,67.16842 +848,67.23176 +849,67.28353 +850,67.2299 +851,67.2291 +852,67.26819 +853,67.29703 +854,67.25793 +855,67.25811 +856,67.28394 +857,67.31825 +858,67.36289 +859,67.44612 +860,67.51654 +861,67.47757 +862,67.23262 +863,67.14817 +864,67.1525 +865,67.2213 +866,67.24783 +867,67.2328 +868,67.27735 +869,67.33441 +870,67.27975 +871,67.22668 +872,67.23392 +873,67.28104 +874,67.33017 +875,67.31506 +876,67.32314 +877,67.29991 +878,67.32898 +879,67.36874 +880,67.31802 +881,67.34829 +882,67.35418 +883,67.36566 +884,67.31738 +885,67.3356 +886,67.35549 +887,67.3286 +888,67.35492 +889,67.34441 +890,67.28104 +891,67.29301 +892,67.32838 +893,67.32273 +894,67.359 +895,67.36435 +896,67.36916 +897,67.3603 +898,67.38069 +899,67.31096 +900,67.33042 +901,67.34761 +902,67.27577 +903,67.18008 +904,67.18411 +905,67.16831 +906,67.32115 +907,67.42764 +908,67.34318 +909,67.30946 +910,67.2776 +911,67.27024 +912,67.36296 +913,67.33749 +914,67.32363 +915,67.29402 +916,67.29602 +917,67.39981 +918,67.29316 +919,67.25111 +920,67.24418 +921,67.26738 +922,67.33343 +923,67.2424 +924,67.16921 +925,67.20982 +926,67.24476 +927,67.19815 +928,67.27895 +929,67.18552 +930,67.19538 +931,67.24628 +932,67.29557 +933,67.47127 +934,67.34116 +935,67.26918 +936,67.23225 +937,67.2645 +938,67.24843 +939,67.2049 +940,67.20419 +941,67.20278 +942,67.21964 +943,67.2231 +944,67.2569 +945,67.2038 +946,67.19144 +947,67.22227 +948,67.29431 +949,67.35017 +950,67.36247 +951,67.3684 +952,67.31508 +953,67.2513 +954,67.41282 +955,67.52827 +956,67.41515 +957,67.34048 +958,67.26832 +959,67.40123 +960,67.44776 +961,67.37859 +962,67.34604 +963,67.37878 +964,67.35303 +965,67.36246 +966,67.35143 +967,67.34055 +968,67.37268 +969,67.33956 +970,67.36406 +971,67.43313 +972,67.36667 +973,67.29978 +974,67.34291 +975,67.34309 +976,67.37743 +977,67.39853 +978,67.43093 +979,67.37713 +980,67.34336 +981,67.49297 +982,67.44338 +983,67.49775 +984,67.52859 +985,67.46479 +986,67.48365 +987,67.43507 +988,67.51141 +989,67.44785 +990,67.49252 +991,67.42416 +992,67.40794 +993,67.41336 +994,67.45834 +995,67.56329 +996,67.51195 +997,67.50901 +998,67.44695 +999,67.37113 +1000,67.45338 +1001,67.55418 +1002,67.5863 +1003,67.59798 +1004,67.54067 +1005,67.48345 +1006,67.46925 +1007,67.44605 +1008,67.52624 +1009,67.53369 +1010,67.45757 +1011,67.38073 +1012,67.40447 +1013,67.54397 +1014,67.60402 +1015,67.42757 +1016,67.44405 +1017,67.51009 +1018,67.43048 +1019,67.43091 +1020,67.39736 +1021,67.3034 +1022,67.21925 +1023,67.23254 +1024,67.24818 +1025,67.28364 +1026,67.32109 +1027,67.37182 +1028,67.41594 +1029,67.33236 +1030,67.32539 +1031,67.33989 +1032,67.32244 +1033,67.30468 +1034,67.36742 +1035,67.35175 +1036,67.40735 +1037,67.51395 +1038,67.45991 +1039,67.45622 +1040,67.44938 +1041,67.44463 +1042,67.46808 +1043,67.42249 +1044,67.42055 +1045,67.46171 +1046,67.42848 +1047,67.39214 +1048,67.40249 +1049,67.42625 +1050,67.43766 +1051,67.28013 +1052,67.22175 +1053,67.32677 +1054,67.343 +1055,67.51607 +1056,67.48488 +1057,67.32763 +1058,67.37923 +1059,67.42103 +1060,67.40231 +1061,67.4125 +1062,67.43386 +1063,67.4462 +1064,67.4435 +1065,67.45158 +1066,67.47463 +1067,67.42068 +1068,67.26482 +1069,67.26927 +1070,67.30851 +1071,67.2791 +1072,67.29613 +1073,67.30167 +1074,67.31623 +1075,67.3596 +1076,67.37672 +1077,67.38746 +1078,67.4276 +1079,67.39387 +1080,67.36185 +1081,67.37486 +1082,67.33796 +1083,67.43986 +1084,67.46225 +1085,67.36462 +1086,67.25149 +1087,67.28286 +1088,67.34012 +1089,67.29732 +1090,67.35823 +1091,67.4335 +1092,67.34891 +1093,67.32127 +1094,67.33445 +1095,67.33301 +1096,67.41524 +1097,67.33121 +1098,67.42841 +1099,67.42042 +1100,67.49758 +1101,67.40639 +1102,67.40157 +1103,67.33409 +1104,67.32244 +1105,67.40166 +1106,67.39082 +1107,67.33369 +1108,67.33739 +1109,67.34606 +1110,67.38224 +1111,67.35 +1112,67.3626 +1113,67.39147 +1114,67.46103 +1115,67.38755 +1116,67.38003 +1117,67.2773 +1118,67.27744 +1119,67.22939 +1120,67.34577 +1121,67.33951 +1122,67.34025 +1123,67.2748 +1124,67.21792 +1125,67.27251 +1126,67.27208 +1127,67.25824 +1128,67.36292 +1129,67.34177 +1130,67.40024 +1131,67.39606 +1132,67.38285 +1133,67.34507 +1134,67.33211 +1135,67.3624 +1136,67.3713 +1137,67.33168 +1138,67.28128 +1139,67.31289 +1140,67.35925 +1141,67.32653 +1142,67.34708 +1143,67.3104 +1144,67.36386 +1145,67.30222 +1146,67.33371 +1147,67.33996 +1148,67.19099 +1149,67.21763 +1150,67.28786 +1151,67.3396 +1152,67.23322 +1153,67.24358 +1154,67.15514 +1155,67.14169 +1156,67.154 +1157,67.15695 +1158,67.21102 +1159,67.16372 +1160,67.1659 +1161,67.3268 +1162,67.51499 +1163,67.49229 +1164,67.30457 +1165,67.27071 +1166,67.24648 +1167,67.2017 +1168,67.17733 +1169,67.23291 +1170,67.35143 +1171,67.32767 +1172,67.26922 +1173,67.34152 +1174,67.33778 +1175,67.35222 +1176,67.30349 +1177,67.37762 +1178,67.42243 +1179,67.45827 +1180,67.31458 +1181,67.30421 +1182,67.38699 +1183,67.2919 +1184,67.37412 +1185,67.36863 +1186,67.32019 +1187,67.29818 +1188,67.32041 +1189,67.3137 +1190,67.31373 +1191,67.34315 +1192,67.33326 +1193,67.3804 +1194,67.22936 +1195,67.33707 +1196,67.3812 +1197,67.35365 +1198,67.3525 +1199,67.26844 +1200,67.30975 +1201,67.24213 +1202,67.24995 +1203,67.31713 +1204,67.38441 +1205,67.27122 +1206,67.22046 +1207,67.24378 +1208,67.25539 +1209,67.29316 +1210,67.31593 +1211,67.37675 +1212,67.3394 +1213,67.23414 +1214,67.31226 +1215,67.30087 +1216,67.34856 +1217,67.29382 +1218,67.36529 +1219,67.41385 +1220,67.36388 +1221,67.34804 +1222,67.3619 +1223,67.34531 +1224,67.30615 +1225,67.34568 +1226,67.32053 +1227,67.31718 +1228,67.28609 +1229,67.34626 +1230,67.34766 +1231,67.28265 +1232,67.23956 +1233,67.2638 +1234,67.16655 +1235,67.24332 +1236,67.26299 +1237,67.30311 +1238,67.35281 +1239,67.32239 +1240,67.33184 +1241,67.49775 +1242,67.38627 +1243,67.37905 +1244,67.36932 +1245,67.35017 +1246,67.38449 +1247,67.34908 +1248,67.33479 +1249,67.26285 +1250,67.215 +1251,67.35551 +1252,67.2651 +1253,67.34997 +1254,67.22798 +1255,67.18132 +1256,67.30511 +1257,67.30814 +1258,67.27748 +1259,67.395 +1260,67.48974 +1261,67.38866 +1262,67.39407 +1263,67.33053 +1264,67.33711 +1265,67.262 +1266,67.2854 +1267,67.36945 +1268,67.24924 +1269,67.38924 +1270,67.36208 +1271,67.33961 +1272,67.3185 +1273,67.0757 +1274,67.0177 +1275,67.10956 +1276,67.30673 +1277,67.22749 +1278,67.14273 +1279,67.19482 +1280,67.18777 +1281,67.19225 +1282,67.21754 +1283,67.25608 +1284,67.22928 +1285,67.32556 +1286,67.5323 +1287,67.48389 +1288,67.45413 +1289,67.3387 +1290,67.25591 +1291,67.36369 +1292,67.3913 +1293,67.32854 +1294,67.40344 +1295,67.37218 +1296,67.34998 +1297,67.36692 +1298,67.36951 +1299,67.36298 +1300,67.28772 +1301,67.24501 +1302,67.25233 +1303,67.34151 +1304,67.32768 +1305,67.25754 +1306,67.30914 +1307,67.33906 +1308,67.34363 +1309,67.26569 +1310,67.22572 +1311,67.15762 +1312,67.22765 +1313,67.26807 +1314,67.14999 +1315,67.17934 +1316,67.22498 +1317,67.27197 +1318,67.35238 +1319,67.37997 +1320,67.33804 +1321,67.29108 +1322,67.30826 +1323,67.22507 +1324,67.19612 +1325,67.34376 +1326,67.40443 +1327,67.34287 +1328,67.2914 +1329,67.28666 +1330,67.29926 +1331,67.29337 +1332,67.34447 +1333,67.37234 +1334,67.35576 +1335,67.32059 +1336,67.31245 +1337,67.30603 +1338,67.33044 +1339,67.30824 +1340,67.31828 +1341,67.25275 +1342,67.18868 +1343,67.27906 +1344,67.46364 +1345,67.47001 +1346,67.40237 +1347,67.34492 +1348,67.29137 +1349,67.32008 +1350,67.35283 +1351,67.33575 +1352,67.3634 +1353,67.31926 +1354,67.37299 +1355,67.345 +1356,67.29879 +1357,67.33922 +1358,67.32439 +1359,67.33414 +1360,67.32347 +1361,67.3279 +1362,67.34538 +1363,67.25786 +1364,67.25822 +1365,67.3416 +1366,67.33611 +1367,67.29296 +1368,67.26102 +1369,67.29696 +1370,67.19537 +1371,67.12536 +1372,67.16683 +1373,67.18357 +1374,67.24542 +1375,67.3552 +1376,67.29744 +1377,67.23401 +1378,67.25239 +1379,67.24265 +1380,67.26886 +1381,67.29917 +1382,67.29917 +1383,67.29917 +1384,67.29917 +1385,67.29917 +1386,67.29917 +1387,67.29917 +1388,67.29917 +1389,67.29917 +1390,67.29917 +1391,67.29917 +1392,67.29917 +1393,67.29917 +1394,67.29917 +1395,67.29917 +1396,67.29917 +1397,67.29917 +1398,67.29917 +1399,67.29917 +1400,67.29917 +1401,67.29917 +1402,67.29917 +1403,67.29917 +1404,67.29917 +1405,67.29917 +1406,67.29917 +1407,67.29917 +1408,67.29917 +1409,67.29917 +1410,67.29917 +1411,67.29917 +1412,67.29917 +1413,67.29917 +1414,67.29917 +1415,67.29917 +1416,67.29917 +1417,67.29917 +1418,67.29917 +1419,67.29917 +1420,67.29917 +1421,67.29917 +1422,67.29917 +1423,67.29917 +1424,67.29917 +1425,67.29917 +1426,67.29917 +1427,67.29917 +1428,67.29917 +1429,67.29917 +1430,67.29917 +1431,67.29917 +1432,67.29917 +1433,67.29917 +1434,67.29917 +1435,67.29917 +1436,67.29917 +1437,67.29917 +1438,67.29917 +1439,67.29917 +1440,67.29917 diff --git a/test/villara_24hr67/inletTschedule.csv b/test/villara_24hr67/inletTschedule.csv new file mode 100644 index 00000000..b6177881 --- /dev/null +++ b/test/villara_24hr67/inletTschedule.csv @@ -0,0 +1,1442 @@ +default 58, +minutes,temperature +1,57.75 +2,57.75 +3,57.77667 +4,57.775 +5,57.74833 +6,57.81 +7,57.82167 +8,57.785 +9,57.74833 +10,57.705 +11, +12, +13, +14, +15, +16, +17, +18, +19, +20, +21, +22, +23, +24, +25, +26, +27, +28, +29, +30, +31,57.16833 +32,57.16833 +33,57.2 +34, +35, +36, +37, +38, +39, +40, +41,57.14 +42,57.14 +43, +44, +45, +46, +47, +48, +49, +50, +51, +52, +53, +54, +55, +56, +57, +58, +59, +60, +61, +62, +63, +64, +65, +66, +67, +68, +69, +70, +71, +72, +73, +74, +75, +76, +77, +78, +79, +80, +81, +82, +83, +84, +85, +86, +87, +88, +89, +90, +91, +92, +93, +94, +95, +96, +97, +98, +99, +100, +101,57.3 +102,57.3 +103,57.28167 +104,57.18167 +105,57.14167 +106,57.22167 +107, +108, +109, +110, +111, +112, +113, +114, +115, +116, +117, +118, +119, +120, +121, +122, +123, +124, +125, +126, +127, +128, +129, +130, +131, +132, +133, +134, +135, +136, +137, +138, +139, +140, +141, +142, +143, +144, +145, +146, +147, +148, +149, +150, +151, +152, +153, +154, +155, +156, +157, +158, +159, +160, +161, +162, +163, +164, +165, +166, +167, +168, +169, +170, +171, +172, +173, +174, +175, +176, +177, +178, +179, +180, +181, +182, +183, +184, +185, +186, +187, +188, +189, +190, +191, +192, +193, +194, +195, +196, +197, +198, +199, +200, +201, +202, +203, +204, +205, +206, +207, +208, +209, +210, +211, +212, +213, +214, +215, +216, +217, +218, +219, +220, +221, +222, +223, +224, +225, +226, +227, +228, +229, +230, +231, +232, +233, +234, +235, +236, +237, +238, +239, +240, +241, +242, +243, +244, +245, +246, +247, +248, +249, +250, +251, +252, +253, +254, +255, +256, +257, +258, +259, +260, +261, +262, +263, +264, +265, +266, +267, +268, +269, +270, +271, +272, +273, +274, +275, +276, +277, +278, +279, +280, +281, +282, +283, +284, +285, +286, +287, +288, +289, +290, +291, +292, +293, +294, +295, +296, +297, +298, +299, +300, +301, +302, +303, +304, +305, +306, +307, +308, +309, +310, +311, +312, +313, +314, +315, +316, +317, +318, +319, +320, +321, +322, +323, +324, +325, +326, +327, +328, +329, +330, +331, +332, +333, +334, +335, +336, +337, +338, +339, +340, +341, +342, +343, +344, +345, +346, +347, +348, +349, +350, +351, +352, +353, +354, +355, +356, +357, +358, +359, +360, +361, +362, +363, +364, +365, +366, +367, +368, +369, +370, +371, +372, +373, +374, +375, +376, +377, +378, +379, +380, +381, +382, +383, +384, +385, +386, +387, +388, +389, +390, +391, +392, +393, +394, +395, +396, +397, +398, +399, +400, +401, +402, +403, +404, +405, +406, +407, +408, +409, +410, +411, +412, +413, +414, +415, +416, +417, +418, +419, +420, +421, +422, +423, +424, +425, +426, +427, +428, +429, +430, +431, +432, +433, +434, +435, +436, +437, +438, +439, +440, +441, +442, +443, +444, +445, +446, +447, +448, +449, +450, +451, +452, +453, +454, +455, +456, +457, +458, +459, +460, +461, +462, +463, +464, +465, +466, +467, +468, +469, +470, +471, +472, +473, +474, +475, +476, +477, +478, +479, +480, +481, +482, +483, +484, +485, +486, +487, +488, +489, +490, +491, +492, +493, +494, +495, +496, +497, +498, +499, +500, +501, +502, +503, +504, +505, +506, +507, +508, +509, +510, +511, +512, +513, +514, +515, +516, +517, +518, +519, +520, +521, +522, +523, +524, +525, +526, +527, +528, +529, +530, +531, +532, +533, +534, +535, +536, +537, +538, +539, +540, +541, +542, +543, +544, +545, +546, +547, +548, +549, +550, +551, +552, +553, +554, +555, +556, +557, +558, +559, +560, +561, +562, +563, +564, +565, +566, +567, +568, +569, +570, +571, +572, +573, +574, +575, +576, +577, +578, +579, +580, +581, +582, +583, +584, +585, +586, +587, +588, +589, +590, +591, +592, +593, +594, +595, +596, +597, +598, +599, +600, +601, +602, +603, +604, +605, +606, +607, +608, +609, +610, +611, +612, +613, +614, +615, +616, +617, +618, +619, +620, +621, +622, +623, +624, +625, +626, +627, +628, +629, +630, +631,57.47833 +632,57.47833 +633,57.595 +634,57.625 +635,57.75834 +636,57.73167 +637, +638, +639, +640, +641, +642, +643, +644, +645, +646, +647, +648, +649, +650, +651, +652, +653, +654, +655, +656, +657, +658, +659, +660, +661, +662, +663, +664, +665, +666, +667, +668, +669, +670, +671, +672, +673, +674, +675, +676, +677, +678, +679, +680, +681, +682, +683, +684, +685, +686, +687, +688, +689, +690, +691,57.24833 +692,57.24833 +693,57.3 +694,57.38833 +695, +696, +697, +698, +699, +700, +701, +702, +703, +704, +705, +706, +707, +708, +709, +710, +711, +712, +713, +714, +715, +716, +717, +718, +719, +720, +721,57.2 +722,57.2 +723, +724, +725, +726, +727, +728, +729, +730, +731, +732, +733, +734, +735, +736, +737, +738, +739, +740, +741, +742, +743, +744, +745, +746, +747, +748, +749, +750, +751, +752, +753, +754, +755, +756, +757, +758, +759, +760, +761, +762, +763, +764, +765, +766,57.09167 +767,57.09167 +768, +769, +770, +771,57.18333 +772,57.18333 +773, +774, +775, +776, +777, +778, +779, +780, +781, +782, +783, +784, +785, +786, +787, +788, +789, +790, +791, +792, +793, +794, +795, +796, +797, +798, +799, +800, +801, +802, +803, +804, +805, +806, +807, +808, +809, +810, +811, +812, +813, +814, +815, +816, +817, +818, +819, +820, +821, +822, +823, +824, +825, +826, +827, +828, +829, +830, +831, +832, +833, +834, +835, +836, +837, +838, +839, +840, +841, +842, +843, +844, +845, +846, +847, +848, +849, +850, +851, +852, +853, +854, +855, +856, +857, +858, +859, +860, +861, +862, +863, +864, +865, +866, +867, +868, +869, +870, +871, +872, +873, +874, +875, +876, +877, +878, +879, +880, +881, +882, +883, +884, +885, +886, +887, +888, +889, +890, +891, +892, +893, +894, +895, +896, +897, +898, +899, +900, +901, +902, +903, +904, +905, +906, +907, +908, +909, +910, +911, +912, +913, +914, +915, +916, +917, +918, +919, +920, +921, +922, +923, +924, +925, +926, +927, +928, +929, +930, +931, +932, +933, +934, +935, +936, +937, +938, +939, +940, +941, +942, +943, +944, +945, +946, +947, +948, +949, +950, +951, +952, +953, +954, +955, +956, +957, +958, +959, +960, +961,57.1 +962,57.1 +963,57.19833 +964, +965, +966, +967, +968, +969, +970, +971, +972, +973, +974, +975, +976,57.20167 +977,57.20167 +978,57.235 +979, +980, +981, +982, +983, +984, +985, +986, +987, +988, +989, +990, +991,57.31 +992,57.31 +993, +994, +995, +996, +997, +998, +999, +1000, +1001, +1002, +1003, +1004, +1005, +1006,57.19333 +1007,57.19333 +1008, +1009, +1010, +1011, +1012, +1013, +1014, +1015, +1016, +1017, +1018, +1019, +1020, +1021,57.605 +1022,57.605 +1023,57.63 +1024,57.71 +1025,57.67167 +1026,57.70167 +1027, +1028, +1029, +1030, +1031, +1032, +1033, +1034, +1035, +1036, +1037, +1038, +1039, +1040, +1041, +1042, +1043, +1044, +1045, +1046, +1047, +1048, +1049, +1050, +1051, +1052, +1053, +1054, +1055, +1056, +1057, +1058, +1059, +1060, +1061, +1062, +1063, +1064, +1065, +1066, +1067, +1068, +1069, +1070, +1071, +1072, +1073, +1074, +1075, +1076, +1077, +1078, +1079, +1080, +1081, +1082, +1083, +1084, +1085, +1086, +1087, +1088, +1089, +1090, +1091, +1092, +1093, +1094, +1095, +1096, +1097, +1098, +1099, +1100, +1101, +1102, +1103, +1104, +1105, +1106, +1107, +1108, +1109, +1110, +1111, +1112, +1113, +1114, +1115, +1116, +1117, +1118, +1119, +1120, +1121, +1122, +1123, +1124, +1125, +1126, +1127, +1128, +1129, +1130, +1131, +1132, +1133, +1134, +1135, +1136, +1137, +1138, +1139, +1140, +1141, +1142, +1143, +1144, +1145, +1146, +1147, +1148, +1149, +1150, +1151, +1152, +1153, +1154, +1155, +1156, +1157, +1158, +1159, +1160, +1161, +1162, +1163, +1164, +1165, +1166, +1167, +1168, +1169, +1170, +1171, +1172, +1173, +1174, +1175, +1176, +1177, +1178, +1179, +1180, +1181, +1182, +1183, +1184, +1185, +1186, +1187, +1188, +1189, +1190, +1191, +1192, +1193, +1194, +1195, +1196, +1197, +1198, +1199, +1200, +1201, +1202, +1203, +1204, +1205, +1206, +1207, +1208, +1209, +1210, +1211, +1212, +1213, +1214, +1215, +1216, +1217, +1218, +1219, +1220, +1221, +1222, +1223, +1224, +1225, +1226, +1227, +1228, +1229, +1230, +1231, +1232, +1233, +1234, +1235, +1236, +1237, +1238, +1239, +1240, +1241, +1242, +1243, +1244, +1245, +1246, +1247, +1248, +1249, +1250, +1251, +1252, +1253, +1254, +1255, +1256, +1257, +1258, +1259, +1260, +1261, +1262, +1263, +1264, +1265, +1266, +1267, +1268, +1269, +1270, +1271, +1272, +1273, +1274, +1275, +1276, +1277, +1278, +1279, +1280, +1281, +1282, +1283, +1284, +1285, +1286, +1287, +1288, +1289, +1290, +1291, +1292, +1293, +1294, +1295, +1296, +1297, +1298, +1299, +1300, +1301, +1302, +1303, +1304, +1305, +1306, +1307, +1308, +1309, +1310, +1311, +1312, +1313, +1314, +1315, +1316, +1317, +1318, +1319, +1320, +1321, +1322, +1323, +1324, +1325, +1326, +1327, +1328, +1329, +1330, +1331, +1332, +1333, +1334, +1335, +1336, +1337, +1338, +1339, +1340, +1341, +1342, +1343, +1344, +1345, +1346, +1347, +1348, +1349, +1350, +1351, +1352, +1353, +1354, +1355, +1356, +1357, +1358, +1359, +1360, +1361, +1362, +1363, +1364, +1365, +1366, +1367, +1368, +1369, +1370, +1371, +1372, +1373, +1374, +1375, +1376, +1377, +1378, +1379, +1380, +1381, +1382, +1383, +1384, +1385, +1386, +1387, +1388, +1389, +1390, +1391, +1392, +1393, +1394, +1395, +1396, +1397, +1398, +1399, +1400, +1401, +1402, +1403, +1404, +1405, +1406, +1407, +1408, +1409, +1410, +1411, +1412, +1413, +1414, +1415, +1416, +1417, +1418, +1419, +1420, +1421, +1422, +1423, +1424, +1425, +1426, +1427, +1428, +1429, +1430, +1431, +1432, +1433, +1434, +1435, +1436, +1437, +1438, +1439, +1440, diff --git a/test/villara_24hr67/testInfo.txt b/test/villara_24hr67/testInfo.txt new file mode 100644 index 00000000..e42e54f0 --- /dev/null +++ b/test/villara_24hr67/testInfo.txt @@ -0,0 +1,2 @@ +HPWH_setpoint 125 +length_of_test 1440 From 6e78b76be23447979e54e5b095628c27289fee79 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Wed, 1 Nov 2023 12:55:43 -0600 Subject: [PATCH 04/23] Fails villara test. --- src/HPWHpresets.cc | 2 +- test/CMakeLists.txt | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 093a17b7..33c493a3 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3824,7 +3824,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { setNumNodes(1); setpoint_C = F_TO_C(125.); - tankVolume_L = 54.4; + tankVolume_L = GAL_TO_L(54.4); tankUA_kJperHrC = 10.35; doTempDepression = false; diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 964229b8..c20594b9 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -75,7 +75,6 @@ set(modelNames Rheem2020Prem40 Rheem2020Prem50 Rheem2020Build50 - AquaThermAire # RheemPlugInDedicated50 ) set(lockoutTestModels @@ -185,6 +184,12 @@ set(yearLargeTestsModels TamScalable_SP Scalable_MP ) +set(heatExchangeModelNames + AquaThermAire +) +set(heatExchangeTests + villara_24hr67 +) set(yearLargeTests testCA_36Unit_CTZ12 ) @@ -200,6 +205,10 @@ set(stateOfChargeCompressorNames NyleC25A_SP ) + +list(APPEND extendedModelNames ${modelNames} ${heatExchangeModelNames}) +list(REMOVE_DUPLICATES extendedModelNames) + # Unit tests function( add_TankSizeFixed_test ) set(options) @@ -215,7 +224,7 @@ function( add_TankSizeFixed_test ) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endfunction() -foreach(model ${modelNames}) +foreach(model ${extendedModelNames}) add_TankSizeFixed_test( MODEL_NAME "${model}") endforeach(model) foreach(model ${largeCompressorNames}) @@ -256,17 +265,27 @@ function( add_model_test ) endfunction() foreach(test ${testNames}) - foreach(model ${modelNames}) + foreach(model ${extendedModelNames}) add_model_test( TEST_NAME "${test}" MODEL_NAME "${model}" INP_SOURCE "Preset") add_model_test( TEST_NAME "${test}" MODEL_NAME "${model}" INP_SOURCE "File") endforeach(model) endforeach(test) + +#Test(s) specifically for heat-exchange models +foreach(test ${heatExchangeTests}) + foreach(model ${heatExchangeModelNames}) + add_model_test( TEST_NAME "${test}" MODEL_NAME "${model}" INP_SOURCE "Preset") + add_model_test( TEST_NAME "${test}" MODEL_NAME "${model}" INP_SOURCE "File") + endforeach(model) +endforeach(test) + #Test models follow control logic with max temperatures. foreach(test ${maxTempTests}) foreach(model ${maxTempModels}) add_model_test( TEST_NAME "${test}" MODEL_NAME "${model}" INP_SOURCE "Preset") endforeach(model) endforeach(test) + #Add large compressor tests to the list foreach(test ${largeCompressorTests}) foreach(model ${largeCompressorNames}) @@ -275,6 +294,7 @@ foreach(test ${largeCompressorTests}) #add_model_test( TEST_NAME "${test}" MODEL_NAME "${model}" INP_SOURCE "File") endforeach(model) endforeach(test) + #Add State of Charge tests to the list foreach(test ${stateOfChargeTests}) foreach(model ${stateOfChargeCompressorNames}) @@ -298,7 +318,6 @@ foreach(test ${yearLargeTests}) endforeach(model) endforeach(test) - # Tests for differences between File and Preset versions function( add_file_test ) set(options) @@ -319,7 +338,14 @@ function( add_file_test ) endfunction() foreach(test ${testNames}) - foreach(model ${modelNames}) + foreach(model ${extendedModelNames}) + add_file_test( TEST_NAME "${test}" MODEL_NAME "${model}") + endforeach(model) +endforeach(test) + +#Test(s) specifically for heat-exchange models +foreach(test ${heatExchangeTests}) + foreach(model ${heatExchangeModelNames}) add_file_test( TEST_NAME "${test}" MODEL_NAME "${model}") endforeach(model) endforeach(test) From 46819540e60e6f5c3345ac14f297711fc3b4f4fb Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Wed, 1 Nov 2023 13:26:34 -0600 Subject: [PATCH 05/23] Adjust villara time. --- test/villara_24hr67/testInfo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/villara_24hr67/testInfo.txt b/test/villara_24hr67/testInfo.txt index e42e54f0..686199cf 100644 --- a/test/villara_24hr67/testInfo.txt +++ b/test/villara_24hr67/testInfo.txt @@ -1,2 +1,2 @@ HPWH_setpoint 125 -length_of_test 1440 +length_of_test 1441 From 7a6b418c62ff690ba8a4bb25c5dee89c81b61a55 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Thu, 2 Nov 2023 13:57:41 -0600 Subject: [PATCH 06/23] Aquatherm added. --- src/HPWH.cc | 86 ++++++++++++++++++---------------------- src/HPWH.in.hh | 33 +++++++-------- src/HPWHHeatSources.cc | 82 ++++++++++++++++---------------------- src/HPWHHeatingLogics.cc | 7 ++-- src/HPWHpresets.cc | 66 +++++++++++++++--------------- test/CMakeLists.txt | 4 +- 6 files changed, 125 insertions(+), 153 deletions(-) diff --git a/src/HPWH.cc b/src/HPWH.cc index 21767edd..222eb6a0 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -233,7 +233,6 @@ HPWH & HPWH::operator=(const HPWH &hpwh) { fittingsUA_kJperHrC = hpwh.fittingsUA_kJperHrC; setpoint_C = hpwh.setpoint_C; - nodeDensity = hpwh.nodeDensity; tankTemps_C = hpwh.tankTemps_C; nextTankTemps_C = hpwh.nextTankTemps_C; @@ -518,9 +517,9 @@ int HPWH::runOneStep(double drawVolume_L, if(areAllHeatSourcesOff() == true) { isHeating = false; } - //If theres extra user defined heat to add -> Add extra heat! + //If there's extra user defined heat to add -> Add extra heat! if(nodePowerExtra_W != NULL && (*nodePowerExtra_W).size() != 0) { - addExtraHeat(nodePowerExtra_W,tankAmbientT_C); + addExtraHeat(*nodePowerExtra_W,tankAmbientT_C); updateSoCIfNecessary(); } @@ -637,16 +636,17 @@ int HPWH::runNSteps(int N,double *inletT_C,double *drawVolume_L, msg("%f,%f,",getNthHeatSourceEnergyInput(j),getNthHeatSourceEnergyOutput(j)); } + std::vector displayTemps_C(10); + resampleIntensive(displayTemps_C, tankTemps_C); bool first = true; - for (int k = 0; k < 10; ++k) + for (auto &displayTemp: displayTemps_C) { if (first) first = false; else msg(","); - int j = nodeDensity * k; - msg("%f", tankTemps_C[j]); + msg("%f",displayTemp); } for (int k = 1; k < 7; ++k) @@ -1643,13 +1643,13 @@ std::shared_ptr HPWH::bottomTwelfth(double decision std::shared_ptr HPWH::standby(double decisionPoint) { std::vector nodeWeights; - nodeWeights.emplace_back(13); // uses very top computation node + nodeWeights.emplace_back(LOGIC_NODE_SIZE + 1); // uses very top computation node return std::make_shared("standby",nodeWeights,decisionPoint,this); } std::shared_ptr HPWH::topNodeMaxTemp(double decisionPoint) { std::vector nodeWeights; - nodeWeights.emplace_back(13); // uses very top computation node + nodeWeights.emplace_back(LOGIC_NODE_SIZE + 1); // uses very top computation node return std::make_shared("top node",nodeWeights,decisionPoint,this,true,std::greater()); } @@ -2381,7 +2381,7 @@ int HPWH::getResistancePosition(int elementIndex) const { return HPWH_ABORT; } - for(int i = 0; i < CONDENSITY_SIZE; i++) { + for(int i = 0; i < heatSources[elementIndex].getCondensitySize(); i++) { if(heatSources[elementIndex].condensity[i] == 1) { // res elements have a condenstiy of 1 at a specific node return i; } @@ -2651,18 +2651,7 @@ void HPWH::mixTankInversions() { } } -void HPWH::addExtraHeat(std::vector* nodePowerExtra_W,double tankAmbientT_C){ - if((*nodePowerExtra_W).size() > CONDENSITY_SIZE){ - if(hpwhVerbosity >= VRB_reluctant) { - msg("nodeExtraHeat_KWH (%i) has size greater than %d \n",(*nodePowerExtra_W).size(),CONDENSITY_SIZE); - } - simHasFailed = true; - } - - //for (unsigned int i = 0; i < (*nodePowerExtra_W).size(); i++){ - // tankTemps_C[i] += (*nodePowerExtra_W)[i] * minutesPerStep * 60. / (CPWATER_kJperkgC * 1000. * DENSITYWATER_kgperL * tankVolume_L / numNodes); - //} - //mixTankInversions(); +void HPWH::addExtraHeat(std::vector &nodePowerExtra_W,double tankAmbientT_C){ for(int i = 0; i < getNumHeatSources(); i++){ if(heatSources[i].typeOfHeatSource == TYPE_extra) { @@ -2674,8 +2663,7 @@ void HPWH::addExtraHeat(std::vector* nodePowerExtra_W,double tankAmbient calcDerivedHeatingValues(); // add heat - heatSources[i].addHeat(tankAmbientT_C,minutesPerStep); - + heatSources[i].addHeat(tankAmbientT_C,minutesPerStep); // 0 out to ignore features heatSources[i].perfMap.clear(); @@ -2763,9 +2751,6 @@ void HPWH::calcSizeConstants() { } void HPWH::calcDerivedValues() { - // tank node density (number of calculation nodes per regular node) - nodeDensity = getNumNodes() / 12; - // condentropy/shrinkage and lowestNode are now in calcDerivedHeatingValues() calcDerivedHeatingValues(); @@ -2787,37 +2772,41 @@ void HPWH::calcDerivedHeatingValues(){ static char outputString[MAXOUTSTRING]; //this is used for debugging outputs //condentropy/shrinkage - double condentropy = 0; - double alpha = 1,beta = 2; // Mapping from condentropy to shrinkage - for(int i = 0; i < getNumHeatSources(); i++) { + double condentropy = 0.; + double Talpha_C = 1.,Tbeta_C = 2.; // Mapping from condentropy to shrinkage + for(int i = 0; i < getNumHeatSources(); ++i) { if(hpwhVerbosity >= VRB_emetic) { msg(outputString,"Heat Source %d \n",i); } // Calculate condentropy and ==> shrinkage - condentropy = 0; - for(int j = 0; j < CONDENSITY_SIZE; j++) { - if(heatSources[i].condensity[j] > 0) { + condentropy = 0.; + for(int j = 0; j < heatSources[i].getCondensitySize(); ++j) { + if(heatSources[i].condensity[j] > 0.) { condentropy -= heatSources[i].condensity[j] * log(heatSources[i].condensity[j]); if(hpwhVerbosity >= VRB_emetic) msg(outputString,"condentropy %.2lf \n",condentropy); } } - heatSources[i].shrinkage = alpha + condentropy * beta; + // condentropy shifts as ln(# of condensity nodes) + double condensity_size_factor = static_cast(heatSources[i].getCondensitySize()) / CONDENSITY_SIZE; + double standard_condentropy = condentropy - log(condensity_size_factor); + heatSources[i].Tshrinkage_C = Talpha_C + standard_condentropy * Tbeta_C; if(hpwhVerbosity >= VRB_emetic) { - msg(outputString,"shrinkage %.2lf \n\n",heatSources[i].shrinkage); + msg(outputString,"shrinkage %.2lf \n\n",heatSources[i].Tshrinkage_C); } } //lowest node int lowest = 0; - double nodeRatio = getNumNodes() / CONDENSITY_SIZE; for(int i = 0; i < getNumHeatSources(); i++) { lowest = 0; + const int condensitySize = heatSources[i].getCondensitySize(); + double nodeRatio = getNumNodes() / condensitySize; if(hpwhVerbosity >= VRB_emetic) { msg(outputString,"Heat Source %d \n",i); } - for(auto j = 0; j < CONDENSITY_SIZE; ++j) { + for(auto j = 0; j < condensitySize; ++j) { if(heatSources[i].condensity[j] > 0) { lowest = static_cast(nodeRatio * j); break; @@ -2835,8 +2824,8 @@ void HPWH::calcDerivedHeatingValues(){ lowestElementIndex = -1; // Default = No resistance elements highestElementIndex = -1; // Default = No resistance elements VIPIndex = -1; // Default = No VIP element - int lowestElementPos = CONDENSITY_SIZE; - int highestElementPos = 0; // -1 to make sure a an element on the bottom can still be identified. + double lowestPos = 1.; + double highestPos = 0.; // -1 to make sure a an element on the bottom can still be identified. for(int i = 0; i < getNumHeatSources(); i++) { if(heatSources[i].isACompressor()) { compressorIndex = i; // NOTE: Maybe won't work with multiple compressors (last compressor will be used) @@ -2851,14 +2840,16 @@ void HPWH::calcDerivedHeatingValues(){ }; } } - for(int j = 0; j < CONDENSITY_SIZE; j++) { - if(heatSources[i].condensity[j] > 0.0 && j < lowestElementPos) { + int condensitySize = heatSources[i].getCondensitySize(); + for(int j = 0; j < condensitySize; ++j) { + double pos = static_cast(j) / condensitySize; + if((heatSources[i].condensity[j] > 0.) && (pos < lowestPos)) { lowestElementIndex = i; - lowestElementPos = j; + lowestPos = pos; } - if(heatSources[i].condensity[j] > 0.0 && j >= highestElementPos) { + if((heatSources[i].condensity[j] > 0.) && (pos >= highestPos)) { highestElementIndex = i; - highestElementPos = j; + highestPos = pos; } } } @@ -2902,7 +2893,6 @@ void HPWH::mapResRelativePosToHeatSources() { }); } - // Used to check a few inputs after the initialization of a tank model from a preset or a file. int HPWH::checkInputs() { int returnVal = 0; @@ -2955,7 +2945,7 @@ int HPWH::checkInputs() { //check is condensity sums to 1 condensitySum = 0; - for(int j = 0; j < CONDENSITY_SIZE; j++) condensitySum += heatSources[i].condensity[j]; + for(int j = 0; j < heatSources[i].getCondensitySize(); j++) condensitySum += heatSources[i].condensity[j]; if(fabs(condensitySum - 1.0) > 1e-6) { if(hpwhVerbosity >= VRB_reluctant) { msg("The condensity for heatsource %d does not sum to 1. \n",i); @@ -3317,9 +3307,9 @@ int HPWH::HPWHinit_file(string configFile) { line_ss >> nextToken; while(std::regex_match(nextToken,std::regex("\\d+"))) { int nodeNum = std::stoi(nextToken); - if(nodeNum > 13 || nodeNum < 0) { + if(nodeNum > LOGIC_NODE_SIZE + 1 || nodeNum < 0) { if(hpwhVerbosity >= VRB_reluctant) { - msg("Node number for heatsource %d %s must be between 0 and 13. \n",heatsource,token.c_str()); + msg("Node number for heatsource %d %s must be between 0 and %d. \n",heatsource,token.c_str(), LOGIC_NODE_SIZE + 1); } return HPWH_ABORT; } @@ -3340,7 +3330,7 @@ int HPWH::HPWHinit_file(string configFile) { } if(nodeNums.size() != weights.size()) { if(hpwhVerbosity >= VRB_reluctant) { - msg("Number of weights for heatsource %d %s (%d) does not macht number of nodes for %s (%d). \n",heatsource,token.c_str(),weights.size(),token.c_str(),nodeNums.size()); + msg("Number of weights for heatsource %d %s (%d) does not match number of nodes for %s (%d). \n",heatsource,token.c_str(),weights.size(),token.c_str(),nodeNums.size()); } return HPWH_ABORT; } diff --git a/src/HPWH.in.hh b/src/HPWH.in.hh index 7897e4f5..118b477a 100644 --- a/src/HPWH.in.hh +++ b/src/HPWH.in.hh @@ -817,8 +817,9 @@ private: void addHeatParent(HeatSource *heatSourcePtr,double heatSourceAmbientT_C,double minutesToRun); - void addExtraHeat(std::vector* nodePowerExtra_W,double tankAmbientT_C); - /**< adds extra heat defined by the user. Where nodeExtraHeat[] is a vector of heat quantities to be added during the step. nodeExtraHeat[ 0] would go to bottom node, 1 to next etc. */ + void addExtraHeat(std::vector &nodePowerExtra_W,double tankAmbientT_C); + /**< adds extra heat defined by the user, where nodeExtraHeat[] is a vector of heat quantities to be added during the step. + nodeExtraHeat[ 0] would go to bottom node, 1 to next etc. */ double tankAvg_C(const std::vector nodeWeights) const; /**< functions to calculate what the temperature in a portion of the tank is */ @@ -893,9 +894,6 @@ private: int VIPIndex; /**< The index of the VIP resistance element heat source (set to -1 if no VIP resistance elements)*/ - int nodeDensity; - /**< the number of calculation nodes in a logical node */ - int inletHeight; /**< the number of a node in the tank that the inlet water enters the tank at, must be between 0 and numNodes-1 */ @@ -917,7 +915,7 @@ private: /**< the mass of water (kg) in a single node */ double nodeMass_kg; - /**< the heat capacity of the water (kJ/°C) in a single node */ + /**< the heat capacity of the water (kJ/�C) in a single node */ double nodeCp_kJperC; /**< the height in meters of the one node */ @@ -1024,11 +1022,11 @@ public: /**< the copy constructor and assignment operator basically just checks if there are backup/companion pointers - these can't be copied */ - void setupAsResistiveElement(int node,double Watts); + void setupAsResistiveElement(int node,double Watts,int condensitySize = CONDENSITY_SIZE); /**< configure the heat source to be a resisive element, positioned at the specified node, with the specified power in watts */ - void setupExtraHeat(std::vector* nodePowerExtra_W); - /**< Configure a user defined heat source added as extra, based off using + void setupExtraHeat(std::vector &nodePowerExtra_W); + /**< Configure a user-defined heat source added as extra, based off using nodePowerExtra_W as the total watt input and the condensity*/ bool isEngaged() const; @@ -1072,14 +1070,11 @@ public: /**< adds heat to the hpwh - this is the function that interprets the various configurations (internal/external, resistance/heat pump) to add heat */ - // Assign new condensity values from supplied vector. Note the input vector is currently resampled - // to preserve a condensity vector of size CONDENSITY_SIZE. + /// Assign new condensity values from supplied vector. Note the input vector is currently resampled + /// to preserve a condensity vector of size CONDENSITY_SIZE. void setCondensity(const std::vector &condensity_in); - void setCondensity(double cnd1,double cnd2,double cnd3,double cnd4, - double cnd5,double cnd6,double cnd7,double cnd8, - double cnd9,double cnd10,double cnd11,double cnd12); - /**< a function to set the condensity values, it pretties up the init funcs. */ + int getCondensitySize() const; void linearInterp(double &ynew,double xnew,double x0,double x1,double y0,double y1); /**< Does a simple linear interpolation between two points to the xnew point */ @@ -1148,10 +1143,10 @@ private: // by specifying the entire condensity in one node. */ std::vector condensity; - double shrinkage; - /**< the shrinkage is a derived value, using parameters alpha, beta, - and the condentropy, which is derived from the condensity - alpha and beta are not intended to be settable + double Tshrinkage_C; + /**< Tshrinkage_C is a derived from the condentropy (conditional entropy), + using the condensity and fixed parameters Talpha_C and Tbeta_C. + Talpha_C and Tbeta_C are not intended to be settable see the hpwh_init functions for calculation of shrinkage */ struct perfPoint { diff --git a/src/HPWHHeatSources.cc b/src/HPWHHeatSources.cc index ccafa098..c9049c7c 100644 --- a/src/HPWHHeatSources.cc +++ b/src/HPWHHeatSources.cc @@ -52,7 +52,7 @@ HPWH::HeatSource& HPWH::HeatSource::operator=(const HeatSource &hSource) { condensity = hSource.condensity; - shrinkage = hSource.shrinkage; + Tshrinkage_C = hSource.Tshrinkage_C; perfMap = hSource.perfMap; @@ -94,14 +94,11 @@ HPWH::HeatSource& HPWH::HeatSource::operator=(const HeatSource &hSource) { } void HPWH::HeatSource::setCondensity(const std::vector &condensity_in) { - condensity.resize(CONDENSITY_SIZE); - resampleExtensive(condensity, condensity_in); + condensity = condensity_in; } -void HPWH::HeatSource::setCondensity(double cnd1,double cnd2,double cnd3,double cnd4, - double cnd5,double cnd6,double cnd7,double cnd8, - double cnd9,double cnd10,double cnd11,double cnd12) { - setCondensity({cnd1, cnd2, cnd3, cnd4, cnd5, cnd6, cnd7, cnd8, cnd9, cnd10, cnd11, cnd12}); +int HPWH::HeatSource::getCondensitySize() const { + return static_cast(condensity.size()); } int HPWH::HeatSource::findParent() const { @@ -387,9 +384,6 @@ void HPWH::HeatSource::addHeat(double externalT_C,double minutesToRun) { case CONFIG_WRAPPED: { static std::vector heatDistribution(hpwh->getNumNodes()); - //clear the heatDistribution vector, since it's static it is still holding the - //distribution from the last go around - heatDistribution.clear(); //calcHeatDist takes care of the swooping for wrapped configurations calcHeatDist(heatDistribution); @@ -484,7 +478,7 @@ void HPWH::HeatSource::normalize(std::vector &distribution) { double HPWH::HeatSource::getTankTemp() const{ - std::vector resampledTankTemps(CONDENSITY_SIZE); + std::vector resampledTankTemps(getCondensitySize()); resample(resampledTankTemps, hpwh->tankTemps_C); double tankTemp_C = 0.; @@ -742,27 +736,24 @@ void HPWH::HeatSource::btwxtInterp(double& input_BTUperHr,double& cop,std::vecto void HPWH::HeatSource::calcHeatDist(std::vector &heatDistribution) { // Populate the vector of heat distribution - for(int i = 0; i < hpwh->getNumNodes(); i++) { - if(i < lowestNode) { - heatDistribution.push_back(0); - } else { - int k; - if(configuration == CONFIG_SUBMERGED) { // Inside the tank, no swoopiness required - //intentional integer division - k = i / int(hpwh->getNumNodes() / CONDENSITY_SIZE); - heatDistribution.push_back(condensity[k]); - } else if(configuration == CONFIG_WRAPPED) { // Wrapped around the tank, send through the logistic function - double temp = 0; //temp for temporary not temperature - double offset = 5.0 / 1.8; - temp = expitFunc((hpwh->tankTemps_C[i] - hpwh->tankTemps_C[lowestNode]) / this->shrinkage,offset); - temp *= (hpwh->setpoint_C - hpwh->tankTemps_C[i]); - if(temp < 0.) // SETPOINT_FIX - temp = 0.; - heatDistribution.push_back(temp); + if(configuration == CONFIG_SUBMERGED) { + resampleExtensive(heatDistribution, condensity); + } + else if(configuration == CONFIG_WRAPPED) { // Wrapped around the tank, send through the logistic function + for(int i = 0; i < hpwh->getNumNodes(); i++) { + double dist = 0.; + if(i >= lowestNode){ + double Toffset_C = 5.0 / 1.8; // 5 degF + double offset = Toffset_C / 1.; // should be dimensionless; guessing the denominator should have been Tshrinkage_C + dist = expitFunc((hpwh->tankTemps_C[i] - hpwh->tankTemps_C[lowestNode]) / Tshrinkage_C,offset); + dist *= (hpwh->setpoint_C - hpwh->tankTemps_C[i]); + if(dist < 0.) // SETPOINT_FIX + dist = 0.; } + heatDistribution[i] = dist; } + normalize(heatDistribution); } - normalize(heatDistribution); } double HPWH::HeatSource::addHeatAboveNode(double cap_kJ,int node) { @@ -970,11 +961,11 @@ double HPWH::HeatSource::addHeatExternal(double externalT_C,double minutesToRun, return timeRun; } -void HPWH::HeatSource::setupAsResistiveElement(int node,double Watts) { +void HPWH::HeatSource::setupAsResistiveElement(int node,double Watts,int condensitySize/* = CONDENSITY_SIZE*/) { isOn = false; isVIP = false; - condensity = std::vector(CONDENSITY_SIZE, 0.); + condensity = std::vector(condensitySize, 0.); condensity[node] = 1; perfMap.reserve(2); @@ -996,33 +987,28 @@ void HPWH::HeatSource::setupAsResistiveElement(int node,double Watts) { typeOfHeatSource = TYPE_resistance; } -void HPWH::HeatSource::setupExtraHeat(std::vector* nodePowerExtra_W) { +void HPWH::HeatSource::setupExtraHeat(std::vector &nodePowerExtra_W) { - std::vector tempCondensity(CONDENSITY_SIZE); + // retain original condensity size for this heat source + std::vector extraCondensity(getCondensitySize()); + resampleExtensive(extraCondensity, nodePowerExtra_W); double watts = 0.0; - for(unsigned int i = 0; i < (*nodePowerExtra_W).size(); i++) { + for(int i = 0; i < getCondensitySize(); ++i) { //get sum of vector - watts += (*nodePowerExtra_W)[i]; - - //put into vector for normalization - tempCondensity[i] = (*nodePowerExtra_W)[i]; + watts += extraCondensity[i]; } + normalize(extraCondensity); - normalize(tempCondensity); - + // set condensity + setCondensity(extraCondensity); if(hpwh->hpwhVerbosity >= VRB_emetic){ hpwh->msg("extra heat condensity: "); - for(unsigned int i = 0; i < tempCondensity.size(); i++) { - hpwh->msg("C[%d]: %f",i,tempCondensity[i]); + for(int i = 0; i < getCondensitySize(); i++) { + hpwh->msg("C[%d]: %f",i,condensity[i]); } hpwh->msg("\n "); } - - // set condensity based on normalized vector - setCondensity(tempCondensity[0],tempCondensity[1],tempCondensity[2],tempCondensity[3], - tempCondensity[4],tempCondensity[5],tempCondensity[6],tempCondensity[7], - tempCondensity[8],tempCondensity[9],tempCondensity[10],tempCondensity[11]); - + perfMap.clear(); perfMap.reserve(2); diff --git a/src/HPWHHeatingLogics.cc b/src/HPWHHeatingLogics.cc index d283f489..174d75f1 100644 --- a/src/HPWHHeatingLogics.cc +++ b/src/HPWHHeatingLogics.cc @@ -184,6 +184,7 @@ const double HPWH::TempBasedHeatingLogic::getFractToMeetComparisonExternal() { double comparison = getComparisonValue(); comparison += HPWH::TOL_MINVALUE; // Make this possible so we do slightly over heat + double nodeDensity = static_cast(hpwh->getNumNodes()) / LOGIC_NODE_SIZE; for(auto nodeWeight : nodeWeights) { // bottom calc node only @@ -200,8 +201,8 @@ const double HPWH::TempBasedHeatingLogic::getFractToMeetComparisonExternal() { sum = nodeTemp * nodeWeight.weight; totWeight = nodeWeight.weight; } else { // all tank nodes corresponding to logical node - firstNode = (nodeWeight.nodeNum - 1) * hpwh->nodeDensity; - calcNode = (nodeWeight.nodeNum) * hpwh->nodeDensity - 1; + firstNode = static_cast(nodeDensity * (nodeWeight.nodeNum - 1)); + calcNode = static_cast(nodeDensity * (nodeWeight.nodeNum))- 1; double nodeTemp = resampledTankTemps[static_cast(nodeWeight.nodeNum - 1)]; sum += nodeTemp * nodeWeight.weight; totWeight += nodeWeight.weight; @@ -222,7 +223,7 @@ const double HPWH::TempBasedHeatingLogic::getFractToMeetComparisonExternal() { // if the difference in denominator is <= 0 then we aren't adding heat to the nodes we care about, so // shift a whole node. // factor of hpwh->nodeDensity included below to reproduce original algorithm - fracTemp = diff > 0. ? (totWeight * comparison - sum) * hpwh->nodeDensity / diff : 1.; + fracTemp = diff > 0. ? (totWeight * comparison - sum) * nodeDensity / diff : 1.; } return fracTemp; diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 33c493a3..d4b675e0 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -296,7 +296,7 @@ int HPWH::HPWHinit_genericHPWH(double tankVol_L, double energyFactor, double res //bottom resistor values resistiveElementBottom.setupAsResistiveElement(0, 4000); - resistiveElementBottom.setCondensity(0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0); + resistiveElementBottom.setCondensity({0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0}); resistiveElementBottom.hysteresis_dC = dF_TO_dC(2); //logic conditions @@ -535,7 +535,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { extra.addTurnOnLogic(HPWH::topThird_absolute(1)); //initial guess, will get reset based on the input heat vector - extra.setCondensity(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + extra.setCondensity({1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}); //set everything in its places heatSources.resize(1); @@ -637,7 +637,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isVIP = false; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}); //GE tier 1 values compressor.perfMap.reserve(2); @@ -691,7 +691,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.typeOfHeatSource = TYPE_compressor; double split = 1.0 / 5.0; - compressor.setCondensity(split, split, split, split, split, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({split, split, split, split, split, 0, 0, 0, 0, 0, 0, 0}); //voltex60 tier 1 values compressor.perfMap.reserve(2); @@ -767,7 +767,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.typeOfHeatSource = TYPE_compressor; double split = 1.0 / 5.0; - compressor.setCondensity(split, split, split, split, split, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({split, split, split, split, split, 0, 0, 0, 0, 0, 0, 0}); //voltex60 tier 1 values compressor.perfMap.reserve(2); @@ -844,7 +844,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.typeOfHeatSource = TYPE_compressor; double split = 1.0 / 5.0; - compressor.setCondensity(split, split, split, split, split, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({split, split, split, split, split, 0, 0, 0, 0, 0, 0, 0}); compressor.perfMap.reserve(2); @@ -922,7 +922,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isOn = false; compressor.isVIP = true; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}); compressor.configuration = HeatSource::CONFIG_EXTERNAL; compressor.isMultipass = false; compressor.perfMap.reserve(1); @@ -1061,7 +1061,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isOn = false; compressor.isVIP = true; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}); compressor.configuration = HeatSource::CONFIG_EXTERNAL; compressor.perfMap.reserve(1); compressor.hysteresis_dC = 0; @@ -1188,7 +1188,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isOn = false; compressor.isVIP = true; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}); compressor.extrapolationMethod = EXTRAP_NEAREST; compressor.configuration = HeatSource::CONFIG_EXTERNAL; compressor.isMultipass = false; @@ -1322,7 +1322,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isOn = false; compressor.isVIP = true; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}); compressor.extrapolationMethod = EXTRAP_NEAREST; compressor.configuration = HeatSource::CONFIG_EXTERNAL; compressor.hysteresis_dC = 0; @@ -1488,7 +1488,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isOn = false; compressor.isVIP = true; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}); compressor.configuration = HeatSource::CONFIG_EXTERNAL; compressor.perfMap.reserve(1); compressor.hysteresis_dC = 0; @@ -1558,7 +1558,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isVIP = true; compressor.typeOfHeatSource = TYPE_compressor; compressor.minT = F_TO_C(-13.); - compressor.setCondensity(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}); compressor.externalOutletHeight = 0; compressor.externalInletHeight = getNumNodes() - 1; @@ -1700,7 +1700,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isVIP = true; compressor.typeOfHeatSource = TYPE_compressor; compressor.minT = F_TO_C(-25.); - compressor.setCondensity(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}); compressor.externalOutletHeight = 0; compressor.externalInletHeight = getNumNodes() - 1; @@ -1783,7 +1783,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.externalOutletHeight = 0; compressor.externalInletHeight = getIndexTopNode(); - compressor.setCondensity(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}); compressor.perfMap.reserve(5); @@ -1861,7 +1861,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.typeOfHeatSource = TYPE_compressor; double split = 1.0 / 5.0; - compressor.setCondensity(split, split, split, split, split, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({split, split, split, split, split, 0, 0, 0, 0, 0, 0, 0}); // performance map compressor.perfMap.reserve(3); @@ -2232,7 +2232,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isOn = false; compressor.isVIP = false; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(0.3, 0.3, 0.2, 0.1, 0.1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + compressor.setCondensity({0.3, 0.3, 0.2, 0.1, 0.1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}); //From CAHP 120 COP Tests compressor.perfMap.reserve(3); @@ -2270,7 +2270,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { //bottom resistor values resistiveElementBottom.setupAsResistiveElement(0, wattRE); resistiveElementBottom.hysteresis_dC = dF_TO_dC(2); - resistiveElementBottom.setCondensity(0.2, 0.8, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.); // Based of CMP test + resistiveElementBottom.setCondensity({0.2, 0.8, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.}); // Based of CMP test //logic conditions for double compStart = dF_TO_dC(5.25); @@ -2331,7 +2331,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isOn = false; compressor.isVIP = false; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(0, 0.2, 0.2, 0.2, 0.2, 0.2, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({0, 0.2, 0.2, 0.2, 0.2, 0.2, 0, 0, 0, 0, 0, 0}); // performance map compressor.perfMap.reserve(3); @@ -2438,7 +2438,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { //bottom resistor values resistiveElementBottom.setupAsResistiveElement(0, 4000); - resistiveElementBottom.setCondensity(0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0); + resistiveElementBottom.setCondensity({0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0}); resistiveElementBottom.hysteresis_dC = dF_TO_dC(2); //logic conditions @@ -2506,7 +2506,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { //bottom resistor values resistiveElementBottom.setupAsResistiveElement(0, 4000); - resistiveElementBottom.setCondensity(0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0); + resistiveElementBottom.setCondensity({0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0}); resistiveElementBottom.hysteresis_dC = dF_TO_dC(2); //logic conditions @@ -2583,7 +2583,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { //bottom resistor values resistiveElementBottom.setupAsResistiveElement(0, 4000); - resistiveElementBottom.setCondensity(0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0); + resistiveElementBottom.setCondensity({0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0}); resistiveElementBottom.hysteresis_dC = dF_TO_dC(2); //logic conditions @@ -2660,7 +2660,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { //bottom resistor values resistiveElementBottom.setupAsResistiveElement(0, 4000); - resistiveElementBottom.setCondensity(0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0); + resistiveElementBottom.setCondensity({0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0}); resistiveElementBottom.hysteresis_dC = dF_TO_dC(2); //logic conditions @@ -2737,7 +2737,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { //bottom resistor values resistiveElementBottom.setupAsResistiveElement(0, 4000); - resistiveElementBottom.setCondensity(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + resistiveElementBottom.setCondensity({1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}); resistiveElementBottom.hysteresis_dC = dF_TO_dC(2); //logic conditions @@ -2816,7 +2816,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { //bottom resistor values resistiveElementBottom.setupAsResistiveElement(0, 4000); - resistiveElementBottom.setCondensity(0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0); + resistiveElementBottom.setCondensity({0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0}); resistiveElementBottom.hysteresis_dC = dF_TO_dC(2); //logic conditions @@ -2876,7 +2876,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isVIP = false; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(0.2, 0.2, 0.2, 0.2, 0.2, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({0.2, 0.2, 0.2, 0.2, 0.2, 0, 0, 0, 0, 0, 0, 0}); compressor.perfMap.reserve(2); @@ -2966,7 +2966,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isVIP = false; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(0.2, 0.2, 0.2, 0.2, 0.2, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({0.2, 0.2, 0.2, 0.2, 0.2, 0, 0, 0, 0, 0, 0, 0}); compressor.perfMap.reserve(2); compressor.perfMap.push_back({ @@ -3054,7 +3054,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isOn = false; compressor.isVIP = true; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(0.2, 0.2, 0.2, 0.2, 0.2, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({0.2, 0.2, 0.2, 0.2, 0.2, 0, 0, 0, 0, 0, 0, 0}); compressor.perfMap.reserve(2); @@ -3235,7 +3235,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { resistiveElement.setupAsResistiveElement(0, 1500); resistiveElement.hysteresis_dC = dF_TO_dC(0); - compressor.setCondensity(0, 0.12, 0.22, 0.22, 0.22, 0.22, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({0, 0.12, 0.22, 0.22, 0.22, 0.22, 0, 0, 0, 0, 0, 0}); compressor.perfMap.reserve(2); @@ -3465,7 +3465,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { //bottom resistor values resistiveElementBottom.setupAsResistiveElement(0, 4500); - resistiveElementBottom.setCondensity(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + resistiveElementBottom.setCondensity({1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}); resistiveElementBottom.hysteresis_dC = dF_TO_dC(2); //logic conditions @@ -3539,7 +3539,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { //bottom resistor values resistiveElementBottom.setupAsResistiveElement(0, 4000); - resistiveElementBottom.setCondensity(0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0); + resistiveElementBottom.setCondensity({0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0}); resistiveElementBottom.hysteresis_dC = dF_TO_dC(2); //logic conditions @@ -3635,7 +3635,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { //bottom resistor values resistiveElementBottom.setupAsResistiveElement(0, 4000); - resistiveElementBottom.setCondensity(0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0); + resistiveElementBottom.setCondensity({0, 0.2, 0.8, 0, 0, 0, 0, 0, 0, 0, 0, 0}); resistiveElementBottom.hysteresis_dC = dF_TO_dC(2); //logic conditions @@ -3681,7 +3681,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isOn = false; compressor.isVIP = true; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}); compressor.configuration = HeatSource::CONFIG_EXTERNAL; compressor.isMultipass = false; compressor.perfMap.reserve(1); @@ -3760,7 +3760,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.isOn = false; compressor.isVIP = true; compressor.typeOfHeatSource = TYPE_compressor; - compressor.setCondensity(0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0); + compressor.setCondensity({0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}); compressor.configuration = HeatSource::CONFIG_EXTERNAL; compressor.perfMap.reserve(1); compressor.hysteresis_dC = 0; diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c20594b9..4903a53b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -265,7 +265,7 @@ function( add_model_test ) endfunction() foreach(test ${testNames}) - foreach(model ${extendedModelNames}) + foreach(model ${modelNames}) add_model_test( TEST_NAME "${test}" MODEL_NAME "${model}" INP_SOURCE "Preset") add_model_test( TEST_NAME "${test}" MODEL_NAME "${model}" INP_SOURCE "File") endforeach(model) @@ -338,7 +338,7 @@ function( add_file_test ) endfunction() foreach(test ${testNames}) - foreach(model ${extendedModelNames}) + foreach(model ${modelNames}) add_file_test( TEST_NAME "${test}" MODEL_NAME "${model}") endforeach(model) endforeach(test) From 098874dc8b08e121cef23d261cfd5e6c9c158af5 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 13 Nov 2023 14:54:46 -0700 Subject: [PATCH 07/23] Remove specific AquaTerm refs. --- src/HPWHpresets.cc | 54 - test/AquaThermAire.txt | 40 - test/villara_24hr67/DRschedule.csv | 2 - test/villara_24hr67/ambientTschedule.csv | 1442 ------------------- test/villara_24hr67/drawschedule.csv | 55 - test/villara_24hr67/evaporatorTschedule.csv | 1442 ------------------- test/villara_24hr67/inletTschedule.csv | 1442 ------------------- test/villara_24hr67/testInfo.txt | 2 - 8 files changed, 4479 deletions(-) delete mode 100644 test/AquaThermAire.txt delete mode 100644 test/villara_24hr67/DRschedule.csv delete mode 100644 test/villara_24hr67/ambientTschedule.csv delete mode 100644 test/villara_24hr67/drawschedule.csv delete mode 100644 test/villara_24hr67/evaporatorTschedule.csv delete mode 100644 test/villara_24hr67/inletTschedule.csv delete mode 100644 test/villara_24hr67/testInfo.txt diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 2132cd7c..175407c2 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3822,60 +3822,6 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { heatSources[0].companionHeatSource = &heatSources[2]; } - else if (presetNum == MODELS_AQUATHERMAIRE) { // AquaThermAire - setNumNodes(1); - setpoint_C = F_TO_C(125.); - - tankVolume_L = GAL_TO_L(54.4); - tankUA_kJperHrC = 10.35; - - doTempDepression = false; - tankMixesOnDraw = true; - - // heat exchangers only - waterIsDrawnFromTank = false; - heatExchangeEfficiency = 0.9; - - HeatSource compressor(this); - - //compressor values - compressor.isOn = false; - compressor.isVIP = false; - compressor.typeOfHeatSource = TYPE_compressor; - - compressor.setCondensity({1.}); - - //AOSmithPHPT60 values - compressor.perfMap.reserve(2); - - compressor.perfMap.push_back({ - 47, // Temperature (T_F) - {0.467 * 1000, 0.00281 * 1000, 0.0000072 * 1000}, // Input Power Coefficients (inputPower_coeffs) - {4.86, -0.0222, -0.00001} // COP Coefficients (COP_coeffs) - }); - - compressor.perfMap.push_back({ - 67, // Temperature (T_F) - {0.541 * 1000, 0.00147 * 1000, 0.0000176 * 1000}, // Input Power Coefficients (inputPower_coeffs) - {6.58, -0.0392, 0.0000407} // COP Coefficients (COP_coeffs) - }); - - compressor.minT = F_TO_C(40.); - compressor.maxT = F_TO_C(125.); - compressor.hysteresis_dC = dF_TO_dC(4); - compressor.configuration = HeatSource::CONFIG_WRAPPED; - compressor.maxSetpoint_C = MAXOUTLET_R134A; - - //logic conditions - double compStart = dF_TO_dC(43.6); - double standbyT = dF_TO_dC(23.8); - compressor.addTurnOnLogic(HPWH::bottomThird(compStart)); - compressor.addTurnOnLogic(HPWH::standby(standbyT)); - - //set everything in its places - heatSources.resize(1); - heatSources[0] = compressor; - } else { if (hpwhVerbosity >= VRB_reluctant) { msg("You have tried to select a preset model which does not exist. \n"); diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt deleted file mode 100644 index 13cda0ca..00000000 --- a/test/AquaThermAire.txt +++ /dev/null @@ -1,40 +0,0 @@ -verbosity silent -numNodes 1 #number of nodes -setpoint 125 F -volume 54.4 gal -UA 10.35 kJperHrC -depressTemp false -mixOnDraw true -waterIsDrawnFromTank false -heatExchangeEfficiency 0.9 - -#a test comment -numHeatSources 1 - -heatsource 0 isVIP false -heatsource 0 isOn false -heatsource 0 type compressor -heatsource 0 condensity 1 -heatsource 0 nTemps 2 -heatsource 0 T1 47 F -heatsource 0 T2 67 F -heatsource 0 inPowT1const 467 -heatsource 0 inPowT1lin 2.81 -heatsource 0 inPowT1quad 0.0072 -heatsource 0 inPowT2const 541 -heatsource 0 inPowT2lin 1.47 -heatsource 0 inPowT2quad 0.0176 -heatsource 0 copT1const 4.86 -heatsource 0 copT1lin -0.0222 -heatsource 0 copT1quad -0.00001 -heatsource 0 copT2const 6.58 -heatsource 0 copT2lin -0.0392 -heatsource 0 copT2quad 0.0000407 -heatsource 0 minT 40 F -heatsource 0 maxT 125 F -heatsource 0 hysteresis 1 F -heatsource 0 coilConfig wrapped - -heatsource 0 onlogic bottomThird 43.6 F -heatsource 0 onlogic standby 23.8 F - diff --git a/test/villara_24hr67/DRschedule.csv b/test/villara_24hr67/DRschedule.csv deleted file mode 100644 index 0fae0f27..00000000 --- a/test/villara_24hr67/DRschedule.csv +++ /dev/null @@ -1,2 +0,0 @@ -default 1 -minutes,OnOff diff --git a/test/villara_24hr67/ambientTschedule.csv b/test/villara_24hr67/ambientTschedule.csv deleted file mode 100644 index 1bcc4b16..00000000 --- a/test/villara_24hr67/ambientTschedule.csv +++ /dev/null @@ -1,1442 +0,0 @@ -default 67.5, -minutes,temperature -1,67.28315 -2,67.3284 -3,67.37848 -4,67.45485 -5,67.45412 -6,67.30761 -7,67.12637 -8,67.18246 -9,67.1868 -10,67.21343 -11,67.21535 -12,67.15785 -13,67.16241 -14,67.35531 -15,67.29267 -16,67.25365 -17,67.18422 -18,67.18721 -19,67.18055 -20,67.16505 -21,67.09311 -22,67.1366 -23,67.24177 -24,67.2541 -25,67.16316 -26,67.14007 -27,67.17348 -28,67.19661 -29,67.19999 -30,67.23907 -31,67.21378 -32,67.32257 -33,67.27809 -34,67.18491 -35,67.34405 -36,67.30149 -37,67.34415 -38,67.21259 -39,67.32129 -40,67.37061 -41,67.28255 -42,67.32346 -43,67.29215 -44,67.23927 -45,67.21572 -46,67.24843 -47,67.25526 -48,67.24344 -49,67.22066 -50,67.23169 -51,67.22906 -52,67.22253 -53,67.29514 -54,67.28191 -55,67.22148 -56,67.22105 -57,67.21169 -58,67.26269 -59,67.21466 -60,67.18014 -61,67.18269 -62,67.23352 -63,67.15137 -64,67.32146 -65,67.33404 -66,67.34781 -67,67.31873 -68,67.26029 -69,67.22739 -70,67.32249 -71,67.35124 -72,67.33225 -73,67.27674 -74,67.2897 -75,67.32126 -76,67.33494 -77,67.24704 -78,67.28519 -79,67.34291 -80,67.34919 -81,67.41381 -82,67.46752 -83,67.46306 -84,67.47807 -85,67.47678 -86,67.3783 -87,67.37211 -88,67.369 -89,67.33711 -90,67.28002 -91,67.32143 -92,67.31763 -93,67.31792 -94,67.27464 -95,67.32878 -96,67.29559 -97,67.32603 -98,67.4652 -99,67.55562 -100,67.56523 -101,67.45151 -102,67.38894 -103,67.39752 -104,67.33105 -105,67.23556 -106,67.1732 -107,67.12367 -108,67.10297 -109,67.13461 -110,67.22528 -111,67.3043 -112,67.36492 -113,67.23952 -114,67.4109 -115,67.48538 -116,67.46617 -117,67.36505 -118,67.43651 -119,67.32363 -120,67.42442 -121,67.38281 -122,67.34606 -123,67.40769 -124,67.46423 -125,67.5414 -126,67.45592 -127,67.35045 -128,67.30896 -129,67.36341 -130,67.4295 -131,67.29053 -132,67.32894 -133,67.37399 -134,67.42236 -135,67.52719 -136,67.48099 -137,67.47454 -138,67.38197 -139,67.18442 -140,67.1347 -141,67.13355 -142,67.16867 -143,67.2172 -144,67.24693 -145,67.18006 -146,67.21268 -147,67.32011 -148,67.34021 -149,67.33997 -150,67.3023 -151,67.23561 -152,67.16631 -153,67.18465 -154,67.22002 -155,67.27415 -156,67.31395 -157,67.31492 -158,67.2292 -159,67.26322 -160,67.34174 -161,67.34156 -162,67.23624 -163,67.2503 -164,67.27892 -165,67.29626 -166,67.47116 -167,67.49728 -168,67.56127 -169,67.4771 -170,67.34253 -171,67.38469 -172,67.38748 -173,67.40744 -174,67.41016 -175,67.43563 -176,67.45676 -177,67.4312 -178,67.46767 -179,67.39628 -180,67.45993 -181,67.48104 -182,67.44968 -183,67.46853 -184,67.39716 -185,67.4501 -186,67.46369 -187,67.46315 -188,67.45118 -189,67.37273 -190,67.46207 -191,67.42358 -192,67.38055 -193,67.40004 -194,67.40195 -195,67.45037 -196,67.40067 -197,67.31334 -198,67.21465 -199,67.26051 -200,67.40639 -201,67.54031 -202,67.40512 -203,67.28709 -204,67.30239 -205,67.45384 -206,67.3239 -207,67.24693 -208,67.27061 -209,67.30849 -210,67.40517 -211,67.64081 -212,67.521 -213,67.44157 -214,67.43269 -215,67.33911 -216,67.37727 -217,67.37268 -218,67.32021 -219,67.26873 -220,67.25411 -221,67.45874 -222,67.50282 -223,67.3784 -224,67.27431 -225,67.33359 -226,67.49818 -227,67.55161 -228,67.39916 -229,67.28979 -230,67.27021 -231,67.28572 -232,67.39331 -233,67.30009 -234,67.25822 -235,67.34859 -236,67.53671 -237,67.47654 -238,67.44636 -239,67.422 -240,67.39211 -241,67.35567 -242,67.37268 -243,67.4152 -244,67.32281 -245,67.36624 -246,67.37088 -247,67.45028 -248,67.35603 -249,67.4224 -250,67.5158 -251,67.4127 -252,67.36851 -253,67.38433 -254,67.41561 -255,67.41425 -256,67.3959 -257,67.3689 -258,67.37198 -259,67.48215 -260,67.37759 -261,67.41226 -262,67.36012 -263,67.4147 -264,67.38885 -265,67.28056 -266,67.28286 -267,67.24844 -268,67.24242 -269,67.25951 -270,67.4109 -271,67.41502 -272,67.32991 -273,67.25406 -274,67.37669 -275,67.29859 -276,67.31481 -277,67.19997 -278,67.17394 -279,67.17474 -280,67.18555 -281,67.33587 -282,67.32304 -283,67.26855 -284,67.28331 -285,67.24728 -286,67.24285 -287,67.2859 -288,67.53765 -289,67.51125 -290,67.39973 -291,67.30977 -292,67.34917 -293,67.43411 -294,67.42382 -295,67.36582 -296,67.32005 -297,67.33183 -298,67.52543 -299,67.50048 -300,67.42454 -301,67.35871 -302,67.34757 -303,67.35999 -304,67.37251 -305,67.42146 -306,67.35941 -307,67.43257 -308,67.48736 -309,67.44902 -310,67.45061 -311,67.48132 -312,67.44115 -313,67.4188 -314,67.40034 -315,67.45879 -316,67.42589 -317,67.38441 -318,67.40083 -319,67.37914 -320,67.41718 -321,67.44191 -322,67.30887 -323,67.26675 -324,67.36716 -325,67.40809 -326,67.41615 -327,67.29771 -328,67.24358 -329,67.31816 -330,67.38274 -331,67.4098 -332,67.35583 -333,67.39432 -334,67.44707 -335,67.39461 -336,67.42299 -337,67.40974 -338,67.41961 -339,67.38674 -340,67.39763 -341,67.36958 -342,67.3405 -343,67.29431 -344,67.32027 -345,67.20464 -346,67.35652 -347,67.4172 -348,67.41594 -349,67.37864 -350,67.28642 -351,67.28805 -352,67.36157 -353,67.40604 -354,67.24715 -355,67.19567 -356,67.26061 -357,67.25937 -358,67.29939 -359,67.25597 -360,67.27996 -361,67.3612 -362,67.37778 -363,67.38348 -364,67.27244 -365,67.26895 -366,67.36359 -367,67.36208 -368,67.31566 -369,67.25064 -370,67.29198 -371,67.30563 -372,67.23374 -373,67.31059 -374,67.3592 -375,67.42157 -376,67.37693 -377,67.33764 -378,67.30113 -379,67.28139 -380,67.31219 -381,67.42191 -382,67.31969 -383,67.22976 -384,67.21565 -385,67.25162 -386,67.2377 -387,67.24618 -388,67.30108 -389,67.4173 -390,67.48788 -391,67.4146 -392,67.35107 -393,67.36311 -394,67.38694 -395,67.31663 -396,67.35695 -397,67.34568 -398,67.3651 -399,67.33852 -400,67.31371 -401,67.26481 -402,67.26783 -403,67.24908 -404,67.2397 -405,67.2584 -406,67.25568 -407,67.2917 -408,67.36469 -409,67.47717 -410,67.43424 -411,67.35585 -412,67.34817 -413,67.37794 -414,67.35688 -415,67.32021 -416,67.41709 -417,67.3287 -418,67.3639 -419,67.34475 -420,67.35722 -421,67.37032 -422,67.40723 -423,67.35249 -424,67.3144 -425,67.29852 -426,67.28021 -427,67.18015 -428,67.18658 -429,67.30309 -430,67.48403 -431,67.44513 -432,67.37994 -433,67.37191 -434,67.33821 -435,67.32032 -436,67.28511 -437,67.28961 -438,67.33398 -439,67.38964 -440,67.36638 -441,67.32674 -442,67.2776 -443,67.29131 -444,67.32362 -445,67.35614 -446,67.3056 -447,67.38084 -448,67.2798 -449,67.24155 -450,67.23619 -451,67.16014 -452,67.21045 -453,67.21776 -454,67.23215 -455,67.29787 -456,67.30974 -457,67.46785 -458,67.46272 -459,67.35175 -460,67.36221 -461,67.27914 -462,67.34045 -463,67.30753 -464,67.45969 -465,67.37353 -466,67.30084 -467,67.35703 -468,67.32455 -469,67.31933 -470,67.31271 -471,67.35233 -472,67.27924 -473,67.3327 -474,67.39471 -475,67.34001 -476,67.39608 -477,67.28882 -478,67.37189 -479,67.36599 -480,67.38719 -481,67.32774 -482,67.31533 -483,67.35287 -484,67.35009 -485,67.31236 -486,67.14233 -487,67.14842 -488,67.26605 -489,67.3259 -490,67.37592 -491,67.30859 -492,67.17994 -493,67.10403 -494,67.16597 -495,67.2827 -496,67.18345 -497,67.15319 -498,67.20947 -499,67.233 -500,67.2791 -501,67.24157 -502,67.33463 -503,67.31535 -504,67.33089 -505,67.37086 -506,67.31207 -507,67.38922 -508,67.43734 -509,67.40028 -510,67.35358 -511,67.39671 -512,67.4091 -513,67.33654 -514,67.31081 -515,67.25478 -516,67.28275 -517,67.37498 -518,67.37563 -519,67.35639 -520,67.34682 -521,67.31152 -522,67.30154 -523,67.35225 -524,67.36008 -525,67.30479 -526,67.26225 -527,67.28769 -528,67.29901 -529,67.14817 -530,67.13154 -531,67.13269 -532,67.15188 -533,67.18815 -534,67.2933 -535,67.31092 -536,67.24566 -537,67.35493 -538,67.31837 -539,67.33146 -540,67.37133 -541,67.31898 -542,67.29527 -543,67.32121 -544,67.4201 -545,67.38996 -546,67.35352 -547,67.42341 -548,67.34813 -549,67.32396 -550,67.35328 -551,67.36757 -552,67.35675 -553,67.38316 -554,67.33711 -555,67.32374 -556,67.38184 -557,67.35668 -558,67.37504 -559,67.33154 -560,67.36497 -561,67.36752 -562,67.36998 -563,67.32171 -564,67.31309 -565,67.31782 -566,67.34878 -567,67.30084 -568,67.33308 -569,67.35986 -570,67.4098 -571,67.37981 -572,67.39442 -573,67.38424 -574,67.35194 -575,67.31578 -576,67.34494 -577,67.33601 -578,67.29845 -579,67.38226 -580,67.38197 -581,67.30277 -582,67.34032 -583,67.3223 -584,67.23396 -585,67.32334 -586,67.25668 -587,67.1504 -588,67.13303 -589,67.27644 -590,67.38494 -591,67.33719 -592,67.3054 -593,67.38366 -594,67.39902 -595,67.35023 -596,67.31902 -597,67.28839 -598,67.35009 -599,67.29752 -600,67.29226 -601,67.34821 -602,67.27769 -603,67.24148 -604,67.30963 -605,67.41599 -606,67.41525 -607,67.38906 -608,67.37166 -609,67.31017 -610,67.29811 -611,67.31274 -612,67.37987 -613,67.36745 -614,67.32694 -615,67.32925 -616,67.32594 -617,67.30705 -618,67.33566 -619,67.32426 -620,67.32172 -621,67.30132 -622,67.27404 -623,67.31922 -624,67.43024 -625,67.41776 -626,67.28513 -627,67.23768 -628,67.31913 -629,67.35931 -630,67.32354 -631,67.39597 -632,67.32792 -633,67.35014 -634,67.29671 -635,67.33395 -636,67.30618 -637,67.29182 -638,67.3922 -639,67.36793 -640,67.30036 -641,67.2336 -642,67.24001 -643,67.3239 -644,67.35643 -645,67.30405 -646,67.32057 -647,67.19549 -648,67.19349 -649,67.17085 -650,67.15494 -651,67.2515 -652,67.31602 -653,67.40373 -654,67.31294 -655,67.29301 -656,67.21756 -657,67.21761 -658,67.26677 -659,67.28786 -660,67.23757 -661,67.21963 -662,67.212 -663,67.18995 -664,67.16255 -665,67.18053 -666,67.1491 -667,67.19652 -668,67.24368 -669,67.24558 -670,67.52518 -671,67.51584 -672,67.56754 -673,67.50652 -674,67.49616 -675,67.4627 -676,67.38762 -677,67.30554 -678,67.34046 -679,67.36201 -680,67.44588 -681,67.45798 -682,67.44398 -683,67.42092 -684,67.48067 -685,67.55947 -686,67.48592 -687,67.44465 -688,67.47794 -689,67.45714 -690,67.45921 -691,67.38588 -692,67.41234 -693,67.363 -694,67.39223 -695,67.31528 -696,67.30356 -697,67.3691 -698,67.52977 -699,67.44114 -700,67.38301 -701,67.25849 -702,67.25235 -703,67.29131 -704,67.35239 -705,67.34584 -706,67.34628 -707,67.29217 -708,67.32797 -709,67.27241 -710,67.26823 -711,67.20885 -712,67.20931 -713,67.30214 -714,67.26614 -715,67.19783 -716,67.16318 -717,67.12754 -718,67.29352 -719,67.31013 -720,67.37211 -721,67.40294 -722,67.30884 -723,67.25198 -724,67.23928 -725,67.25827 -726,67.35915 -727,67.37206 -728,67.29874 -729,67.30036 -730,67.35916 -731,67.36948 -732,67.30565 -733,67.22949 -734,67.26031 -735,67.23054 -736,67.27246 -737,67.3088 -738,67.37173 -739,67.34809 -740,67.26231 -741,67.35619 -742,67.37463 -743,67.34149 -744,67.31544 -745,67.28074 -746,67.33273 -747,67.32441 -748,67.25864 -749,67.28821 -750,67.29573 -751,67.26096 -752,67.28887 -753,67.27714 -754,67.16793 -755,67.10239 -756,67.14371 -757,67.1554 -758,67.25408 -759,67.24631 -760,67.23307 -761,67.18365 -762,67.228 -763,67.21709 -764,67.20881 -765,67.26416 -766,67.31539 -767,67.21228 -768,67.20985 -769,67.15839 -770,67.18816 -771,67.34003 -772,67.20012 -773,67.22712 -774,67.37808 -775,67.56591 -776,67.44558 -777,67.20465 -778,67.11301 -779,67.23707 -780,67.30615 -781,67.35567 -782,67.35893 -783,67.33897 -784,67.33739 -785,67.37999 -786,67.25876 -787,67.21106 -788,67.34547 -789,67.46358 -790,67.52267 -791,67.44603 -792,67.20865 -793,67.25433 -794,67.35979 -795,67.28437 -796,67.2618 -797,67.3868 -798,67.3103 -799,67.30198 -800,67.30606 -801,67.27228 -802,67.34021 -803,67.33472 -804,67.28468 -805,67.27727 -806,67.27049 -807,67.33247 -808,67.25178 -809,67.27842 -810,67.42564 -811,67.3565 -812,67.29667 -813,67.3545 -814,67.2755 -815,67.31384 -816,67.39668 -817,67.48489 -818,67.52158 -819,67.44074 -820,67.38374 -821,67.38902 -822,67.39606 -823,67.39408 -824,67.41572 -825,67.42346 -826,67.32196 -827,67.41806 -828,67.40951 -829,67.35986 -830,67.42803 -831,67.3081 -832,67.28249 -833,67.2885 -834,67.41484 -835,67.42434 -836,67.3003 -837,67.27435 -838,67.2654 -839,67.35429 -840,67.42982 -841,67.33488 -842,67.30799 -843,67.24231 -844,67.24799 -845,67.19562 -846,67.22878 -847,67.16842 -848,67.23176 -849,67.28353 -850,67.2299 -851,67.2291 -852,67.26819 -853,67.29703 -854,67.25793 -855,67.25811 -856,67.28394 -857,67.31825 -858,67.36289 -859,67.44612 -860,67.51654 -861,67.47757 -862,67.23262 -863,67.14817 -864,67.1525 -865,67.2213 -866,67.24783 -867,67.2328 -868,67.27735 -869,67.33441 -870,67.27975 -871,67.22668 -872,67.23392 -873,67.28104 -874,67.33017 -875,67.31506 -876,67.32314 -877,67.29991 -878,67.32898 -879,67.36874 -880,67.31802 -881,67.34829 -882,67.35418 -883,67.36566 -884,67.31738 -885,67.3356 -886,67.35549 -887,67.3286 -888,67.35492 -889,67.34441 -890,67.28104 -891,67.29301 -892,67.32838 -893,67.32273 -894,67.359 -895,67.36435 -896,67.36916 -897,67.3603 -898,67.38069 -899,67.31096 -900,67.33042 -901,67.34761 -902,67.27577 -903,67.18008 -904,67.18411 -905,67.16831 -906,67.32115 -907,67.42764 -908,67.34318 -909,67.30946 -910,67.2776 -911,67.27024 -912,67.36296 -913,67.33749 -914,67.32363 -915,67.29402 -916,67.29602 -917,67.39981 -918,67.29316 -919,67.25111 -920,67.24418 -921,67.26738 -922,67.33343 -923,67.2424 -924,67.16921 -925,67.20982 -926,67.24476 -927,67.19815 -928,67.27895 -929,67.18552 -930,67.19538 -931,67.24628 -932,67.29557 -933,67.47127 -934,67.34116 -935,67.26918 -936,67.23225 -937,67.2645 -938,67.24843 -939,67.2049 -940,67.20419 -941,67.20278 -942,67.21964 -943,67.2231 -944,67.2569 -945,67.2038 -946,67.19144 -947,67.22227 -948,67.29431 -949,67.35017 -950,67.36247 -951,67.3684 -952,67.31508 -953,67.2513 -954,67.41282 -955,67.52827 -956,67.41515 -957,67.34048 -958,67.26832 -959,67.40123 -960,67.44776 -961,67.37859 -962,67.34604 -963,67.37878 -964,67.35303 -965,67.36246 -966,67.35143 -967,67.34055 -968,67.37268 -969,67.33956 -970,67.36406 -971,67.43313 -972,67.36667 -973,67.29978 -974,67.34291 -975,67.34309 -976,67.37743 -977,67.39853 -978,67.43093 -979,67.37713 -980,67.34336 -981,67.49297 -982,67.44338 -983,67.49775 -984,67.52859 -985,67.46479 -986,67.48365 -987,67.43507 -988,67.51141 -989,67.44785 -990,67.49252 -991,67.42416 -992,67.40794 -993,67.41336 -994,67.45834 -995,67.56329 -996,67.51195 -997,67.50901 -998,67.44695 -999,67.37113 -1000,67.45338 -1001,67.55418 -1002,67.5863 -1003,67.59798 -1004,67.54067 -1005,67.48345 -1006,67.46925 -1007,67.44605 -1008,67.52624 -1009,67.53369 -1010,67.45757 -1011,67.38073 -1012,67.40447 -1013,67.54397 -1014,67.60402 -1015,67.42757 -1016,67.44405 -1017,67.51009 -1018,67.43048 -1019,67.43091 -1020,67.39736 -1021,67.3034 -1022,67.21925 -1023,67.23254 -1024,67.24818 -1025,67.28364 -1026,67.32109 -1027,67.37182 -1028,67.41594 -1029,67.33236 -1030,67.32539 -1031,67.33989 -1032,67.32244 -1033,67.30468 -1034,67.36742 -1035,67.35175 -1036,67.40735 -1037,67.51395 -1038,67.45991 -1039,67.45622 -1040,67.44938 -1041,67.44463 -1042,67.46808 -1043,67.42249 -1044,67.42055 -1045,67.46171 -1046,67.42848 -1047,67.39214 -1048,67.40249 -1049,67.42625 -1050,67.43766 -1051,67.28013 -1052,67.22175 -1053,67.32677 -1054,67.343 -1055,67.51607 -1056,67.48488 -1057,67.32763 -1058,67.37923 -1059,67.42103 -1060,67.40231 -1061,67.4125 -1062,67.43386 -1063,67.4462 -1064,67.4435 -1065,67.45158 -1066,67.47463 -1067,67.42068 -1068,67.26482 -1069,67.26927 -1070,67.30851 -1071,67.2791 -1072,67.29613 -1073,67.30167 -1074,67.31623 -1075,67.3596 -1076,67.37672 -1077,67.38746 -1078,67.4276 -1079,67.39387 -1080,67.36185 -1081,67.37486 -1082,67.33796 -1083,67.43986 -1084,67.46225 -1085,67.36462 -1086,67.25149 -1087,67.28286 -1088,67.34012 -1089,67.29732 -1090,67.35823 -1091,67.4335 -1092,67.34891 -1093,67.32127 -1094,67.33445 -1095,67.33301 -1096,67.41524 -1097,67.33121 -1098,67.42841 -1099,67.42042 -1100,67.49758 -1101,67.40639 -1102,67.40157 -1103,67.33409 -1104,67.32244 -1105,67.40166 -1106,67.39082 -1107,67.33369 -1108,67.33739 -1109,67.34606 -1110,67.38224 -1111,67.35 -1112,67.3626 -1113,67.39147 -1114,67.46103 -1115,67.38755 -1116,67.38003 -1117,67.2773 -1118,67.27744 -1119,67.22939 -1120,67.34577 -1121,67.33951 -1122,67.34025 -1123,67.2748 -1124,67.21792 -1125,67.27251 -1126,67.27208 -1127,67.25824 -1128,67.36292 -1129,67.34177 -1130,67.40024 -1131,67.39606 -1132,67.38285 -1133,67.34507 -1134,67.33211 -1135,67.3624 -1136,67.3713 -1137,67.33168 -1138,67.28128 -1139,67.31289 -1140,67.35925 -1141,67.32653 -1142,67.34708 -1143,67.3104 -1144,67.36386 -1145,67.30222 -1146,67.33371 -1147,67.33996 -1148,67.19099 -1149,67.21763 -1150,67.28786 -1151,67.3396 -1152,67.23322 -1153,67.24358 -1154,67.15514 -1155,67.14169 -1156,67.154 -1157,67.15695 -1158,67.21102 -1159,67.16372 -1160,67.1659 -1161,67.3268 -1162,67.51499 -1163,67.49229 -1164,67.30457 -1165,67.27071 -1166,67.24648 -1167,67.2017 -1168,67.17733 -1169,67.23291 -1170,67.35143 -1171,67.32767 -1172,67.26922 -1173,67.34152 -1174,67.33778 -1175,67.35222 -1176,67.30349 -1177,67.37762 -1178,67.42243 -1179,67.45827 -1180,67.31458 -1181,67.30421 -1182,67.38699 -1183,67.2919 -1184,67.37412 -1185,67.36863 -1186,67.32019 -1187,67.29818 -1188,67.32041 -1189,67.3137 -1190,67.31373 -1191,67.34315 -1192,67.33326 -1193,67.3804 -1194,67.22936 -1195,67.33707 -1196,67.3812 -1197,67.35365 -1198,67.3525 -1199,67.26844 -1200,67.30975 -1201,67.24213 -1202,67.24995 -1203,67.31713 -1204,67.38441 -1205,67.27122 -1206,67.22046 -1207,67.24378 -1208,67.25539 -1209,67.29316 -1210,67.31593 -1211,67.37675 -1212,67.3394 -1213,67.23414 -1214,67.31226 -1215,67.30087 -1216,67.34856 -1217,67.29382 -1218,67.36529 -1219,67.41385 -1220,67.36388 -1221,67.34804 -1222,67.3619 -1223,67.34531 -1224,67.30615 -1225,67.34568 -1226,67.32053 -1227,67.31718 -1228,67.28609 -1229,67.34626 -1230,67.34766 -1231,67.28265 -1232,67.23956 -1233,67.2638 -1234,67.16655 -1235,67.24332 -1236,67.26299 -1237,67.30311 -1238,67.35281 -1239,67.32239 -1240,67.33184 -1241,67.49775 -1242,67.38627 -1243,67.37905 -1244,67.36932 -1245,67.35017 -1246,67.38449 -1247,67.34908 -1248,67.33479 -1249,67.26285 -1250,67.215 -1251,67.35551 -1252,67.2651 -1253,67.34997 -1254,67.22798 -1255,67.18132 -1256,67.30511 -1257,67.30814 -1258,67.27748 -1259,67.395 -1260,67.48974 -1261,67.38866 -1262,67.39407 -1263,67.33053 -1264,67.33711 -1265,67.262 -1266,67.2854 -1267,67.36945 -1268,67.24924 -1269,67.38924 -1270,67.36208 -1271,67.33961 -1272,67.3185 -1273,67.0757 -1274,67.0177 -1275,67.10956 -1276,67.30673 -1277,67.22749 -1278,67.14273 -1279,67.19482 -1280,67.18777 -1281,67.19225 -1282,67.21754 -1283,67.25608 -1284,67.22928 -1285,67.32556 -1286,67.5323 -1287,67.48389 -1288,67.45413 -1289,67.3387 -1290,67.25591 -1291,67.36369 -1292,67.3913 -1293,67.32854 -1294,67.40344 -1295,67.37218 -1296,67.34998 -1297,67.36692 -1298,67.36951 -1299,67.36298 -1300,67.28772 -1301,67.24501 -1302,67.25233 -1303,67.34151 -1304,67.32768 -1305,67.25754 -1306,67.30914 -1307,67.33906 -1308,67.34363 -1309,67.26569 -1310,67.22572 -1311,67.15762 -1312,67.22765 -1313,67.26807 -1314,67.14999 -1315,67.17934 -1316,67.22498 -1317,67.27197 -1318,67.35238 -1319,67.37997 -1320,67.33804 -1321,67.29108 -1322,67.30826 -1323,67.22507 -1324,67.19612 -1325,67.34376 -1326,67.40443 -1327,67.34287 -1328,67.2914 -1329,67.28666 -1330,67.29926 -1331,67.29337 -1332,67.34447 -1333,67.37234 -1334,67.35576 -1335,67.32059 -1336,67.31245 -1337,67.30603 -1338,67.33044 -1339,67.30824 -1340,67.31828 -1341,67.25275 -1342,67.18868 -1343,67.27906 -1344,67.46364 -1345,67.47001 -1346,67.40237 -1347,67.34492 -1348,67.29137 -1349,67.32008 -1350,67.35283 -1351,67.33575 -1352,67.3634 -1353,67.31926 -1354,67.37299 -1355,67.345 -1356,67.29879 -1357,67.33922 -1358,67.32439 -1359,67.33414 -1360,67.32347 -1361,67.3279 -1362,67.34538 -1363,67.25786 -1364,67.25822 -1365,67.3416 -1366,67.33611 -1367,67.29296 -1368,67.26102 -1369,67.29696 -1370,67.19537 -1371,67.12536 -1372,67.16683 -1373,67.18357 -1374,67.24542 -1375,67.3552 -1376,67.29744 -1377,67.23401 -1378,67.25239 -1379,67.24265 -1380,67.26886 -1381,67.29917 -1382,67.29917 -1383,67.29917 -1384,67.29917 -1385,67.29917 -1386,67.29917 -1387,67.29917 -1388,67.29917 -1389,67.29917 -1390,67.29917 -1391,67.29917 -1392,67.29917 -1393,67.29917 -1394,67.29917 -1395,67.29917 -1396,67.29917 -1397,67.29917 -1398,67.29917 -1399,67.29917 -1400,67.29917 -1401,67.29917 -1402,67.29917 -1403,67.29917 -1404,67.29917 -1405,67.29917 -1406,67.29917 -1407,67.29917 -1408,67.29917 -1409,67.29917 -1410,67.29917 -1411,67.29917 -1412,67.29917 -1413,67.29917 -1414,67.29917 -1415,67.29917 -1416,67.29917 -1417,67.29917 -1418,67.29917 -1419,67.29917 -1420,67.29917 -1421,67.29917 -1422,67.29917 -1423,67.29917 -1424,67.29917 -1425,67.29917 -1426,67.29917 -1427,67.29917 -1428,67.29917 -1429,67.29917 -1430,67.29917 -1431,67.29917 -1432,67.29917 -1433,67.29917 -1434,67.29917 -1435,67.29917 -1436,67.29917 -1437,67.29917 -1438,67.29917 -1439,67.29917 -1440,67.29917 diff --git a/test/villara_24hr67/drawschedule.csv b/test/villara_24hr67/drawschedule.csv deleted file mode 100644 index b61189ab..00000000 --- a/test/villara_24hr67/drawschedule.csv +++ /dev/null @@ -1,55 +0,0 @@ -default 0, -minutes,flow -1,1.3349102 -2,2.8913854 -3,3.0124772 -4,3.0023251 -5,3.0111803 -6,3.0010218 -7,3.0069499 -8,3.0063591 -9,3.0017903 -10,1.8039873 -31,0.37899702 -32,0.94744504 -33,0.63037963 -41,0.38995912 -42,0.5368643 -101,0.65925425 -102,1.7165944 -103,1.7083723 -104,1.7090602 -105,1.7091726 -106,1.3943032 -631,1.1355289 -632,2.9009642 -633,3.0374659 -634,3.0470733 -635,3.0387555 -636,1.7740286 -691,0.65034432 -692,1.6432731 -693,1.7106795 -694,0.9123426 -721,0.42550981 -722,0.53087469 -766,0.37718415 -767,0.56562094 -771,0.41616712 -772,0.56491452 -961,0.43046225 -962,0.9971379 -963,0.51245331 -976,0.40423453 -977,0.96119296 -978,0.60220512 -991,0.72326202 -992,1.23663 -1006,0.67108812 -1007,1.2519566 -1021,1.1236753 -1022,2.9326025 -1023,3.016118 -1024,3.0076832 -1025,3.0115812 -1026,0.80231295 diff --git a/test/villara_24hr67/evaporatorTschedule.csv b/test/villara_24hr67/evaporatorTschedule.csv deleted file mode 100644 index 1bcc4b16..00000000 --- a/test/villara_24hr67/evaporatorTschedule.csv +++ /dev/null @@ -1,1442 +0,0 @@ -default 67.5, -minutes,temperature -1,67.28315 -2,67.3284 -3,67.37848 -4,67.45485 -5,67.45412 -6,67.30761 -7,67.12637 -8,67.18246 -9,67.1868 -10,67.21343 -11,67.21535 -12,67.15785 -13,67.16241 -14,67.35531 -15,67.29267 -16,67.25365 -17,67.18422 -18,67.18721 -19,67.18055 -20,67.16505 -21,67.09311 -22,67.1366 -23,67.24177 -24,67.2541 -25,67.16316 -26,67.14007 -27,67.17348 -28,67.19661 -29,67.19999 -30,67.23907 -31,67.21378 -32,67.32257 -33,67.27809 -34,67.18491 -35,67.34405 -36,67.30149 -37,67.34415 -38,67.21259 -39,67.32129 -40,67.37061 -41,67.28255 -42,67.32346 -43,67.29215 -44,67.23927 -45,67.21572 -46,67.24843 -47,67.25526 -48,67.24344 -49,67.22066 -50,67.23169 -51,67.22906 -52,67.22253 -53,67.29514 -54,67.28191 -55,67.22148 -56,67.22105 -57,67.21169 -58,67.26269 -59,67.21466 -60,67.18014 -61,67.18269 -62,67.23352 -63,67.15137 -64,67.32146 -65,67.33404 -66,67.34781 -67,67.31873 -68,67.26029 -69,67.22739 -70,67.32249 -71,67.35124 -72,67.33225 -73,67.27674 -74,67.2897 -75,67.32126 -76,67.33494 -77,67.24704 -78,67.28519 -79,67.34291 -80,67.34919 -81,67.41381 -82,67.46752 -83,67.46306 -84,67.47807 -85,67.47678 -86,67.3783 -87,67.37211 -88,67.369 -89,67.33711 -90,67.28002 -91,67.32143 -92,67.31763 -93,67.31792 -94,67.27464 -95,67.32878 -96,67.29559 -97,67.32603 -98,67.4652 -99,67.55562 -100,67.56523 -101,67.45151 -102,67.38894 -103,67.39752 -104,67.33105 -105,67.23556 -106,67.1732 -107,67.12367 -108,67.10297 -109,67.13461 -110,67.22528 -111,67.3043 -112,67.36492 -113,67.23952 -114,67.4109 -115,67.48538 -116,67.46617 -117,67.36505 -118,67.43651 -119,67.32363 -120,67.42442 -121,67.38281 -122,67.34606 -123,67.40769 -124,67.46423 -125,67.5414 -126,67.45592 -127,67.35045 -128,67.30896 -129,67.36341 -130,67.4295 -131,67.29053 -132,67.32894 -133,67.37399 -134,67.42236 -135,67.52719 -136,67.48099 -137,67.47454 -138,67.38197 -139,67.18442 -140,67.1347 -141,67.13355 -142,67.16867 -143,67.2172 -144,67.24693 -145,67.18006 -146,67.21268 -147,67.32011 -148,67.34021 -149,67.33997 -150,67.3023 -151,67.23561 -152,67.16631 -153,67.18465 -154,67.22002 -155,67.27415 -156,67.31395 -157,67.31492 -158,67.2292 -159,67.26322 -160,67.34174 -161,67.34156 -162,67.23624 -163,67.2503 -164,67.27892 -165,67.29626 -166,67.47116 -167,67.49728 -168,67.56127 -169,67.4771 -170,67.34253 -171,67.38469 -172,67.38748 -173,67.40744 -174,67.41016 -175,67.43563 -176,67.45676 -177,67.4312 -178,67.46767 -179,67.39628 -180,67.45993 -181,67.48104 -182,67.44968 -183,67.46853 -184,67.39716 -185,67.4501 -186,67.46369 -187,67.46315 -188,67.45118 -189,67.37273 -190,67.46207 -191,67.42358 -192,67.38055 -193,67.40004 -194,67.40195 -195,67.45037 -196,67.40067 -197,67.31334 -198,67.21465 -199,67.26051 -200,67.40639 -201,67.54031 -202,67.40512 -203,67.28709 -204,67.30239 -205,67.45384 -206,67.3239 -207,67.24693 -208,67.27061 -209,67.30849 -210,67.40517 -211,67.64081 -212,67.521 -213,67.44157 -214,67.43269 -215,67.33911 -216,67.37727 -217,67.37268 -218,67.32021 -219,67.26873 -220,67.25411 -221,67.45874 -222,67.50282 -223,67.3784 -224,67.27431 -225,67.33359 -226,67.49818 -227,67.55161 -228,67.39916 -229,67.28979 -230,67.27021 -231,67.28572 -232,67.39331 -233,67.30009 -234,67.25822 -235,67.34859 -236,67.53671 -237,67.47654 -238,67.44636 -239,67.422 -240,67.39211 -241,67.35567 -242,67.37268 -243,67.4152 -244,67.32281 -245,67.36624 -246,67.37088 -247,67.45028 -248,67.35603 -249,67.4224 -250,67.5158 -251,67.4127 -252,67.36851 -253,67.38433 -254,67.41561 -255,67.41425 -256,67.3959 -257,67.3689 -258,67.37198 -259,67.48215 -260,67.37759 -261,67.41226 -262,67.36012 -263,67.4147 -264,67.38885 -265,67.28056 -266,67.28286 -267,67.24844 -268,67.24242 -269,67.25951 -270,67.4109 -271,67.41502 -272,67.32991 -273,67.25406 -274,67.37669 -275,67.29859 -276,67.31481 -277,67.19997 -278,67.17394 -279,67.17474 -280,67.18555 -281,67.33587 -282,67.32304 -283,67.26855 -284,67.28331 -285,67.24728 -286,67.24285 -287,67.2859 -288,67.53765 -289,67.51125 -290,67.39973 -291,67.30977 -292,67.34917 -293,67.43411 -294,67.42382 -295,67.36582 -296,67.32005 -297,67.33183 -298,67.52543 -299,67.50048 -300,67.42454 -301,67.35871 -302,67.34757 -303,67.35999 -304,67.37251 -305,67.42146 -306,67.35941 -307,67.43257 -308,67.48736 -309,67.44902 -310,67.45061 -311,67.48132 -312,67.44115 -313,67.4188 -314,67.40034 -315,67.45879 -316,67.42589 -317,67.38441 -318,67.40083 -319,67.37914 -320,67.41718 -321,67.44191 -322,67.30887 -323,67.26675 -324,67.36716 -325,67.40809 -326,67.41615 -327,67.29771 -328,67.24358 -329,67.31816 -330,67.38274 -331,67.4098 -332,67.35583 -333,67.39432 -334,67.44707 -335,67.39461 -336,67.42299 -337,67.40974 -338,67.41961 -339,67.38674 -340,67.39763 -341,67.36958 -342,67.3405 -343,67.29431 -344,67.32027 -345,67.20464 -346,67.35652 -347,67.4172 -348,67.41594 -349,67.37864 -350,67.28642 -351,67.28805 -352,67.36157 -353,67.40604 -354,67.24715 -355,67.19567 -356,67.26061 -357,67.25937 -358,67.29939 -359,67.25597 -360,67.27996 -361,67.3612 -362,67.37778 -363,67.38348 -364,67.27244 -365,67.26895 -366,67.36359 -367,67.36208 -368,67.31566 -369,67.25064 -370,67.29198 -371,67.30563 -372,67.23374 -373,67.31059 -374,67.3592 -375,67.42157 -376,67.37693 -377,67.33764 -378,67.30113 -379,67.28139 -380,67.31219 -381,67.42191 -382,67.31969 -383,67.22976 -384,67.21565 -385,67.25162 -386,67.2377 -387,67.24618 -388,67.30108 -389,67.4173 -390,67.48788 -391,67.4146 -392,67.35107 -393,67.36311 -394,67.38694 -395,67.31663 -396,67.35695 -397,67.34568 -398,67.3651 -399,67.33852 -400,67.31371 -401,67.26481 -402,67.26783 -403,67.24908 -404,67.2397 -405,67.2584 -406,67.25568 -407,67.2917 -408,67.36469 -409,67.47717 -410,67.43424 -411,67.35585 -412,67.34817 -413,67.37794 -414,67.35688 -415,67.32021 -416,67.41709 -417,67.3287 -418,67.3639 -419,67.34475 -420,67.35722 -421,67.37032 -422,67.40723 -423,67.35249 -424,67.3144 -425,67.29852 -426,67.28021 -427,67.18015 -428,67.18658 -429,67.30309 -430,67.48403 -431,67.44513 -432,67.37994 -433,67.37191 -434,67.33821 -435,67.32032 -436,67.28511 -437,67.28961 -438,67.33398 -439,67.38964 -440,67.36638 -441,67.32674 -442,67.2776 -443,67.29131 -444,67.32362 -445,67.35614 -446,67.3056 -447,67.38084 -448,67.2798 -449,67.24155 -450,67.23619 -451,67.16014 -452,67.21045 -453,67.21776 -454,67.23215 -455,67.29787 -456,67.30974 -457,67.46785 -458,67.46272 -459,67.35175 -460,67.36221 -461,67.27914 -462,67.34045 -463,67.30753 -464,67.45969 -465,67.37353 -466,67.30084 -467,67.35703 -468,67.32455 -469,67.31933 -470,67.31271 -471,67.35233 -472,67.27924 -473,67.3327 -474,67.39471 -475,67.34001 -476,67.39608 -477,67.28882 -478,67.37189 -479,67.36599 -480,67.38719 -481,67.32774 -482,67.31533 -483,67.35287 -484,67.35009 -485,67.31236 -486,67.14233 -487,67.14842 -488,67.26605 -489,67.3259 -490,67.37592 -491,67.30859 -492,67.17994 -493,67.10403 -494,67.16597 -495,67.2827 -496,67.18345 -497,67.15319 -498,67.20947 -499,67.233 -500,67.2791 -501,67.24157 -502,67.33463 -503,67.31535 -504,67.33089 -505,67.37086 -506,67.31207 -507,67.38922 -508,67.43734 -509,67.40028 -510,67.35358 -511,67.39671 -512,67.4091 -513,67.33654 -514,67.31081 -515,67.25478 -516,67.28275 -517,67.37498 -518,67.37563 -519,67.35639 -520,67.34682 -521,67.31152 -522,67.30154 -523,67.35225 -524,67.36008 -525,67.30479 -526,67.26225 -527,67.28769 -528,67.29901 -529,67.14817 -530,67.13154 -531,67.13269 -532,67.15188 -533,67.18815 -534,67.2933 -535,67.31092 -536,67.24566 -537,67.35493 -538,67.31837 -539,67.33146 -540,67.37133 -541,67.31898 -542,67.29527 -543,67.32121 -544,67.4201 -545,67.38996 -546,67.35352 -547,67.42341 -548,67.34813 -549,67.32396 -550,67.35328 -551,67.36757 -552,67.35675 -553,67.38316 -554,67.33711 -555,67.32374 -556,67.38184 -557,67.35668 -558,67.37504 -559,67.33154 -560,67.36497 -561,67.36752 -562,67.36998 -563,67.32171 -564,67.31309 -565,67.31782 -566,67.34878 -567,67.30084 -568,67.33308 -569,67.35986 -570,67.4098 -571,67.37981 -572,67.39442 -573,67.38424 -574,67.35194 -575,67.31578 -576,67.34494 -577,67.33601 -578,67.29845 -579,67.38226 -580,67.38197 -581,67.30277 -582,67.34032 -583,67.3223 -584,67.23396 -585,67.32334 -586,67.25668 -587,67.1504 -588,67.13303 -589,67.27644 -590,67.38494 -591,67.33719 -592,67.3054 -593,67.38366 -594,67.39902 -595,67.35023 -596,67.31902 -597,67.28839 -598,67.35009 -599,67.29752 -600,67.29226 -601,67.34821 -602,67.27769 -603,67.24148 -604,67.30963 -605,67.41599 -606,67.41525 -607,67.38906 -608,67.37166 -609,67.31017 -610,67.29811 -611,67.31274 -612,67.37987 -613,67.36745 -614,67.32694 -615,67.32925 -616,67.32594 -617,67.30705 -618,67.33566 -619,67.32426 -620,67.32172 -621,67.30132 -622,67.27404 -623,67.31922 -624,67.43024 -625,67.41776 -626,67.28513 -627,67.23768 -628,67.31913 -629,67.35931 -630,67.32354 -631,67.39597 -632,67.32792 -633,67.35014 -634,67.29671 -635,67.33395 -636,67.30618 -637,67.29182 -638,67.3922 -639,67.36793 -640,67.30036 -641,67.2336 -642,67.24001 -643,67.3239 -644,67.35643 -645,67.30405 -646,67.32057 -647,67.19549 -648,67.19349 -649,67.17085 -650,67.15494 -651,67.2515 -652,67.31602 -653,67.40373 -654,67.31294 -655,67.29301 -656,67.21756 -657,67.21761 -658,67.26677 -659,67.28786 -660,67.23757 -661,67.21963 -662,67.212 -663,67.18995 -664,67.16255 -665,67.18053 -666,67.1491 -667,67.19652 -668,67.24368 -669,67.24558 -670,67.52518 -671,67.51584 -672,67.56754 -673,67.50652 -674,67.49616 -675,67.4627 -676,67.38762 -677,67.30554 -678,67.34046 -679,67.36201 -680,67.44588 -681,67.45798 -682,67.44398 -683,67.42092 -684,67.48067 -685,67.55947 -686,67.48592 -687,67.44465 -688,67.47794 -689,67.45714 -690,67.45921 -691,67.38588 -692,67.41234 -693,67.363 -694,67.39223 -695,67.31528 -696,67.30356 -697,67.3691 -698,67.52977 -699,67.44114 -700,67.38301 -701,67.25849 -702,67.25235 -703,67.29131 -704,67.35239 -705,67.34584 -706,67.34628 -707,67.29217 -708,67.32797 -709,67.27241 -710,67.26823 -711,67.20885 -712,67.20931 -713,67.30214 -714,67.26614 -715,67.19783 -716,67.16318 -717,67.12754 -718,67.29352 -719,67.31013 -720,67.37211 -721,67.40294 -722,67.30884 -723,67.25198 -724,67.23928 -725,67.25827 -726,67.35915 -727,67.37206 -728,67.29874 -729,67.30036 -730,67.35916 -731,67.36948 -732,67.30565 -733,67.22949 -734,67.26031 -735,67.23054 -736,67.27246 -737,67.3088 -738,67.37173 -739,67.34809 -740,67.26231 -741,67.35619 -742,67.37463 -743,67.34149 -744,67.31544 -745,67.28074 -746,67.33273 -747,67.32441 -748,67.25864 -749,67.28821 -750,67.29573 -751,67.26096 -752,67.28887 -753,67.27714 -754,67.16793 -755,67.10239 -756,67.14371 -757,67.1554 -758,67.25408 -759,67.24631 -760,67.23307 -761,67.18365 -762,67.228 -763,67.21709 -764,67.20881 -765,67.26416 -766,67.31539 -767,67.21228 -768,67.20985 -769,67.15839 -770,67.18816 -771,67.34003 -772,67.20012 -773,67.22712 -774,67.37808 -775,67.56591 -776,67.44558 -777,67.20465 -778,67.11301 -779,67.23707 -780,67.30615 -781,67.35567 -782,67.35893 -783,67.33897 -784,67.33739 -785,67.37999 -786,67.25876 -787,67.21106 -788,67.34547 -789,67.46358 -790,67.52267 -791,67.44603 -792,67.20865 -793,67.25433 -794,67.35979 -795,67.28437 -796,67.2618 -797,67.3868 -798,67.3103 -799,67.30198 -800,67.30606 -801,67.27228 -802,67.34021 -803,67.33472 -804,67.28468 -805,67.27727 -806,67.27049 -807,67.33247 -808,67.25178 -809,67.27842 -810,67.42564 -811,67.3565 -812,67.29667 -813,67.3545 -814,67.2755 -815,67.31384 -816,67.39668 -817,67.48489 -818,67.52158 -819,67.44074 -820,67.38374 -821,67.38902 -822,67.39606 -823,67.39408 -824,67.41572 -825,67.42346 -826,67.32196 -827,67.41806 -828,67.40951 -829,67.35986 -830,67.42803 -831,67.3081 -832,67.28249 -833,67.2885 -834,67.41484 -835,67.42434 -836,67.3003 -837,67.27435 -838,67.2654 -839,67.35429 -840,67.42982 -841,67.33488 -842,67.30799 -843,67.24231 -844,67.24799 -845,67.19562 -846,67.22878 -847,67.16842 -848,67.23176 -849,67.28353 -850,67.2299 -851,67.2291 -852,67.26819 -853,67.29703 -854,67.25793 -855,67.25811 -856,67.28394 -857,67.31825 -858,67.36289 -859,67.44612 -860,67.51654 -861,67.47757 -862,67.23262 -863,67.14817 -864,67.1525 -865,67.2213 -866,67.24783 -867,67.2328 -868,67.27735 -869,67.33441 -870,67.27975 -871,67.22668 -872,67.23392 -873,67.28104 -874,67.33017 -875,67.31506 -876,67.32314 -877,67.29991 -878,67.32898 -879,67.36874 -880,67.31802 -881,67.34829 -882,67.35418 -883,67.36566 -884,67.31738 -885,67.3356 -886,67.35549 -887,67.3286 -888,67.35492 -889,67.34441 -890,67.28104 -891,67.29301 -892,67.32838 -893,67.32273 -894,67.359 -895,67.36435 -896,67.36916 -897,67.3603 -898,67.38069 -899,67.31096 -900,67.33042 -901,67.34761 -902,67.27577 -903,67.18008 -904,67.18411 -905,67.16831 -906,67.32115 -907,67.42764 -908,67.34318 -909,67.30946 -910,67.2776 -911,67.27024 -912,67.36296 -913,67.33749 -914,67.32363 -915,67.29402 -916,67.29602 -917,67.39981 -918,67.29316 -919,67.25111 -920,67.24418 -921,67.26738 -922,67.33343 -923,67.2424 -924,67.16921 -925,67.20982 -926,67.24476 -927,67.19815 -928,67.27895 -929,67.18552 -930,67.19538 -931,67.24628 -932,67.29557 -933,67.47127 -934,67.34116 -935,67.26918 -936,67.23225 -937,67.2645 -938,67.24843 -939,67.2049 -940,67.20419 -941,67.20278 -942,67.21964 -943,67.2231 -944,67.2569 -945,67.2038 -946,67.19144 -947,67.22227 -948,67.29431 -949,67.35017 -950,67.36247 -951,67.3684 -952,67.31508 -953,67.2513 -954,67.41282 -955,67.52827 -956,67.41515 -957,67.34048 -958,67.26832 -959,67.40123 -960,67.44776 -961,67.37859 -962,67.34604 -963,67.37878 -964,67.35303 -965,67.36246 -966,67.35143 -967,67.34055 -968,67.37268 -969,67.33956 -970,67.36406 -971,67.43313 -972,67.36667 -973,67.29978 -974,67.34291 -975,67.34309 -976,67.37743 -977,67.39853 -978,67.43093 -979,67.37713 -980,67.34336 -981,67.49297 -982,67.44338 -983,67.49775 -984,67.52859 -985,67.46479 -986,67.48365 -987,67.43507 -988,67.51141 -989,67.44785 -990,67.49252 -991,67.42416 -992,67.40794 -993,67.41336 -994,67.45834 -995,67.56329 -996,67.51195 -997,67.50901 -998,67.44695 -999,67.37113 -1000,67.45338 -1001,67.55418 -1002,67.5863 -1003,67.59798 -1004,67.54067 -1005,67.48345 -1006,67.46925 -1007,67.44605 -1008,67.52624 -1009,67.53369 -1010,67.45757 -1011,67.38073 -1012,67.40447 -1013,67.54397 -1014,67.60402 -1015,67.42757 -1016,67.44405 -1017,67.51009 -1018,67.43048 -1019,67.43091 -1020,67.39736 -1021,67.3034 -1022,67.21925 -1023,67.23254 -1024,67.24818 -1025,67.28364 -1026,67.32109 -1027,67.37182 -1028,67.41594 -1029,67.33236 -1030,67.32539 -1031,67.33989 -1032,67.32244 -1033,67.30468 -1034,67.36742 -1035,67.35175 -1036,67.40735 -1037,67.51395 -1038,67.45991 -1039,67.45622 -1040,67.44938 -1041,67.44463 -1042,67.46808 -1043,67.42249 -1044,67.42055 -1045,67.46171 -1046,67.42848 -1047,67.39214 -1048,67.40249 -1049,67.42625 -1050,67.43766 -1051,67.28013 -1052,67.22175 -1053,67.32677 -1054,67.343 -1055,67.51607 -1056,67.48488 -1057,67.32763 -1058,67.37923 -1059,67.42103 -1060,67.40231 -1061,67.4125 -1062,67.43386 -1063,67.4462 -1064,67.4435 -1065,67.45158 -1066,67.47463 -1067,67.42068 -1068,67.26482 -1069,67.26927 -1070,67.30851 -1071,67.2791 -1072,67.29613 -1073,67.30167 -1074,67.31623 -1075,67.3596 -1076,67.37672 -1077,67.38746 -1078,67.4276 -1079,67.39387 -1080,67.36185 -1081,67.37486 -1082,67.33796 -1083,67.43986 -1084,67.46225 -1085,67.36462 -1086,67.25149 -1087,67.28286 -1088,67.34012 -1089,67.29732 -1090,67.35823 -1091,67.4335 -1092,67.34891 -1093,67.32127 -1094,67.33445 -1095,67.33301 -1096,67.41524 -1097,67.33121 -1098,67.42841 -1099,67.42042 -1100,67.49758 -1101,67.40639 -1102,67.40157 -1103,67.33409 -1104,67.32244 -1105,67.40166 -1106,67.39082 -1107,67.33369 -1108,67.33739 -1109,67.34606 -1110,67.38224 -1111,67.35 -1112,67.3626 -1113,67.39147 -1114,67.46103 -1115,67.38755 -1116,67.38003 -1117,67.2773 -1118,67.27744 -1119,67.22939 -1120,67.34577 -1121,67.33951 -1122,67.34025 -1123,67.2748 -1124,67.21792 -1125,67.27251 -1126,67.27208 -1127,67.25824 -1128,67.36292 -1129,67.34177 -1130,67.40024 -1131,67.39606 -1132,67.38285 -1133,67.34507 -1134,67.33211 -1135,67.3624 -1136,67.3713 -1137,67.33168 -1138,67.28128 -1139,67.31289 -1140,67.35925 -1141,67.32653 -1142,67.34708 -1143,67.3104 -1144,67.36386 -1145,67.30222 -1146,67.33371 -1147,67.33996 -1148,67.19099 -1149,67.21763 -1150,67.28786 -1151,67.3396 -1152,67.23322 -1153,67.24358 -1154,67.15514 -1155,67.14169 -1156,67.154 -1157,67.15695 -1158,67.21102 -1159,67.16372 -1160,67.1659 -1161,67.3268 -1162,67.51499 -1163,67.49229 -1164,67.30457 -1165,67.27071 -1166,67.24648 -1167,67.2017 -1168,67.17733 -1169,67.23291 -1170,67.35143 -1171,67.32767 -1172,67.26922 -1173,67.34152 -1174,67.33778 -1175,67.35222 -1176,67.30349 -1177,67.37762 -1178,67.42243 -1179,67.45827 -1180,67.31458 -1181,67.30421 -1182,67.38699 -1183,67.2919 -1184,67.37412 -1185,67.36863 -1186,67.32019 -1187,67.29818 -1188,67.32041 -1189,67.3137 -1190,67.31373 -1191,67.34315 -1192,67.33326 -1193,67.3804 -1194,67.22936 -1195,67.33707 -1196,67.3812 -1197,67.35365 -1198,67.3525 -1199,67.26844 -1200,67.30975 -1201,67.24213 -1202,67.24995 -1203,67.31713 -1204,67.38441 -1205,67.27122 -1206,67.22046 -1207,67.24378 -1208,67.25539 -1209,67.29316 -1210,67.31593 -1211,67.37675 -1212,67.3394 -1213,67.23414 -1214,67.31226 -1215,67.30087 -1216,67.34856 -1217,67.29382 -1218,67.36529 -1219,67.41385 -1220,67.36388 -1221,67.34804 -1222,67.3619 -1223,67.34531 -1224,67.30615 -1225,67.34568 -1226,67.32053 -1227,67.31718 -1228,67.28609 -1229,67.34626 -1230,67.34766 -1231,67.28265 -1232,67.23956 -1233,67.2638 -1234,67.16655 -1235,67.24332 -1236,67.26299 -1237,67.30311 -1238,67.35281 -1239,67.32239 -1240,67.33184 -1241,67.49775 -1242,67.38627 -1243,67.37905 -1244,67.36932 -1245,67.35017 -1246,67.38449 -1247,67.34908 -1248,67.33479 -1249,67.26285 -1250,67.215 -1251,67.35551 -1252,67.2651 -1253,67.34997 -1254,67.22798 -1255,67.18132 -1256,67.30511 -1257,67.30814 -1258,67.27748 -1259,67.395 -1260,67.48974 -1261,67.38866 -1262,67.39407 -1263,67.33053 -1264,67.33711 -1265,67.262 -1266,67.2854 -1267,67.36945 -1268,67.24924 -1269,67.38924 -1270,67.36208 -1271,67.33961 -1272,67.3185 -1273,67.0757 -1274,67.0177 -1275,67.10956 -1276,67.30673 -1277,67.22749 -1278,67.14273 -1279,67.19482 -1280,67.18777 -1281,67.19225 -1282,67.21754 -1283,67.25608 -1284,67.22928 -1285,67.32556 -1286,67.5323 -1287,67.48389 -1288,67.45413 -1289,67.3387 -1290,67.25591 -1291,67.36369 -1292,67.3913 -1293,67.32854 -1294,67.40344 -1295,67.37218 -1296,67.34998 -1297,67.36692 -1298,67.36951 -1299,67.36298 -1300,67.28772 -1301,67.24501 -1302,67.25233 -1303,67.34151 -1304,67.32768 -1305,67.25754 -1306,67.30914 -1307,67.33906 -1308,67.34363 -1309,67.26569 -1310,67.22572 -1311,67.15762 -1312,67.22765 -1313,67.26807 -1314,67.14999 -1315,67.17934 -1316,67.22498 -1317,67.27197 -1318,67.35238 -1319,67.37997 -1320,67.33804 -1321,67.29108 -1322,67.30826 -1323,67.22507 -1324,67.19612 -1325,67.34376 -1326,67.40443 -1327,67.34287 -1328,67.2914 -1329,67.28666 -1330,67.29926 -1331,67.29337 -1332,67.34447 -1333,67.37234 -1334,67.35576 -1335,67.32059 -1336,67.31245 -1337,67.30603 -1338,67.33044 -1339,67.30824 -1340,67.31828 -1341,67.25275 -1342,67.18868 -1343,67.27906 -1344,67.46364 -1345,67.47001 -1346,67.40237 -1347,67.34492 -1348,67.29137 -1349,67.32008 -1350,67.35283 -1351,67.33575 -1352,67.3634 -1353,67.31926 -1354,67.37299 -1355,67.345 -1356,67.29879 -1357,67.33922 -1358,67.32439 -1359,67.33414 -1360,67.32347 -1361,67.3279 -1362,67.34538 -1363,67.25786 -1364,67.25822 -1365,67.3416 -1366,67.33611 -1367,67.29296 -1368,67.26102 -1369,67.29696 -1370,67.19537 -1371,67.12536 -1372,67.16683 -1373,67.18357 -1374,67.24542 -1375,67.3552 -1376,67.29744 -1377,67.23401 -1378,67.25239 -1379,67.24265 -1380,67.26886 -1381,67.29917 -1382,67.29917 -1383,67.29917 -1384,67.29917 -1385,67.29917 -1386,67.29917 -1387,67.29917 -1388,67.29917 -1389,67.29917 -1390,67.29917 -1391,67.29917 -1392,67.29917 -1393,67.29917 -1394,67.29917 -1395,67.29917 -1396,67.29917 -1397,67.29917 -1398,67.29917 -1399,67.29917 -1400,67.29917 -1401,67.29917 -1402,67.29917 -1403,67.29917 -1404,67.29917 -1405,67.29917 -1406,67.29917 -1407,67.29917 -1408,67.29917 -1409,67.29917 -1410,67.29917 -1411,67.29917 -1412,67.29917 -1413,67.29917 -1414,67.29917 -1415,67.29917 -1416,67.29917 -1417,67.29917 -1418,67.29917 -1419,67.29917 -1420,67.29917 -1421,67.29917 -1422,67.29917 -1423,67.29917 -1424,67.29917 -1425,67.29917 -1426,67.29917 -1427,67.29917 -1428,67.29917 -1429,67.29917 -1430,67.29917 -1431,67.29917 -1432,67.29917 -1433,67.29917 -1434,67.29917 -1435,67.29917 -1436,67.29917 -1437,67.29917 -1438,67.29917 -1439,67.29917 -1440,67.29917 diff --git a/test/villara_24hr67/inletTschedule.csv b/test/villara_24hr67/inletTschedule.csv deleted file mode 100644 index b6177881..00000000 --- a/test/villara_24hr67/inletTschedule.csv +++ /dev/null @@ -1,1442 +0,0 @@ -default 58, -minutes,temperature -1,57.75 -2,57.75 -3,57.77667 -4,57.775 -5,57.74833 -6,57.81 -7,57.82167 -8,57.785 -9,57.74833 -10,57.705 -11, -12, -13, -14, -15, -16, -17, -18, -19, -20, -21, -22, -23, -24, -25, -26, -27, -28, -29, -30, -31,57.16833 -32,57.16833 -33,57.2 -34, -35, -36, -37, -38, -39, -40, -41,57.14 -42,57.14 -43, -44, -45, -46, -47, -48, -49, -50, -51, -52, -53, -54, -55, -56, -57, -58, -59, -60, -61, -62, -63, -64, -65, -66, -67, -68, -69, -70, -71, -72, -73, -74, -75, -76, -77, -78, -79, -80, -81, -82, -83, -84, -85, -86, -87, -88, -89, -90, -91, -92, -93, -94, -95, -96, -97, -98, -99, -100, -101,57.3 -102,57.3 -103,57.28167 -104,57.18167 -105,57.14167 -106,57.22167 -107, -108, -109, -110, -111, -112, -113, -114, -115, -116, -117, -118, -119, -120, -121, -122, -123, -124, -125, -126, -127, -128, -129, -130, -131, -132, -133, -134, -135, -136, -137, -138, -139, -140, -141, -142, -143, -144, -145, -146, -147, -148, -149, -150, -151, -152, -153, -154, -155, -156, -157, -158, -159, -160, -161, -162, -163, -164, -165, -166, -167, -168, -169, -170, -171, -172, -173, -174, -175, -176, -177, -178, -179, -180, -181, -182, -183, -184, -185, -186, -187, -188, -189, -190, -191, -192, -193, -194, -195, -196, -197, -198, -199, -200, -201, -202, -203, -204, -205, -206, -207, -208, -209, -210, -211, -212, -213, -214, -215, -216, -217, -218, -219, -220, -221, -222, -223, -224, -225, -226, -227, -228, -229, -230, -231, -232, -233, -234, -235, -236, -237, -238, -239, -240, -241, -242, -243, -244, -245, -246, -247, -248, -249, -250, -251, -252, -253, -254, -255, -256, -257, -258, -259, -260, -261, -262, -263, -264, -265, -266, -267, -268, -269, -270, -271, -272, -273, -274, -275, -276, -277, -278, -279, -280, -281, -282, -283, -284, -285, -286, -287, -288, -289, -290, -291, -292, -293, -294, -295, -296, -297, -298, -299, -300, -301, -302, -303, -304, -305, -306, -307, -308, -309, -310, -311, -312, -313, -314, -315, -316, -317, -318, -319, -320, -321, -322, -323, -324, -325, -326, -327, -328, -329, -330, -331, -332, -333, -334, -335, -336, -337, -338, -339, -340, -341, -342, -343, -344, -345, -346, -347, -348, -349, -350, -351, -352, -353, -354, -355, -356, -357, -358, -359, -360, -361, -362, -363, -364, -365, -366, -367, -368, -369, -370, -371, -372, -373, -374, -375, -376, -377, -378, -379, -380, -381, -382, -383, -384, -385, -386, -387, -388, -389, -390, -391, -392, -393, -394, -395, -396, -397, -398, -399, -400, -401, -402, -403, -404, -405, -406, -407, -408, -409, -410, -411, -412, -413, -414, -415, -416, -417, -418, -419, -420, -421, -422, -423, -424, -425, -426, -427, -428, -429, -430, -431, -432, -433, -434, -435, -436, -437, -438, -439, -440, -441, -442, -443, -444, -445, -446, -447, -448, -449, -450, -451, -452, -453, -454, -455, -456, -457, -458, -459, -460, -461, -462, -463, -464, -465, -466, -467, -468, -469, -470, -471, -472, -473, -474, -475, -476, -477, -478, -479, -480, -481, -482, -483, -484, -485, -486, -487, -488, -489, -490, -491, -492, -493, -494, -495, -496, -497, -498, -499, -500, -501, -502, -503, -504, -505, -506, -507, -508, -509, -510, -511, -512, -513, -514, -515, -516, -517, -518, -519, -520, -521, -522, -523, -524, -525, -526, -527, -528, -529, -530, -531, -532, -533, -534, -535, -536, -537, -538, -539, -540, -541, -542, -543, -544, -545, -546, -547, -548, -549, -550, -551, -552, -553, -554, -555, -556, -557, -558, -559, -560, -561, -562, -563, -564, -565, -566, -567, -568, -569, -570, -571, -572, -573, -574, -575, -576, -577, -578, -579, -580, -581, -582, -583, -584, -585, -586, -587, -588, -589, -590, -591, -592, -593, -594, -595, -596, -597, -598, -599, -600, -601, -602, -603, -604, -605, -606, -607, -608, -609, -610, -611, -612, -613, -614, -615, -616, -617, -618, -619, -620, -621, -622, -623, -624, -625, -626, -627, -628, -629, -630, -631,57.47833 -632,57.47833 -633,57.595 -634,57.625 -635,57.75834 -636,57.73167 -637, -638, -639, -640, -641, -642, -643, -644, -645, -646, -647, -648, -649, -650, -651, -652, -653, -654, -655, -656, -657, -658, -659, -660, -661, -662, -663, -664, -665, -666, -667, -668, -669, -670, -671, -672, -673, -674, -675, -676, -677, -678, -679, -680, -681, -682, -683, -684, -685, -686, -687, -688, -689, -690, -691,57.24833 -692,57.24833 -693,57.3 -694,57.38833 -695, -696, -697, -698, -699, -700, -701, -702, -703, -704, -705, -706, -707, -708, -709, -710, -711, -712, -713, -714, -715, -716, -717, -718, -719, -720, -721,57.2 -722,57.2 -723, -724, -725, -726, -727, -728, -729, -730, -731, -732, -733, -734, -735, -736, -737, -738, -739, -740, -741, -742, -743, -744, -745, -746, -747, -748, -749, -750, -751, -752, -753, -754, -755, -756, -757, -758, -759, -760, -761, -762, -763, -764, -765, -766,57.09167 -767,57.09167 -768, -769, -770, -771,57.18333 -772,57.18333 -773, -774, -775, -776, -777, -778, -779, -780, -781, -782, -783, -784, -785, -786, -787, -788, -789, -790, -791, -792, -793, -794, -795, -796, -797, -798, -799, -800, -801, -802, -803, -804, -805, -806, -807, -808, -809, -810, -811, -812, -813, -814, -815, -816, -817, -818, -819, -820, -821, -822, -823, -824, -825, -826, -827, -828, -829, -830, -831, -832, -833, -834, -835, -836, -837, -838, -839, -840, -841, -842, -843, -844, -845, -846, -847, -848, -849, -850, -851, -852, -853, -854, -855, -856, -857, -858, -859, -860, -861, -862, -863, -864, -865, -866, -867, -868, -869, -870, -871, -872, -873, -874, -875, -876, -877, -878, -879, -880, -881, -882, -883, -884, -885, -886, -887, -888, -889, -890, -891, -892, -893, -894, -895, -896, -897, -898, -899, -900, -901, -902, -903, -904, -905, -906, -907, -908, -909, -910, -911, -912, -913, -914, -915, -916, -917, -918, -919, -920, -921, -922, -923, -924, -925, -926, -927, -928, -929, -930, -931, -932, -933, -934, -935, -936, -937, -938, -939, -940, -941, -942, -943, -944, -945, -946, -947, -948, -949, -950, -951, -952, -953, -954, -955, -956, -957, -958, -959, -960, -961,57.1 -962,57.1 -963,57.19833 -964, -965, -966, -967, -968, -969, -970, -971, -972, -973, -974, -975, -976,57.20167 -977,57.20167 -978,57.235 -979, -980, -981, -982, -983, -984, -985, -986, -987, -988, -989, -990, -991,57.31 -992,57.31 -993, -994, -995, -996, -997, -998, -999, -1000, -1001, -1002, -1003, -1004, -1005, -1006,57.19333 -1007,57.19333 -1008, -1009, -1010, -1011, -1012, -1013, -1014, -1015, -1016, -1017, -1018, -1019, -1020, -1021,57.605 -1022,57.605 -1023,57.63 -1024,57.71 -1025,57.67167 -1026,57.70167 -1027, -1028, -1029, -1030, -1031, -1032, -1033, -1034, -1035, -1036, -1037, -1038, -1039, -1040, -1041, -1042, -1043, -1044, -1045, -1046, -1047, -1048, -1049, -1050, -1051, -1052, -1053, -1054, -1055, -1056, -1057, -1058, -1059, -1060, -1061, -1062, -1063, -1064, -1065, -1066, -1067, -1068, -1069, -1070, -1071, -1072, -1073, -1074, -1075, -1076, -1077, -1078, -1079, -1080, -1081, -1082, -1083, -1084, -1085, -1086, -1087, -1088, -1089, -1090, -1091, -1092, -1093, -1094, -1095, -1096, -1097, -1098, -1099, -1100, -1101, -1102, -1103, -1104, -1105, -1106, -1107, -1108, -1109, -1110, -1111, -1112, -1113, -1114, -1115, -1116, -1117, -1118, -1119, -1120, -1121, -1122, -1123, -1124, -1125, -1126, -1127, -1128, -1129, -1130, -1131, -1132, -1133, -1134, -1135, -1136, -1137, -1138, -1139, -1140, -1141, -1142, -1143, -1144, -1145, -1146, -1147, -1148, -1149, -1150, -1151, -1152, -1153, -1154, -1155, -1156, -1157, -1158, -1159, -1160, -1161, -1162, -1163, -1164, -1165, -1166, -1167, -1168, -1169, -1170, -1171, -1172, -1173, -1174, -1175, -1176, -1177, -1178, -1179, -1180, -1181, -1182, -1183, -1184, -1185, -1186, -1187, -1188, -1189, -1190, -1191, -1192, -1193, -1194, -1195, -1196, -1197, -1198, -1199, -1200, -1201, -1202, -1203, -1204, -1205, -1206, -1207, -1208, -1209, -1210, -1211, -1212, -1213, -1214, -1215, -1216, -1217, -1218, -1219, -1220, -1221, -1222, -1223, -1224, -1225, -1226, -1227, -1228, -1229, -1230, -1231, -1232, -1233, -1234, -1235, -1236, -1237, -1238, -1239, -1240, -1241, -1242, -1243, -1244, -1245, -1246, -1247, -1248, -1249, -1250, -1251, -1252, -1253, -1254, -1255, -1256, -1257, -1258, -1259, -1260, -1261, -1262, -1263, -1264, -1265, -1266, -1267, -1268, -1269, -1270, -1271, -1272, -1273, -1274, -1275, -1276, -1277, -1278, -1279, -1280, -1281, -1282, -1283, -1284, -1285, -1286, -1287, -1288, -1289, -1290, -1291, -1292, -1293, -1294, -1295, -1296, -1297, -1298, -1299, -1300, -1301, -1302, -1303, -1304, -1305, -1306, -1307, -1308, -1309, -1310, -1311, -1312, -1313, -1314, -1315, -1316, -1317, -1318, -1319, -1320, -1321, -1322, -1323, -1324, -1325, -1326, -1327, -1328, -1329, -1330, -1331, -1332, -1333, -1334, -1335, -1336, -1337, -1338, -1339, -1340, -1341, -1342, -1343, -1344, -1345, -1346, -1347, -1348, -1349, -1350, -1351, -1352, -1353, -1354, -1355, -1356, -1357, -1358, -1359, -1360, -1361, -1362, -1363, -1364, -1365, -1366, -1367, -1368, -1369, -1370, -1371, -1372, -1373, -1374, -1375, -1376, -1377, -1378, -1379, -1380, -1381, -1382, -1383, -1384, -1385, -1386, -1387, -1388, -1389, -1390, -1391, -1392, -1393, -1394, -1395, -1396, -1397, -1398, -1399, -1400, -1401, -1402, -1403, -1404, -1405, -1406, -1407, -1408, -1409, -1410, -1411, -1412, -1413, -1414, -1415, -1416, -1417, -1418, -1419, -1420, -1421, -1422, -1423, -1424, -1425, -1426, -1427, -1428, -1429, -1430, -1431, -1432, -1433, -1434, -1435, -1436, -1437, -1438, -1439, -1440, diff --git a/test/villara_24hr67/testInfo.txt b/test/villara_24hr67/testInfo.txt deleted file mode 100644 index 686199cf..00000000 --- a/test/villara_24hr67/testInfo.txt +++ /dev/null @@ -1,2 +0,0 @@ -HPWH_setpoint 125 -length_of_test 1441 From 9bb19c7f9d204e18fcc257c1ba749122831cd6e6 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 13 Nov 2023 15:04:28 -0700 Subject: [PATCH 08/23] No AquaTherm refs. --- src/HPWH.in.hh | 2 -- test/CMakeLists.txt | 2 -- test/testUtilityFcts.cc | 3 --- 3 files changed, 7 deletions(-) diff --git a/src/HPWH.in.hh b/src/HPWH.in.hh index a6a2536e..058ef5ed 100644 --- a/src/HPWH.in.hh +++ b/src/HPWH.in.hh @@ -220,8 +220,6 @@ public: MODELS_RHEEM_HPHD60VNU_201_MP = 351, MODELS_RHEEM_HPHD135HNU_483_MP = 352, // really bad fit to data due to inconsistency in data MODELS_RHEEM_HPHD135VNU_483_MP = 353, // really bad fit to data due to inconsistency in data - - MODELS_AQUATHERMAIRE = 400 // heat exchanger model }; ///specifies the modes for writing output diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4903a53b..d4755f9f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -185,10 +185,8 @@ set(yearLargeTestsModels Scalable_MP ) set(heatExchangeModelNames - AquaThermAire ) set(heatExchangeTests - villara_24hr67 ) set(yearLargeTests testCA_36Unit_CTZ12 diff --git a/test/testUtilityFcts.cc b/test/testUtilityFcts.cc index 4cca9e05..e46b797e 100644 --- a/test/testUtilityFcts.cc +++ b/test/testUtilityFcts.cc @@ -297,9 +297,6 @@ HPWH::MODELS mapStringToPreset(string modelName) { else if (modelName == "AWHSTier3Generic80") { hpwhModel = HPWH::MODELS_AWHSTier3Generic80; } - else if (modelName == "AquaThermAire") { - hpwhModel = HPWH::MODELS_AQUATHERMAIRE; - } else { hpwhModel = HPWH::MODELS_basicIntegrated; cout << "Couldn't find model " << modelName << ". Exiting...\n"; From 2fa7021f5e2ddf8f3a6d586b0ff152c8791dcc19 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 13 Nov 2023 15:40:46 -0700 Subject: [PATCH 09/23] AquaTherm back in. --- src/HPWH.in.hh | 2 + src/HPWHpresets.cc | 63 + test/AquaThermAire.txt | 71 + test/CMakeLists.txt | 2 + test/testUtilityFcts.cc | 3 + test/villara_24hr67/DRschedule.csv | 2 + test/villara_24hr67/ambientTschedule.csv | 1442 +++++++++++++++++++ test/villara_24hr67/drawschedule.csv | 55 + test/villara_24hr67/evaporatorTschedule.csv | 1442 +++++++++++++++++++ test/villara_24hr67/inletTschedule.csv | 1442 +++++++++++++++++++ test/villara_24hr67/testInfo.txt | 2 + 11 files changed, 4526 insertions(+) create mode 100644 test/AquaThermAire.txt create mode 100644 test/villara_24hr67/DRschedule.csv create mode 100644 test/villara_24hr67/ambientTschedule.csv create mode 100644 test/villara_24hr67/drawschedule.csv create mode 100644 test/villara_24hr67/evaporatorTschedule.csv create mode 100644 test/villara_24hr67/inletTschedule.csv create mode 100644 test/villara_24hr67/testInfo.txt diff --git a/src/HPWH.in.hh b/src/HPWH.in.hh index 058ef5ed..a6a2536e 100644 --- a/src/HPWH.in.hh +++ b/src/HPWH.in.hh @@ -220,6 +220,8 @@ public: MODELS_RHEEM_HPHD60VNU_201_MP = 351, MODELS_RHEEM_HPHD135HNU_483_MP = 352, // really bad fit to data due to inconsistency in data MODELS_RHEEM_HPHD135VNU_483_MP = 353, // really bad fit to data due to inconsistency in data + + MODELS_AQUATHERMAIRE = 400 // heat exchanger model }; ///specifies the modes for writing output diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 175407c2..855ed386 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3822,6 +3822,69 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { heatSources[0].companionHeatSource = &heatSources[2]; } + else if (presetNum == MODELS_AQUATHERMAIRE) { // AquaThermAire + setNumNodes(1); + setpoint_C = F_TO_C(125.); + + tankVolume_L = GAL_TO_L(54.4); + tankUA_kJperHrC = 10.35; + + doTempDepression = false; + tankMixesOnDraw = true; + + // heat exchangers only + waterIsDrawnFromTank = false; + heatExchangeEfficiency = 0.9; + + HeatSource compressor(this); + + //compressor values + compressor.isOn = false; + compressor.isVIP = false; + compressor.typeOfHeatSource = TYPE_compressor; + + compressor.setCondensity({1.}); + + //AOSmithPHPT60 values + compressor.perfMap.reserve(4); + + compressor.perfMap.push_back({ + 5, // Temperature (T_F) + {-1423, 38.70 ,0.}, // Input Power Coefficients (inputPower_coeffs) + {-0.13839, 0.012319, 0.} // COP Coefficients (COP_coeffs) + }); + + compressor.perfMap.push_back({ + 34, // Temperature (T_F) + {-1558, 42.40, 0.}, // Input Power Coefficients (inputPower_coeffs) + {-0.19375, 0.017247, 0.} // COP Coefficients (COP_coeffs) + }); + + compressor.perfMap.push_back({ + 67, // Temperature (T_F) + {-1713, 46.60, 0.}, // Input Power Coefficients (inputPower_coeffs) + {-0.28156, 0.025064, 0.} // COP Coefficients (COP_coeffs) + }); + + compressor.perfMap.push_back({ + 95, // Temperature (T_F) + {-1844, 50.17, 0.}, // Input Power Coefficients (inputPower_coeffs) + {-0.47273, 0.042082, 0.} // COP Coefficients (COP_coeffs) + }); + + compressor.minT = F_TO_C(-25); + compressor.maxT = F_TO_C(125.); + compressor.hysteresis_dC = dF_TO_dC(1); + compressor.configuration = HeatSource::CONFIG_WRAPPED; + + //logic conditions + compressor.addTurnOnLogic(HPWH::bottomTwelfth(dF_TO_dC(111))); + compressor.addTurnOnLogic(HPWH::standby(dF_TO_dC(14))); + + //set everything in its places + heatSources.resize(1); + heatSources[0] = compressor; + } else { if (hpwhVerbosity >= VRB_reluctant) { msg("You have tried to select a preset model which does not exist. \n"); diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt new file mode 100644 index 00000000..de09512f --- /dev/null +++ b/test/AquaThermAire.txt @@ -0,0 +1,71 @@ +verbosity silent +numNodes 1 #number of nodes +setpoint 125 F +volume 54.4 gal +UA 10.35 kJperHrC +depressTemp false +mixOnDraw true +waterIsDrawnFromTank false +heatExchangeEfficiency 0.9 + +#a test comment +numHeatSources 1 + +heatsource 0 isVIP false +heatsource 0 isOn false +heatsource 0 type compressor +heatsource 0 condensity 1 + +#we have input power and COP equations at for ambient temperatures +heatsource 0 nTemps 4 +heatsource 0 T1 5 F +heatsource 0 T2 34 F +heatsource 0 T3 67 F +heatsource 0 T4 95 F + +#quadratic terms for this product are zero. It's remarkably linear. + +# 5F Coefficients +heatsource 0 inPowT1const -1423 +heatsource 0 inPowT1lin 38.70 +heatsource 0 inPowT1quad 0.0 +heatsource 0 copT1const -0.13839 +heatsource 0 copT1lin 0.012319 +heatsource 0 copT1quad 0.0 + +# 34F Coefficients +heatsource 0 inPowT2const -1558 +heatsource 0 inPowT2lin 42.40 +heatsource 0 inPowT2quad 0.0 +heatsource 0 copT2const -0.19375 +heatsource 0 copT2lin 0.017247 +heatsource 0 copT2quad 0.0 + +# 67F Coefficients +heatsource 0 inPowT3const -1713 +heatsource 0 inPowT3lin 46.60 +heatsource 0 inPowT3quad 0.0 +heatsource 0 copT3const -0.28156 +heatsource 0 copT3lin 0.025064 +heatsource 0 copT3quad 0.0 + +# 95F Coefficients +heatsource 0 inPowT4const -1844 +heatsource 0 inPowT4lin 50.17 +heatsource 0 inPowT4quad 0.0 +heatsource 0 copT4const -0.47273 +heatsource 0 copT4lin 0.042082 +heatsource 0 copT4quad 0.0 + + +heatsource 0 minT -25 F +heatsource 0 maxT 125 F +heatsource 0 hysteresis 1 F +heatsource 0 coilConfig wrapped + +#Turns on when average tank temperature is 111F or colder +heatsource 0 onlogic nodes 1 absolute < 111 F + +#BL not sure how to specify standby turn on. Trying this for now +#Intent is to get it to turn on at 111F which is 14F below 125F +heatsource 0 onlogic standby 14 F \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d4755f9f..6f124a19 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -185,8 +185,10 @@ set(yearLargeTestsModels Scalable_MP ) set(heatExchangeModelNames + AquaThermAire ) set(heatExchangeTests + villara_24hr67 ) set(yearLargeTests testCA_36Unit_CTZ12 diff --git a/test/testUtilityFcts.cc b/test/testUtilityFcts.cc index e46b797e..4cca9e05 100644 --- a/test/testUtilityFcts.cc +++ b/test/testUtilityFcts.cc @@ -297,6 +297,9 @@ HPWH::MODELS mapStringToPreset(string modelName) { else if (modelName == "AWHSTier3Generic80") { hpwhModel = HPWH::MODELS_AWHSTier3Generic80; } + else if (modelName == "AquaThermAire") { + hpwhModel = HPWH::MODELS_AQUATHERMAIRE; + } else { hpwhModel = HPWH::MODELS_basicIntegrated; cout << "Couldn't find model " << modelName << ". Exiting...\n"; diff --git a/test/villara_24hr67/DRschedule.csv b/test/villara_24hr67/DRschedule.csv new file mode 100644 index 00000000..0fae0f27 --- /dev/null +++ b/test/villara_24hr67/DRschedule.csv @@ -0,0 +1,2 @@ +default 1 +minutes,OnOff diff --git a/test/villara_24hr67/ambientTschedule.csv b/test/villara_24hr67/ambientTschedule.csv new file mode 100644 index 00000000..ed996495 --- /dev/null +++ b/test/villara_24hr67/ambientTschedule.csv @@ -0,0 +1,1442 @@ +default 19.72, +minutes,temperature +1,19.60175 +2,19.62688889 +3,19.65471111 +4,19.69713889 +5,19.69673333 +6,19.61533889 +7,19.51465 +8,19.54581111 +9,19.54822222 +10,19.56301667 +11,19.56408333 +12,19.53213889 +13,19.53467222 +14,19.64183889 +15,19.60703889 +16,19.58536111 +17,19.54678889 +18,19.54845 +19,19.54475 +20,19.53613889 +21,19.49617222 +22,19.52033333 +23,19.57876111 +24,19.58561111 +25,19.53508889 +26,19.52226111 +27,19.54082222 +28,19.55367222 +29,19.55555 +30,19.57726111 +31,19.56321111 +32,19.62365 +33,19.59893889 +34,19.54717222 +35,19.63558333 +36,19.61193889 +37,19.63563889 +38,19.56255 +39,19.62293889 +40,19.65033889 +41,19.60141667 +42,19.62414444 +43,19.60675 +44,19.57737222 +45,19.56428889 +46,19.58246111 +47,19.58625556 +48,19.57968889 +49,19.56703333 +50,19.57316111 +51,19.5717 +52,19.56807222 +53,19.60841111 +54,19.60106111 +55,19.56748889 +56,19.56725 +57,19.56205 +58,19.59038333 +59,19.5637 +60,19.54452222 +61,19.54593889 +62,19.57417778 +63,19.52853889 +64,19.62303333 +65,19.63002222 +66,19.63767222 +67,19.62151667 +68,19.58905 +69,19.57077222 +70,19.62360556 +71,19.63957778 +72,19.62902778 +73,19.59818889 +74,19.60538889 +75,19.62292222 +76,19.63052222 +77,19.58168889 +78,19.60288333 +79,19.63495 +80,19.63843889 +81,19.67433889 +82,19.70417778 +83,19.7017 +84,19.71003889 +85,19.70932222 +86,19.65461111 +87,19.65117222 +88,19.64944444 +89,19.63172778 +90,19.60001111 +91,19.62301667 +92,19.62090556 +93,19.62106667 +94,19.59702222 +95,19.6271 +96,19.60866111 +97,19.62557222 +98,19.70288889 +99,19.75312222 +100,19.75846111 +101,19.69528333 +102,19.66052222 +103,19.66528889 +104,19.62836111 +105,19.57531111 +106,19.54066667 +107,19.51315 +108,19.50165 +109,19.51922778 +110,19.5696 +111,19.6135 +112,19.64717778 +113,19.57751111 +114,19.67272222 +115,19.7141 +116,19.70342778 +117,19.64725 +118,19.68695 +119,19.62423889 +120,19.68023333 +121,19.65711667 +122,19.6367 +123,19.67093889 +124,19.70235 +125,19.74522222 +126,19.69773333 +127,19.63913889 +128,19.61608889 +129,19.64633889 +130,19.68305556 +131,19.60585 +132,19.62718889 +133,19.65221667 +134,19.67908889 +135,19.73732778 +136,19.71166111 +137,19.70807778 +138,19.65665 +139,19.5469 +140,19.51927778 +141,19.51863889 +142,19.53815 +143,19.56511111 +144,19.58162778 +145,19.54447778 +146,19.5626 +147,19.62228333 +148,19.63345 +149,19.63331667 +150,19.61238889 +151,19.57533889 +152,19.53683889 +153,19.54702778 +154,19.56667778 +155,19.59675 +156,19.61886111 +157,19.6194 +158,19.57177778 +159,19.59067778 +160,19.6343 +161,19.6342 +162,19.57568889 +163,19.5835 +164,19.5994 +165,19.60903333 +166,19.7062 +167,19.72071111 +168,19.75626111 +169,19.7095 +170,19.63473889 +171,19.65816111 +172,19.65971111 +173,19.6708 +174,19.67231111 +175,19.68646111 +176,19.6982 +177,19.684 +178,19.70426111 +179,19.6646 +180,19.69996111 +181,19.71168889 +182,19.69426667 +183,19.70473889 +184,19.66508889 +185,19.6945 +186,19.70205 +187,19.70175 +188,19.6951 +189,19.65151667 +190,19.70115 +191,19.67976667 +192,19.65586111 +193,19.66668889 +194,19.66775 +195,19.69465 +196,19.66703889 +197,19.61852222 +198,19.56369444 +199,19.58917222 +200,19.67021667 +201,19.74461667 +202,19.66951111 +203,19.60393889 +204,19.61243889 +205,19.69657778 +206,19.62438889 +207,19.58162778 +208,19.59478333 +209,19.61582778 +210,19.66953889 +211,19.80045 +212,19.73388889 +213,19.68976111 +214,19.68482778 +215,19.63283889 +216,19.65403889 +217,19.65148889 +218,19.62233889 +219,19.59373889 +220,19.58561667 +221,19.6993 +222,19.72378889 +223,19.65466667 +224,19.59683889 +225,19.62977222 +226,19.72121111 +227,19.75089444 +228,19.6662 +229,19.60543889 +230,19.59456111 +231,19.60317778 +232,19.66295 +233,19.61116111 +234,19.5879 +235,19.63810556 +236,19.74261667 +237,19.70918889 +238,19.69242222 +239,19.67888889 +240,19.66228333 +241,19.64203889 +242,19.65148889 +243,19.67511111 +244,19.62378333 +245,19.64791111 +246,19.65048889 +247,19.6946 +248,19.64223889 +249,19.67911111 +250,19.731 +251,19.67372222 +252,19.64917222 +253,19.65796111 +254,19.67533889 +255,19.67458333 +256,19.66438889 +257,19.64938889 +258,19.6511 +259,19.71230556 +260,19.65421667 +261,19.67347778 +262,19.64451111 +263,19.67483333 +264,19.66047222 +265,19.60031111 +266,19.60158889 +267,19.58246667 +268,19.57912222 +269,19.58861667 +270,19.67272222 +271,19.67501111 +272,19.62772778 +273,19.58558889 +274,19.65371667 +275,19.61032778 +276,19.61933889 +277,19.55553889 +278,19.54107778 +279,19.54152222 +280,19.54752778 +281,19.63103889 +282,19.62391111 +283,19.59363889 +284,19.60183889 +285,19.58182222 +286,19.57936111 +287,19.60327778 +288,19.74313889 +289,19.72847222 +290,19.66651667 +291,19.61653889 +292,19.63842778 +293,19.68561667 +294,19.6799 +295,19.64767778 +296,19.62225 +297,19.62879444 +298,19.73635 +299,19.72248889 +300,19.6803 +301,19.64372778 +302,19.63753889 +303,19.64443889 +304,19.65139444 +305,19.67858889 +306,19.64411667 +307,19.68476111 +308,19.7152 +309,19.6939 +310,19.69478333 +311,19.71184444 +312,19.68952778 +313,19.67711111 +314,19.66685556 +315,19.69932778 +316,19.68105 +317,19.65800556 +318,19.66712778 +319,19.65507778 +320,19.67621111 +321,19.68995 +322,19.61603889 +323,19.59263889 +324,19.64842222 +325,19.67116111 +326,19.67563889 +327,19.60983889 +328,19.57976667 +329,19.6212 +330,19.65707778 +331,19.67211111 +332,19.64212778 +333,19.66351111 +334,19.69281667 +335,19.66367222 +336,19.67943889 +337,19.67207778 +338,19.67756111 +339,19.6593 +340,19.66535 +341,19.64976667 +342,19.63361111 +343,19.60795 +344,19.62237222 +345,19.55813333 +346,19.64251111 +347,19.67622222 +348,19.67552222 +349,19.6548 +350,19.60356667 +351,19.60447222 +352,19.64531667 +353,19.67002222 +354,19.58175 +355,19.55315 +356,19.58922778 +357,19.58853889 +358,19.61077222 +359,19.58665 +360,19.59997778 +361,19.64511111 +362,19.65432222 +363,19.65748889 +364,19.5958 +365,19.59386111 +366,19.64643889 +367,19.6456 +368,19.61981111 +369,19.58368889 +370,19.60665556 +371,19.61423889 +372,19.5743 +373,19.61699444 +374,19.644 +375,19.67865 +376,19.65385 +377,19.63202222 +378,19.61173889 +379,19.60077222 +380,19.61788333 +381,19.67883889 +382,19.62205 +383,19.57208889 +384,19.56425 +385,19.58423333 +386,19.5765 +387,19.58121111 +388,19.61171111 +389,19.67627778 +390,19.71548889 +391,19.67477778 +392,19.63948333 +393,19.64617222 +394,19.65941111 +395,19.62035 +396,19.64275 +397,19.63648889 +398,19.64727778 +399,19.63251111 +400,19.61872778 +401,19.59156111 +402,19.59323889 +403,19.58282222 +404,19.57761111 +405,19.588 +406,19.58648889 +407,19.6065 +408,19.64705 +409,19.70953889 +410,19.68568889 +411,19.64213889 +412,19.63787222 +413,19.65441111 +414,19.64271111 +415,19.62233889 +416,19.67616111 +417,19.62705556 +418,19.64661111 +419,19.63597222 +420,19.6429 +421,19.65017778 +422,19.67068333 +423,19.64027222 +424,19.61911111 +425,19.61028889 +426,19.60011667 +427,19.54452778 +428,19.5481 +429,19.61282778 +430,19.71335 +431,19.69173889 +432,19.65552222 +433,19.65106111 +434,19.63233889 +435,19.6224 +436,19.60283889 +437,19.60533889 +438,19.62998889 +439,19.66091111 +440,19.64798889 +441,19.62596667 +442,19.59866667 +443,19.60628333 +444,19.62423333 +445,19.6423 +446,19.61422222 +447,19.65602222 +448,19.59988889 +449,19.57863889 +450,19.57566111 +451,19.53341111 +452,19.56136111 +453,19.56542222 +454,19.57341667 +455,19.60992778 +456,19.61652222 +457,19.70436111 +458,19.70151111 +459,19.63986111 +460,19.64567222 +461,19.59952222 +462,19.63358333 +463,19.61529444 +464,19.69982778 +465,19.65196111 +466,19.61157778 +467,19.64279444 +468,19.62475 +469,19.62185 +470,19.61817222 +471,19.64018333 +472,19.59957778 +473,19.62927778 +474,19.66372778 +475,19.63333889 +476,19.66448889 +477,19.6049 +478,19.65105 +479,19.64777222 +480,19.65955 +481,19.62652222 +482,19.61962778 +483,19.64048333 +484,19.63893889 +485,19.61797778 +486,19.52351667 +487,19.5269 +488,19.59225 +489,19.6255 +490,19.65328889 +491,19.61588333 +492,19.54441111 +493,19.50223889 +494,19.53665 +495,19.6015 +496,19.54636111 +497,19.52955 +498,19.56081667 +499,19.57388889 +500,19.5995 +501,19.57865 +502,19.63035 +503,19.61963889 +504,19.62827222 +505,19.65047778 +506,19.61781667 +507,19.66067778 +508,19.68741111 +509,19.66682222 +510,19.64087778 +511,19.66483889 +512,19.67172222 +513,19.63141111 +514,19.61711667 +515,19.58598889 +516,19.60152778 +517,19.65276667 +518,19.65312778 +519,19.64243889 +520,19.63712222 +521,19.61751111 +522,19.61196667 +523,19.64013889 +524,19.64448889 +525,19.61377222 +526,19.59013889 +527,19.60427222 +528,19.61056111 +529,19.52676111 +530,19.51752222 +531,19.51816111 +532,19.52882222 +533,19.54897222 +534,19.60738889 +535,19.61717778 +536,19.58092222 +537,19.64162778 +538,19.62131667 +539,19.62858889 +540,19.65073889 +541,19.62165556 +542,19.60848333 +543,19.62289444 +544,19.67783333 +545,19.66108889 +546,19.64084444 +547,19.67967222 +548,19.63785 +549,19.62442222 +550,19.64071111 +551,19.64865 +552,19.64263889 +553,19.65731111 +554,19.63172778 +555,19.6243 +556,19.65657778 +557,19.6426 +558,19.6528 +559,19.62863333 +560,19.64720556 +561,19.64862222 +562,19.64998889 +563,19.62317222 +564,19.61838333 +565,19.62101111 +566,19.63821111 +567,19.61157778 +568,19.62948889 +569,19.64436667 +570,19.67211111 +571,19.65545 +572,19.66356667 +573,19.65791111 +574,19.63996667 +575,19.61987778 +576,19.63607778 +577,19.63111667 +578,19.61025 +579,19.65681111 +580,19.65665 +581,19.61265 +582,19.63351111 +583,19.6235 +584,19.57442222 +585,19.62407778 +586,19.58704444 +587,19.528 +588,19.51835 +589,19.59802222 +590,19.6583 +591,19.63177222 +592,19.61411111 +593,19.65758889 +594,19.66612222 +595,19.63901667 +596,19.62167778 +597,19.60466111 +598,19.63893889 +599,19.60973333 +600,19.60681111 +601,19.63789444 +602,19.59871667 +603,19.5786 +604,19.61646111 +605,19.67555 +606,19.67513889 +607,19.66058889 +608,19.65092222 +609,19.61676111 +610,19.61006111 +611,19.61818889 +612,19.65548333 +613,19.64858333 +614,19.62607778 +615,19.62736111 +616,19.62552222 +617,19.61502778 +618,19.63092222 +619,19.62458889 +620,19.62317778 +621,19.61184444 +622,19.59668889 +623,19.62178889 +624,19.68346667 +625,19.67653333 +626,19.60285 +627,19.57648889 +628,19.62173889 +629,19.64406111 +630,19.62418889 +631,19.66442778 +632,19.62662222 +633,19.63896667 +634,19.60928333 +635,19.62997222 +636,19.61454444 +637,19.60656667 +638,19.66233333 +639,19.64885 +640,19.61131111 +641,19.57422222 +642,19.57778333 +643,19.62438889 +644,19.64246111 +645,19.61336111 +646,19.62253889 +647,19.55305 +648,19.55193889 +649,19.53936111 +650,19.53052222 +651,19.58416667 +652,19.62001111 +653,19.66873889 +654,19.6183 +655,19.60722778 +656,19.56531111 +657,19.56533889 +658,19.59265 +659,19.60436667 +660,19.57642778 +661,19.56646111 +662,19.56222222 +663,19.54997222 +664,19.53475 +665,19.54473889 +666,19.52727778 +667,19.55362222 +668,19.57982222 +669,19.58087778 +670,19.73621111 +671,19.73102222 +672,19.75974444 +673,19.72584444 +674,19.72008889 +675,19.7015 +676,19.65978889 +677,19.61418889 +678,19.63358889 +679,19.64556111 +680,19.69215556 +681,19.69887778 +682,19.6911 +683,19.67828889 +684,19.71148333 +685,19.75526111 +686,19.7144 +687,19.69147222 +688,19.70996667 +689,19.69841111 +690,19.69956111 +691,19.65882222 +692,19.67352222 +693,19.64611111 +694,19.66235 +695,19.6196 +696,19.61308889 +697,19.6495 +698,19.73876111 +699,19.68952222 +700,19.65722778 +701,19.58805 +702,19.58463889 +703,19.60628333 +704,19.64021667 +705,19.63657778 +706,19.63682222 +707,19.60676111 +708,19.62665 +709,19.59578333 +710,19.59346111 +711,19.56047222 +712,19.56072778 +713,19.6123 +714,19.5923 +715,19.55435 +716,19.5351 +717,19.5153 +718,19.60751111 +719,19.61673889 +720,19.65117222 +721,19.6683 +722,19.61602222 +723,19.58443333 +724,19.57737778 +725,19.58792778 +726,19.64397222 +727,19.65114444 +728,19.61041111 +729,19.61131111 +730,19.64397778 +731,19.64971111 +732,19.61425 +733,19.57193889 +734,19.58906111 +735,19.57252222 +736,19.59581111 +737,19.616 +738,19.65096111 +739,19.63782778 +740,19.59017222 +741,19.64232778 +742,19.65257222 +743,19.63416111 +744,19.61968889 +745,19.60041111 +746,19.62929444 +747,19.62467222 +748,19.58813333 +749,19.60456111 +750,19.60873889 +751,19.58942222 +752,19.60492778 +753,19.59841111 +754,19.53773889 +755,19.50132778 +756,19.52428333 +757,19.53077778 +758,19.5856 +759,19.58128333 +760,19.57392778 +761,19.54647222 +762,19.57111111 +763,19.56505 +764,19.56045 +765,19.5912 +766,19.61966111 +767,19.56237778 +768,19.56102778 +769,19.53243889 +770,19.54897778 +771,19.63335 +772,19.55562222 +773,19.57062222 +774,19.65448889 +775,19.75883889 +776,19.69198889 +777,19.55813889 +778,19.50722778 +779,19.57615 +780,19.61452778 +781,19.64203889 +782,19.64385 +783,19.63276111 +784,19.63188333 +785,19.65555 +786,19.5882 +787,19.5617 +788,19.63637222 +789,19.70198889 +790,19.73481667 +791,19.69223889 +792,19.56036111 +793,19.58573889 +794,19.64432778 +795,19.60242778 +796,19.58988889 +797,19.65933333 +798,19.61683333 +799,19.61221111 +800,19.61447778 +801,19.59571111 +802,19.63345 +803,19.6304 +804,19.6026 +805,19.59848333 +806,19.59471667 +807,19.62915 +808,19.58432222 +809,19.59912222 +810,19.68091111 +811,19.6425 +812,19.60926111 +813,19.64138889 +814,19.5975 +815,19.6188 +816,19.66482222 +817,19.71382778 +818,19.73421111 +819,19.6893 +820,19.65763333 +821,19.66056667 +822,19.66447778 +823,19.66337778 +824,19.6754 +825,19.6797 +826,19.62331111 +827,19.6767 +828,19.67195 +829,19.64436667 +830,19.68223889 +831,19.61561111 +832,19.60138333 +833,19.60472222 +834,19.67491111 +835,19.68018889 +836,19.61127778 +837,19.59686111 +838,19.59188889 +839,19.64127222 +840,19.68323333 +841,19.63048889 +842,19.61555 +843,19.57906111 +844,19.58221667 +845,19.55312222 +846,19.57154444 +847,19.53801111 +848,19.5732 +849,19.60196111 +850,19.57216667 +851,19.57172222 +852,19.59343889 +853,19.60946111 +854,19.58773889 +855,19.58783889 +856,19.60218889 +857,19.62125 +858,19.64605 +859,19.69228889 +860,19.73141111 +861,19.70976111 +862,19.57367778 +863,19.52676111 +864,19.52916667 +865,19.56738889 +866,19.58212778 +867,19.57377778 +868,19.59852778 +869,19.63022778 +870,19.59986111 +871,19.57037778 +872,19.5744 +873,19.60057778 +874,19.62787222 +875,19.61947778 +876,19.62396667 +877,19.61106111 +878,19.62721111 +879,19.6493 +880,19.62112222 +881,19.63793889 +882,19.64121111 +883,19.64758889 +884,19.62076667 +885,19.63088889 +886,19.64193889 +887,19.627 +888,19.64162222 +889,19.63578333 +890,19.60057778 +891,19.60722778 +892,19.62687778 +893,19.62373889 +894,19.64388889 +895,19.64686111 +896,19.64953333 +897,19.64461111 +898,19.65593889 +899,19.6172 +900,19.62801111 +901,19.63756111 +902,19.59765 +903,19.54448889 +904,19.54672778 +905,19.53795 +906,19.62286111 +907,19.68202222 +908,19.6351 +909,19.61636667 +910,19.59866667 +911,19.59457778 +912,19.64608889 +913,19.63193889 +914,19.62423889 +915,19.60778889 +916,19.6089 +917,19.66656111 +918,19.60731111 +919,19.58395 +920,19.5801 +921,19.59298889 +922,19.62968333 +923,19.57911111 +924,19.53845 +925,19.56101111 +926,19.58042222 +927,19.55452778 +928,19.59941667 +929,19.54751111 +930,19.55298889 +931,19.58126667 +932,19.60865 +933,19.70626111 +934,19.63397778 +935,19.59398889 +936,19.57347222 +937,19.59138889 +938,19.58246111 +939,19.55827778 +940,19.55788333 +941,19.5571 +942,19.56646667 +943,19.56838889 +944,19.58716667 +945,19.55766667 +946,19.5508 +947,19.56792778 +948,19.60795 +949,19.63898333 +950,19.64581667 +951,19.64911111 +952,19.61948889 +953,19.58405556 +954,19.67378889 +955,19.73792778 +956,19.67508333 +957,19.6336 +958,19.59351111 +959,19.66735 +960,19.6932 +961,19.65477222 +962,19.63668889 +963,19.65487778 +964,19.64057222 +965,19.64581111 +966,19.63968333 +967,19.63363889 +968,19.65148889 +969,19.63308889 +970,19.6467 +971,19.68507222 +972,19.64815 +973,19.61098889 +974,19.63495 +975,19.63505 +976,19.65412778 +977,19.66585 +978,19.68385 +979,19.65396111 +980,19.6352 +981,19.71831667 +982,19.69076667 +983,19.72097222 +984,19.73810556 +985,19.70266111 +986,19.71313889 +987,19.68615 +988,19.72856111 +989,19.69325 +990,19.71806667 +991,19.68008889 +992,19.67107778 +993,19.67408889 +994,19.69907778 +995,19.75738333 +996,19.72886111 +997,19.72722778 +998,19.69275 +999,19.65062778 +1000,19.69632222 +1001,19.75232222 +1002,19.77016667 +1003,19.77665556 +1004,19.74481667 +1005,19.71302778 +1006,19.70513889 +1007,19.69225 +1008,19.7368 +1009,19.74093889 +1010,19.69865 +1011,19.65596111 +1012,19.66915 +1013,19.74665 +1014,19.78001111 +1015,19.68198333 +1016,19.69113889 +1017,19.72782778 +1018,19.6836 +1019,19.68383889 +1020,19.6652 +1021,19.613 +1022,19.56625 +1023,19.57363333 +1024,19.58232222 +1025,19.60202222 +1026,19.62282778 +1027,19.65101111 +1028,19.67552222 +1029,19.62908889 +1030,19.62521667 +1031,19.63327222 +1032,19.62357778 +1033,19.61371111 +1034,19.64856667 +1035,19.63986111 +1036,19.67075 +1037,19.72997222 +1038,19.69995 +1039,19.6979 +1040,19.6941 +1041,19.69146111 +1042,19.70448889 +1043,19.67916111 +1044,19.67808333 +1045,19.70095 +1046,19.68248889 +1047,19.6623 +1048,19.66805 +1049,19.68125 +1050,19.68758889 +1051,19.60007222 +1052,19.56763889 +1053,19.62598333 +1054,19.635 +1055,19.73115 +1056,19.71382222 +1057,19.62646111 +1058,19.65512778 +1059,19.67835 +1060,19.66795 +1061,19.67361111 +1062,19.68547778 +1063,19.69233333 +1064,19.69083333 +1065,19.69532222 +1066,19.70812778 +1067,19.67815556 +1068,19.59156667 +1069,19.59403889 +1070,19.61583889 +1071,19.5995 +1072,19.60896111 +1073,19.61203889 +1074,19.62012778 +1075,19.64422222 +1076,19.65373333 +1077,19.6597 +1078,19.682 +1079,19.66326111 +1080,19.64547222 +1081,19.6527 +1082,19.6322 +1083,19.68881111 +1084,19.70125 +1085,19.64701111 +1086,19.58416111 +1087,19.60158889 +1088,19.6334 +1089,19.60962222 +1090,19.64346111 +1091,19.68527778 +1092,19.63828333 +1093,19.62292778 +1094,19.63025 +1095,19.62945 +1096,19.67513333 +1097,19.62845 +1098,19.68245 +1099,19.67801111 +1100,19.72087778 +1101,19.67021667 +1102,19.66753889 +1103,19.63005 +1104,19.62357778 +1105,19.66758889 +1106,19.66156667 +1107,19.62982778 +1108,19.63188333 +1109,19.6367 +1110,19.6568 +1111,19.63888889 +1112,19.64588889 +1113,19.66192778 +1114,19.70057222 +1115,19.65975 +1116,19.65557222 +1117,19.5985 +1118,19.59857778 +1119,19.57188333 +1120,19.63653889 +1121,19.63306111 +1122,19.63347222 +1123,19.59711111 +1124,19.56551111 +1125,19.59583889 +1126,19.5956 +1127,19.58791111 +1128,19.64606667 +1129,19.63431667 +1130,19.6668 +1131,19.66447778 +1132,19.65713889 +1133,19.63615 +1134,19.62895 +1135,19.64577778 +1136,19.65072222 +1137,19.62871111 +1138,19.60071111 +1139,19.61827222 +1140,19.64402778 +1141,19.62585 +1142,19.63726667 +1143,19.61688889 +1144,19.64658889 +1145,19.61234444 +1146,19.62983889 +1147,19.63331111 +1148,19.55055 +1149,19.56535 +1150,19.60436667 +1151,19.63311111 +1152,19.57401111 +1153,19.57976667 +1154,19.53063333 +1155,19.52316111 +1156,19.53 +1157,19.53163889 +1158,19.56167778 +1159,19.5354 +1160,19.53661111 +1161,19.626 +1162,19.73055 +1163,19.71793889 +1164,19.61365 +1165,19.59483889 +1166,19.58137778 +1167,19.5565 +1168,19.54296111 +1169,19.57383889 +1170,19.63968333 +1171,19.62648333 +1172,19.59401111 +1173,19.63417778 +1174,19.6321 +1175,19.64012222 +1176,19.61305 +1177,19.65423333 +1178,19.67912778 +1179,19.69903889 +1180,19.61921111 +1181,19.61345 +1182,19.65943889 +1183,19.60661111 +1184,19.65228889 +1185,19.64923889 +1186,19.62232778 +1187,19.6101 +1188,19.62245 +1189,19.61872222 +1190,19.61873889 +1191,19.63508333 +1192,19.62958889 +1193,19.65577778 +1194,19.57186667 +1195,19.63170556 +1196,19.65622222 +1197,19.64091667 +1198,19.64027778 +1199,19.59357778 +1200,19.61652778 +1201,19.57896111 +1202,19.58330556 +1203,19.62062778 +1204,19.65800556 +1205,19.59512222 +1206,19.56692222 +1207,19.57987778 +1208,19.58632778 +1209,19.60731111 +1210,19.61996111 +1211,19.65375 +1212,19.633 +1213,19.57452222 +1214,19.61792222 +1215,19.61159444 +1216,19.63808889 +1217,19.60767778 +1218,19.64738333 +1219,19.67436111 +1220,19.6466 +1221,19.6378 +1222,19.6455 +1223,19.63628333 +1224,19.61452778 +1225,19.63648889 +1226,19.62251667 +1227,19.62065556 +1228,19.60338333 +1229,19.63681111 +1230,19.63758889 +1231,19.60147222 +1232,19.57753333 +1233,19.591 +1234,19.53697222 +1235,19.57962222 +1236,19.59055 +1237,19.61283889 +1238,19.64045 +1239,19.62355 +1240,19.6288 +1241,19.72097222 +1242,19.65903889 +1243,19.65502778 +1244,19.64962222 +1245,19.63898333 +1246,19.65805 +1247,19.63837778 +1248,19.63043889 +1249,19.59047222 +1250,19.56388889 +1251,19.64195 +1252,19.59172222 +1253,19.63887222 +1254,19.5711 +1255,19.54517778 +1256,19.61395 +1257,19.61563333 +1258,19.5986 +1259,19.66388889 +1260,19.71652222 +1261,19.66036667 +1262,19.66337222 +1263,19.62807222 +1264,19.63172778 +1265,19.59 +1266,19.603 +1267,19.64969444 +1268,19.58291111 +1269,19.66068889 +1270,19.6456 +1271,19.63311667 +1272,19.62138889 +1273,19.4865 +1274,19.45427778 +1275,19.50531111 +1276,19.61485 +1277,19.57082778 +1278,19.52373889 +1279,19.55267778 +1280,19.54876111 +1281,19.55125 +1282,19.5653 +1283,19.58671111 +1284,19.57182222 +1285,19.62531111 +1286,19.74016667 +1287,19.71327222 +1288,19.69673889 +1289,19.63261111 +1290,19.58661667 +1291,19.64649444 +1292,19.66183333 +1293,19.62696667 +1294,19.66857778 +1295,19.65121111 +1296,19.63887778 +1297,19.64828889 +1298,19.64972778 +1299,19.6461 +1300,19.60428889 +1301,19.58056111 +1302,19.58462778 +1303,19.63417222 +1304,19.62648889 +1305,19.58752222 +1306,19.61618889 +1307,19.63281111 +1308,19.63535 +1309,19.59205 +1310,19.56984444 +1311,19.53201111 +1312,19.57091667 +1313,19.59337222 +1314,19.52777222 +1315,19.54407778 +1316,19.56943333 +1317,19.59553889 +1318,19.64021111 +1319,19.65553889 +1320,19.63224444 +1321,19.60615556 +1322,19.6157 +1323,19.56948333 +1324,19.5534 +1325,19.63542222 +1326,19.66912778 +1327,19.63492778 +1328,19.60633333 +1329,19.6037 +1330,19.6107 +1331,19.60742778 +1332,19.63581667 +1333,19.6513 +1334,19.64208889 +1335,19.62255 +1336,19.61802778 +1337,19.61446111 +1338,19.62802222 +1339,19.61568889 +1340,19.62126667 +1341,19.58486111 +1342,19.54926667 +1343,19.59947778 +1344,19.70202222 +1345,19.70556111 +1346,19.66798333 +1347,19.63606667 +1348,19.60631667 +1349,19.62226667 +1350,19.64046111 +1351,19.63097222 +1352,19.64633333 +1353,19.62181111 +1354,19.65166111 +1355,19.63611111 +1356,19.61043889 +1357,19.6329 +1358,19.62466111 +1359,19.63007778 +1360,19.62415 +1361,19.62661111 +1362,19.63632222 +1363,19.5877 +1364,19.5879 +1365,19.63422222 +1366,19.63117222 +1367,19.6072 +1368,19.58945556 +1369,19.60942222 +1370,19.55298333 +1371,19.51408889 +1372,19.53712778 +1373,19.54642778 +1374,19.58078889 +1375,19.64177778 +1376,19.60968889 +1377,19.57445 +1378,19.58466111 +1379,19.57925 +1380,19.59381111 +1381,19.61065 +1382,19.61065 +1383,19.61065 +1384,19.61065 +1385,19.61065 +1386,19.61065 +1387,19.61065 +1388,19.61065 +1389,19.61065 +1390,19.61065 +1391,19.61065 +1392,19.61065 +1393,19.61065 +1394,19.61065 +1395,19.61065 +1396,19.61065 +1397,19.61065 +1398,19.61065 +1399,19.61065 +1400,19.61065 +1401,19.61065 +1402,19.61065 +1403,19.61065 +1404,19.61065 +1405,19.61065 +1406,19.61065 +1407,19.61065 +1408,19.61065 +1409,19.61065 +1410,19.61065 +1411,19.61065 +1412,19.61065 +1413,19.61065 +1414,19.61065 +1415,19.61065 +1416,19.61065 +1417,19.61065 +1418,19.61065 +1419,19.61065 +1420,19.61065 +1421,19.61065 +1422,19.61065 +1423,19.61065 +1424,19.61065 +1425,19.61065 +1426,19.61065 +1427,19.61065 +1428,19.61065 +1429,19.61065 +1430,19.61065 +1431,19.61065 +1432,19.61065 +1433,19.61065 +1434,19.61065 +1435,19.61065 +1436,19.61065 +1437,19.61065 +1438,19.61065 +1439,19.61065 +1440,19.61065 \ No newline at end of file diff --git a/test/villara_24hr67/drawschedule.csv b/test/villara_24hr67/drawschedule.csv new file mode 100644 index 00000000..b61189ab --- /dev/null +++ b/test/villara_24hr67/drawschedule.csv @@ -0,0 +1,55 @@ +default 0, +minutes,flow +1,1.3349102 +2,2.8913854 +3,3.0124772 +4,3.0023251 +5,3.0111803 +6,3.0010218 +7,3.0069499 +8,3.0063591 +9,3.0017903 +10,1.8039873 +31,0.37899702 +32,0.94744504 +33,0.63037963 +41,0.38995912 +42,0.5368643 +101,0.65925425 +102,1.7165944 +103,1.7083723 +104,1.7090602 +105,1.7091726 +106,1.3943032 +631,1.1355289 +632,2.9009642 +633,3.0374659 +634,3.0470733 +635,3.0387555 +636,1.7740286 +691,0.65034432 +692,1.6432731 +693,1.7106795 +694,0.9123426 +721,0.42550981 +722,0.53087469 +766,0.37718415 +767,0.56562094 +771,0.41616712 +772,0.56491452 +961,0.43046225 +962,0.9971379 +963,0.51245331 +976,0.40423453 +977,0.96119296 +978,0.60220512 +991,0.72326202 +992,1.23663 +1006,0.67108812 +1007,1.2519566 +1021,1.1236753 +1022,2.9326025 +1023,3.016118 +1024,3.0076832 +1025,3.0115812 +1026,0.80231295 diff --git a/test/villara_24hr67/evaporatorTschedule.csv b/test/villara_24hr67/evaporatorTschedule.csv new file mode 100644 index 00000000..ed996495 --- /dev/null +++ b/test/villara_24hr67/evaporatorTschedule.csv @@ -0,0 +1,1442 @@ +default 19.72, +minutes,temperature +1,19.60175 +2,19.62688889 +3,19.65471111 +4,19.69713889 +5,19.69673333 +6,19.61533889 +7,19.51465 +8,19.54581111 +9,19.54822222 +10,19.56301667 +11,19.56408333 +12,19.53213889 +13,19.53467222 +14,19.64183889 +15,19.60703889 +16,19.58536111 +17,19.54678889 +18,19.54845 +19,19.54475 +20,19.53613889 +21,19.49617222 +22,19.52033333 +23,19.57876111 +24,19.58561111 +25,19.53508889 +26,19.52226111 +27,19.54082222 +28,19.55367222 +29,19.55555 +30,19.57726111 +31,19.56321111 +32,19.62365 +33,19.59893889 +34,19.54717222 +35,19.63558333 +36,19.61193889 +37,19.63563889 +38,19.56255 +39,19.62293889 +40,19.65033889 +41,19.60141667 +42,19.62414444 +43,19.60675 +44,19.57737222 +45,19.56428889 +46,19.58246111 +47,19.58625556 +48,19.57968889 +49,19.56703333 +50,19.57316111 +51,19.5717 +52,19.56807222 +53,19.60841111 +54,19.60106111 +55,19.56748889 +56,19.56725 +57,19.56205 +58,19.59038333 +59,19.5637 +60,19.54452222 +61,19.54593889 +62,19.57417778 +63,19.52853889 +64,19.62303333 +65,19.63002222 +66,19.63767222 +67,19.62151667 +68,19.58905 +69,19.57077222 +70,19.62360556 +71,19.63957778 +72,19.62902778 +73,19.59818889 +74,19.60538889 +75,19.62292222 +76,19.63052222 +77,19.58168889 +78,19.60288333 +79,19.63495 +80,19.63843889 +81,19.67433889 +82,19.70417778 +83,19.7017 +84,19.71003889 +85,19.70932222 +86,19.65461111 +87,19.65117222 +88,19.64944444 +89,19.63172778 +90,19.60001111 +91,19.62301667 +92,19.62090556 +93,19.62106667 +94,19.59702222 +95,19.6271 +96,19.60866111 +97,19.62557222 +98,19.70288889 +99,19.75312222 +100,19.75846111 +101,19.69528333 +102,19.66052222 +103,19.66528889 +104,19.62836111 +105,19.57531111 +106,19.54066667 +107,19.51315 +108,19.50165 +109,19.51922778 +110,19.5696 +111,19.6135 +112,19.64717778 +113,19.57751111 +114,19.67272222 +115,19.7141 +116,19.70342778 +117,19.64725 +118,19.68695 +119,19.62423889 +120,19.68023333 +121,19.65711667 +122,19.6367 +123,19.67093889 +124,19.70235 +125,19.74522222 +126,19.69773333 +127,19.63913889 +128,19.61608889 +129,19.64633889 +130,19.68305556 +131,19.60585 +132,19.62718889 +133,19.65221667 +134,19.67908889 +135,19.73732778 +136,19.71166111 +137,19.70807778 +138,19.65665 +139,19.5469 +140,19.51927778 +141,19.51863889 +142,19.53815 +143,19.56511111 +144,19.58162778 +145,19.54447778 +146,19.5626 +147,19.62228333 +148,19.63345 +149,19.63331667 +150,19.61238889 +151,19.57533889 +152,19.53683889 +153,19.54702778 +154,19.56667778 +155,19.59675 +156,19.61886111 +157,19.6194 +158,19.57177778 +159,19.59067778 +160,19.6343 +161,19.6342 +162,19.57568889 +163,19.5835 +164,19.5994 +165,19.60903333 +166,19.7062 +167,19.72071111 +168,19.75626111 +169,19.7095 +170,19.63473889 +171,19.65816111 +172,19.65971111 +173,19.6708 +174,19.67231111 +175,19.68646111 +176,19.6982 +177,19.684 +178,19.70426111 +179,19.6646 +180,19.69996111 +181,19.71168889 +182,19.69426667 +183,19.70473889 +184,19.66508889 +185,19.6945 +186,19.70205 +187,19.70175 +188,19.6951 +189,19.65151667 +190,19.70115 +191,19.67976667 +192,19.65586111 +193,19.66668889 +194,19.66775 +195,19.69465 +196,19.66703889 +197,19.61852222 +198,19.56369444 +199,19.58917222 +200,19.67021667 +201,19.74461667 +202,19.66951111 +203,19.60393889 +204,19.61243889 +205,19.69657778 +206,19.62438889 +207,19.58162778 +208,19.59478333 +209,19.61582778 +210,19.66953889 +211,19.80045 +212,19.73388889 +213,19.68976111 +214,19.68482778 +215,19.63283889 +216,19.65403889 +217,19.65148889 +218,19.62233889 +219,19.59373889 +220,19.58561667 +221,19.6993 +222,19.72378889 +223,19.65466667 +224,19.59683889 +225,19.62977222 +226,19.72121111 +227,19.75089444 +228,19.6662 +229,19.60543889 +230,19.59456111 +231,19.60317778 +232,19.66295 +233,19.61116111 +234,19.5879 +235,19.63810556 +236,19.74261667 +237,19.70918889 +238,19.69242222 +239,19.67888889 +240,19.66228333 +241,19.64203889 +242,19.65148889 +243,19.67511111 +244,19.62378333 +245,19.64791111 +246,19.65048889 +247,19.6946 +248,19.64223889 +249,19.67911111 +250,19.731 +251,19.67372222 +252,19.64917222 +253,19.65796111 +254,19.67533889 +255,19.67458333 +256,19.66438889 +257,19.64938889 +258,19.6511 +259,19.71230556 +260,19.65421667 +261,19.67347778 +262,19.64451111 +263,19.67483333 +264,19.66047222 +265,19.60031111 +266,19.60158889 +267,19.58246667 +268,19.57912222 +269,19.58861667 +270,19.67272222 +271,19.67501111 +272,19.62772778 +273,19.58558889 +274,19.65371667 +275,19.61032778 +276,19.61933889 +277,19.55553889 +278,19.54107778 +279,19.54152222 +280,19.54752778 +281,19.63103889 +282,19.62391111 +283,19.59363889 +284,19.60183889 +285,19.58182222 +286,19.57936111 +287,19.60327778 +288,19.74313889 +289,19.72847222 +290,19.66651667 +291,19.61653889 +292,19.63842778 +293,19.68561667 +294,19.6799 +295,19.64767778 +296,19.62225 +297,19.62879444 +298,19.73635 +299,19.72248889 +300,19.6803 +301,19.64372778 +302,19.63753889 +303,19.64443889 +304,19.65139444 +305,19.67858889 +306,19.64411667 +307,19.68476111 +308,19.7152 +309,19.6939 +310,19.69478333 +311,19.71184444 +312,19.68952778 +313,19.67711111 +314,19.66685556 +315,19.69932778 +316,19.68105 +317,19.65800556 +318,19.66712778 +319,19.65507778 +320,19.67621111 +321,19.68995 +322,19.61603889 +323,19.59263889 +324,19.64842222 +325,19.67116111 +326,19.67563889 +327,19.60983889 +328,19.57976667 +329,19.6212 +330,19.65707778 +331,19.67211111 +332,19.64212778 +333,19.66351111 +334,19.69281667 +335,19.66367222 +336,19.67943889 +337,19.67207778 +338,19.67756111 +339,19.6593 +340,19.66535 +341,19.64976667 +342,19.63361111 +343,19.60795 +344,19.62237222 +345,19.55813333 +346,19.64251111 +347,19.67622222 +348,19.67552222 +349,19.6548 +350,19.60356667 +351,19.60447222 +352,19.64531667 +353,19.67002222 +354,19.58175 +355,19.55315 +356,19.58922778 +357,19.58853889 +358,19.61077222 +359,19.58665 +360,19.59997778 +361,19.64511111 +362,19.65432222 +363,19.65748889 +364,19.5958 +365,19.59386111 +366,19.64643889 +367,19.6456 +368,19.61981111 +369,19.58368889 +370,19.60665556 +371,19.61423889 +372,19.5743 +373,19.61699444 +374,19.644 +375,19.67865 +376,19.65385 +377,19.63202222 +378,19.61173889 +379,19.60077222 +380,19.61788333 +381,19.67883889 +382,19.62205 +383,19.57208889 +384,19.56425 +385,19.58423333 +386,19.5765 +387,19.58121111 +388,19.61171111 +389,19.67627778 +390,19.71548889 +391,19.67477778 +392,19.63948333 +393,19.64617222 +394,19.65941111 +395,19.62035 +396,19.64275 +397,19.63648889 +398,19.64727778 +399,19.63251111 +400,19.61872778 +401,19.59156111 +402,19.59323889 +403,19.58282222 +404,19.57761111 +405,19.588 +406,19.58648889 +407,19.6065 +408,19.64705 +409,19.70953889 +410,19.68568889 +411,19.64213889 +412,19.63787222 +413,19.65441111 +414,19.64271111 +415,19.62233889 +416,19.67616111 +417,19.62705556 +418,19.64661111 +419,19.63597222 +420,19.6429 +421,19.65017778 +422,19.67068333 +423,19.64027222 +424,19.61911111 +425,19.61028889 +426,19.60011667 +427,19.54452778 +428,19.5481 +429,19.61282778 +430,19.71335 +431,19.69173889 +432,19.65552222 +433,19.65106111 +434,19.63233889 +435,19.6224 +436,19.60283889 +437,19.60533889 +438,19.62998889 +439,19.66091111 +440,19.64798889 +441,19.62596667 +442,19.59866667 +443,19.60628333 +444,19.62423333 +445,19.6423 +446,19.61422222 +447,19.65602222 +448,19.59988889 +449,19.57863889 +450,19.57566111 +451,19.53341111 +452,19.56136111 +453,19.56542222 +454,19.57341667 +455,19.60992778 +456,19.61652222 +457,19.70436111 +458,19.70151111 +459,19.63986111 +460,19.64567222 +461,19.59952222 +462,19.63358333 +463,19.61529444 +464,19.69982778 +465,19.65196111 +466,19.61157778 +467,19.64279444 +468,19.62475 +469,19.62185 +470,19.61817222 +471,19.64018333 +472,19.59957778 +473,19.62927778 +474,19.66372778 +475,19.63333889 +476,19.66448889 +477,19.6049 +478,19.65105 +479,19.64777222 +480,19.65955 +481,19.62652222 +482,19.61962778 +483,19.64048333 +484,19.63893889 +485,19.61797778 +486,19.52351667 +487,19.5269 +488,19.59225 +489,19.6255 +490,19.65328889 +491,19.61588333 +492,19.54441111 +493,19.50223889 +494,19.53665 +495,19.6015 +496,19.54636111 +497,19.52955 +498,19.56081667 +499,19.57388889 +500,19.5995 +501,19.57865 +502,19.63035 +503,19.61963889 +504,19.62827222 +505,19.65047778 +506,19.61781667 +507,19.66067778 +508,19.68741111 +509,19.66682222 +510,19.64087778 +511,19.66483889 +512,19.67172222 +513,19.63141111 +514,19.61711667 +515,19.58598889 +516,19.60152778 +517,19.65276667 +518,19.65312778 +519,19.64243889 +520,19.63712222 +521,19.61751111 +522,19.61196667 +523,19.64013889 +524,19.64448889 +525,19.61377222 +526,19.59013889 +527,19.60427222 +528,19.61056111 +529,19.52676111 +530,19.51752222 +531,19.51816111 +532,19.52882222 +533,19.54897222 +534,19.60738889 +535,19.61717778 +536,19.58092222 +537,19.64162778 +538,19.62131667 +539,19.62858889 +540,19.65073889 +541,19.62165556 +542,19.60848333 +543,19.62289444 +544,19.67783333 +545,19.66108889 +546,19.64084444 +547,19.67967222 +548,19.63785 +549,19.62442222 +550,19.64071111 +551,19.64865 +552,19.64263889 +553,19.65731111 +554,19.63172778 +555,19.6243 +556,19.65657778 +557,19.6426 +558,19.6528 +559,19.62863333 +560,19.64720556 +561,19.64862222 +562,19.64998889 +563,19.62317222 +564,19.61838333 +565,19.62101111 +566,19.63821111 +567,19.61157778 +568,19.62948889 +569,19.64436667 +570,19.67211111 +571,19.65545 +572,19.66356667 +573,19.65791111 +574,19.63996667 +575,19.61987778 +576,19.63607778 +577,19.63111667 +578,19.61025 +579,19.65681111 +580,19.65665 +581,19.61265 +582,19.63351111 +583,19.6235 +584,19.57442222 +585,19.62407778 +586,19.58704444 +587,19.528 +588,19.51835 +589,19.59802222 +590,19.6583 +591,19.63177222 +592,19.61411111 +593,19.65758889 +594,19.66612222 +595,19.63901667 +596,19.62167778 +597,19.60466111 +598,19.63893889 +599,19.60973333 +600,19.60681111 +601,19.63789444 +602,19.59871667 +603,19.5786 +604,19.61646111 +605,19.67555 +606,19.67513889 +607,19.66058889 +608,19.65092222 +609,19.61676111 +610,19.61006111 +611,19.61818889 +612,19.65548333 +613,19.64858333 +614,19.62607778 +615,19.62736111 +616,19.62552222 +617,19.61502778 +618,19.63092222 +619,19.62458889 +620,19.62317778 +621,19.61184444 +622,19.59668889 +623,19.62178889 +624,19.68346667 +625,19.67653333 +626,19.60285 +627,19.57648889 +628,19.62173889 +629,19.64406111 +630,19.62418889 +631,19.66442778 +632,19.62662222 +633,19.63896667 +634,19.60928333 +635,19.62997222 +636,19.61454444 +637,19.60656667 +638,19.66233333 +639,19.64885 +640,19.61131111 +641,19.57422222 +642,19.57778333 +643,19.62438889 +644,19.64246111 +645,19.61336111 +646,19.62253889 +647,19.55305 +648,19.55193889 +649,19.53936111 +650,19.53052222 +651,19.58416667 +652,19.62001111 +653,19.66873889 +654,19.6183 +655,19.60722778 +656,19.56531111 +657,19.56533889 +658,19.59265 +659,19.60436667 +660,19.57642778 +661,19.56646111 +662,19.56222222 +663,19.54997222 +664,19.53475 +665,19.54473889 +666,19.52727778 +667,19.55362222 +668,19.57982222 +669,19.58087778 +670,19.73621111 +671,19.73102222 +672,19.75974444 +673,19.72584444 +674,19.72008889 +675,19.7015 +676,19.65978889 +677,19.61418889 +678,19.63358889 +679,19.64556111 +680,19.69215556 +681,19.69887778 +682,19.6911 +683,19.67828889 +684,19.71148333 +685,19.75526111 +686,19.7144 +687,19.69147222 +688,19.70996667 +689,19.69841111 +690,19.69956111 +691,19.65882222 +692,19.67352222 +693,19.64611111 +694,19.66235 +695,19.6196 +696,19.61308889 +697,19.6495 +698,19.73876111 +699,19.68952222 +700,19.65722778 +701,19.58805 +702,19.58463889 +703,19.60628333 +704,19.64021667 +705,19.63657778 +706,19.63682222 +707,19.60676111 +708,19.62665 +709,19.59578333 +710,19.59346111 +711,19.56047222 +712,19.56072778 +713,19.6123 +714,19.5923 +715,19.55435 +716,19.5351 +717,19.5153 +718,19.60751111 +719,19.61673889 +720,19.65117222 +721,19.6683 +722,19.61602222 +723,19.58443333 +724,19.57737778 +725,19.58792778 +726,19.64397222 +727,19.65114444 +728,19.61041111 +729,19.61131111 +730,19.64397778 +731,19.64971111 +732,19.61425 +733,19.57193889 +734,19.58906111 +735,19.57252222 +736,19.59581111 +737,19.616 +738,19.65096111 +739,19.63782778 +740,19.59017222 +741,19.64232778 +742,19.65257222 +743,19.63416111 +744,19.61968889 +745,19.60041111 +746,19.62929444 +747,19.62467222 +748,19.58813333 +749,19.60456111 +750,19.60873889 +751,19.58942222 +752,19.60492778 +753,19.59841111 +754,19.53773889 +755,19.50132778 +756,19.52428333 +757,19.53077778 +758,19.5856 +759,19.58128333 +760,19.57392778 +761,19.54647222 +762,19.57111111 +763,19.56505 +764,19.56045 +765,19.5912 +766,19.61966111 +767,19.56237778 +768,19.56102778 +769,19.53243889 +770,19.54897778 +771,19.63335 +772,19.55562222 +773,19.57062222 +774,19.65448889 +775,19.75883889 +776,19.69198889 +777,19.55813889 +778,19.50722778 +779,19.57615 +780,19.61452778 +781,19.64203889 +782,19.64385 +783,19.63276111 +784,19.63188333 +785,19.65555 +786,19.5882 +787,19.5617 +788,19.63637222 +789,19.70198889 +790,19.73481667 +791,19.69223889 +792,19.56036111 +793,19.58573889 +794,19.64432778 +795,19.60242778 +796,19.58988889 +797,19.65933333 +798,19.61683333 +799,19.61221111 +800,19.61447778 +801,19.59571111 +802,19.63345 +803,19.6304 +804,19.6026 +805,19.59848333 +806,19.59471667 +807,19.62915 +808,19.58432222 +809,19.59912222 +810,19.68091111 +811,19.6425 +812,19.60926111 +813,19.64138889 +814,19.5975 +815,19.6188 +816,19.66482222 +817,19.71382778 +818,19.73421111 +819,19.6893 +820,19.65763333 +821,19.66056667 +822,19.66447778 +823,19.66337778 +824,19.6754 +825,19.6797 +826,19.62331111 +827,19.6767 +828,19.67195 +829,19.64436667 +830,19.68223889 +831,19.61561111 +832,19.60138333 +833,19.60472222 +834,19.67491111 +835,19.68018889 +836,19.61127778 +837,19.59686111 +838,19.59188889 +839,19.64127222 +840,19.68323333 +841,19.63048889 +842,19.61555 +843,19.57906111 +844,19.58221667 +845,19.55312222 +846,19.57154444 +847,19.53801111 +848,19.5732 +849,19.60196111 +850,19.57216667 +851,19.57172222 +852,19.59343889 +853,19.60946111 +854,19.58773889 +855,19.58783889 +856,19.60218889 +857,19.62125 +858,19.64605 +859,19.69228889 +860,19.73141111 +861,19.70976111 +862,19.57367778 +863,19.52676111 +864,19.52916667 +865,19.56738889 +866,19.58212778 +867,19.57377778 +868,19.59852778 +869,19.63022778 +870,19.59986111 +871,19.57037778 +872,19.5744 +873,19.60057778 +874,19.62787222 +875,19.61947778 +876,19.62396667 +877,19.61106111 +878,19.62721111 +879,19.6493 +880,19.62112222 +881,19.63793889 +882,19.64121111 +883,19.64758889 +884,19.62076667 +885,19.63088889 +886,19.64193889 +887,19.627 +888,19.64162222 +889,19.63578333 +890,19.60057778 +891,19.60722778 +892,19.62687778 +893,19.62373889 +894,19.64388889 +895,19.64686111 +896,19.64953333 +897,19.64461111 +898,19.65593889 +899,19.6172 +900,19.62801111 +901,19.63756111 +902,19.59765 +903,19.54448889 +904,19.54672778 +905,19.53795 +906,19.62286111 +907,19.68202222 +908,19.6351 +909,19.61636667 +910,19.59866667 +911,19.59457778 +912,19.64608889 +913,19.63193889 +914,19.62423889 +915,19.60778889 +916,19.6089 +917,19.66656111 +918,19.60731111 +919,19.58395 +920,19.5801 +921,19.59298889 +922,19.62968333 +923,19.57911111 +924,19.53845 +925,19.56101111 +926,19.58042222 +927,19.55452778 +928,19.59941667 +929,19.54751111 +930,19.55298889 +931,19.58126667 +932,19.60865 +933,19.70626111 +934,19.63397778 +935,19.59398889 +936,19.57347222 +937,19.59138889 +938,19.58246111 +939,19.55827778 +940,19.55788333 +941,19.5571 +942,19.56646667 +943,19.56838889 +944,19.58716667 +945,19.55766667 +946,19.5508 +947,19.56792778 +948,19.60795 +949,19.63898333 +950,19.64581667 +951,19.64911111 +952,19.61948889 +953,19.58405556 +954,19.67378889 +955,19.73792778 +956,19.67508333 +957,19.6336 +958,19.59351111 +959,19.66735 +960,19.6932 +961,19.65477222 +962,19.63668889 +963,19.65487778 +964,19.64057222 +965,19.64581111 +966,19.63968333 +967,19.63363889 +968,19.65148889 +969,19.63308889 +970,19.6467 +971,19.68507222 +972,19.64815 +973,19.61098889 +974,19.63495 +975,19.63505 +976,19.65412778 +977,19.66585 +978,19.68385 +979,19.65396111 +980,19.6352 +981,19.71831667 +982,19.69076667 +983,19.72097222 +984,19.73810556 +985,19.70266111 +986,19.71313889 +987,19.68615 +988,19.72856111 +989,19.69325 +990,19.71806667 +991,19.68008889 +992,19.67107778 +993,19.67408889 +994,19.69907778 +995,19.75738333 +996,19.72886111 +997,19.72722778 +998,19.69275 +999,19.65062778 +1000,19.69632222 +1001,19.75232222 +1002,19.77016667 +1003,19.77665556 +1004,19.74481667 +1005,19.71302778 +1006,19.70513889 +1007,19.69225 +1008,19.7368 +1009,19.74093889 +1010,19.69865 +1011,19.65596111 +1012,19.66915 +1013,19.74665 +1014,19.78001111 +1015,19.68198333 +1016,19.69113889 +1017,19.72782778 +1018,19.6836 +1019,19.68383889 +1020,19.6652 +1021,19.613 +1022,19.56625 +1023,19.57363333 +1024,19.58232222 +1025,19.60202222 +1026,19.62282778 +1027,19.65101111 +1028,19.67552222 +1029,19.62908889 +1030,19.62521667 +1031,19.63327222 +1032,19.62357778 +1033,19.61371111 +1034,19.64856667 +1035,19.63986111 +1036,19.67075 +1037,19.72997222 +1038,19.69995 +1039,19.6979 +1040,19.6941 +1041,19.69146111 +1042,19.70448889 +1043,19.67916111 +1044,19.67808333 +1045,19.70095 +1046,19.68248889 +1047,19.6623 +1048,19.66805 +1049,19.68125 +1050,19.68758889 +1051,19.60007222 +1052,19.56763889 +1053,19.62598333 +1054,19.635 +1055,19.73115 +1056,19.71382222 +1057,19.62646111 +1058,19.65512778 +1059,19.67835 +1060,19.66795 +1061,19.67361111 +1062,19.68547778 +1063,19.69233333 +1064,19.69083333 +1065,19.69532222 +1066,19.70812778 +1067,19.67815556 +1068,19.59156667 +1069,19.59403889 +1070,19.61583889 +1071,19.5995 +1072,19.60896111 +1073,19.61203889 +1074,19.62012778 +1075,19.64422222 +1076,19.65373333 +1077,19.6597 +1078,19.682 +1079,19.66326111 +1080,19.64547222 +1081,19.6527 +1082,19.6322 +1083,19.68881111 +1084,19.70125 +1085,19.64701111 +1086,19.58416111 +1087,19.60158889 +1088,19.6334 +1089,19.60962222 +1090,19.64346111 +1091,19.68527778 +1092,19.63828333 +1093,19.62292778 +1094,19.63025 +1095,19.62945 +1096,19.67513333 +1097,19.62845 +1098,19.68245 +1099,19.67801111 +1100,19.72087778 +1101,19.67021667 +1102,19.66753889 +1103,19.63005 +1104,19.62357778 +1105,19.66758889 +1106,19.66156667 +1107,19.62982778 +1108,19.63188333 +1109,19.6367 +1110,19.6568 +1111,19.63888889 +1112,19.64588889 +1113,19.66192778 +1114,19.70057222 +1115,19.65975 +1116,19.65557222 +1117,19.5985 +1118,19.59857778 +1119,19.57188333 +1120,19.63653889 +1121,19.63306111 +1122,19.63347222 +1123,19.59711111 +1124,19.56551111 +1125,19.59583889 +1126,19.5956 +1127,19.58791111 +1128,19.64606667 +1129,19.63431667 +1130,19.6668 +1131,19.66447778 +1132,19.65713889 +1133,19.63615 +1134,19.62895 +1135,19.64577778 +1136,19.65072222 +1137,19.62871111 +1138,19.60071111 +1139,19.61827222 +1140,19.64402778 +1141,19.62585 +1142,19.63726667 +1143,19.61688889 +1144,19.64658889 +1145,19.61234444 +1146,19.62983889 +1147,19.63331111 +1148,19.55055 +1149,19.56535 +1150,19.60436667 +1151,19.63311111 +1152,19.57401111 +1153,19.57976667 +1154,19.53063333 +1155,19.52316111 +1156,19.53 +1157,19.53163889 +1158,19.56167778 +1159,19.5354 +1160,19.53661111 +1161,19.626 +1162,19.73055 +1163,19.71793889 +1164,19.61365 +1165,19.59483889 +1166,19.58137778 +1167,19.5565 +1168,19.54296111 +1169,19.57383889 +1170,19.63968333 +1171,19.62648333 +1172,19.59401111 +1173,19.63417778 +1174,19.6321 +1175,19.64012222 +1176,19.61305 +1177,19.65423333 +1178,19.67912778 +1179,19.69903889 +1180,19.61921111 +1181,19.61345 +1182,19.65943889 +1183,19.60661111 +1184,19.65228889 +1185,19.64923889 +1186,19.62232778 +1187,19.6101 +1188,19.62245 +1189,19.61872222 +1190,19.61873889 +1191,19.63508333 +1192,19.62958889 +1193,19.65577778 +1194,19.57186667 +1195,19.63170556 +1196,19.65622222 +1197,19.64091667 +1198,19.64027778 +1199,19.59357778 +1200,19.61652778 +1201,19.57896111 +1202,19.58330556 +1203,19.62062778 +1204,19.65800556 +1205,19.59512222 +1206,19.56692222 +1207,19.57987778 +1208,19.58632778 +1209,19.60731111 +1210,19.61996111 +1211,19.65375 +1212,19.633 +1213,19.57452222 +1214,19.61792222 +1215,19.61159444 +1216,19.63808889 +1217,19.60767778 +1218,19.64738333 +1219,19.67436111 +1220,19.6466 +1221,19.6378 +1222,19.6455 +1223,19.63628333 +1224,19.61452778 +1225,19.63648889 +1226,19.62251667 +1227,19.62065556 +1228,19.60338333 +1229,19.63681111 +1230,19.63758889 +1231,19.60147222 +1232,19.57753333 +1233,19.591 +1234,19.53697222 +1235,19.57962222 +1236,19.59055 +1237,19.61283889 +1238,19.64045 +1239,19.62355 +1240,19.6288 +1241,19.72097222 +1242,19.65903889 +1243,19.65502778 +1244,19.64962222 +1245,19.63898333 +1246,19.65805 +1247,19.63837778 +1248,19.63043889 +1249,19.59047222 +1250,19.56388889 +1251,19.64195 +1252,19.59172222 +1253,19.63887222 +1254,19.5711 +1255,19.54517778 +1256,19.61395 +1257,19.61563333 +1258,19.5986 +1259,19.66388889 +1260,19.71652222 +1261,19.66036667 +1262,19.66337222 +1263,19.62807222 +1264,19.63172778 +1265,19.59 +1266,19.603 +1267,19.64969444 +1268,19.58291111 +1269,19.66068889 +1270,19.6456 +1271,19.63311667 +1272,19.62138889 +1273,19.4865 +1274,19.45427778 +1275,19.50531111 +1276,19.61485 +1277,19.57082778 +1278,19.52373889 +1279,19.55267778 +1280,19.54876111 +1281,19.55125 +1282,19.5653 +1283,19.58671111 +1284,19.57182222 +1285,19.62531111 +1286,19.74016667 +1287,19.71327222 +1288,19.69673889 +1289,19.63261111 +1290,19.58661667 +1291,19.64649444 +1292,19.66183333 +1293,19.62696667 +1294,19.66857778 +1295,19.65121111 +1296,19.63887778 +1297,19.64828889 +1298,19.64972778 +1299,19.6461 +1300,19.60428889 +1301,19.58056111 +1302,19.58462778 +1303,19.63417222 +1304,19.62648889 +1305,19.58752222 +1306,19.61618889 +1307,19.63281111 +1308,19.63535 +1309,19.59205 +1310,19.56984444 +1311,19.53201111 +1312,19.57091667 +1313,19.59337222 +1314,19.52777222 +1315,19.54407778 +1316,19.56943333 +1317,19.59553889 +1318,19.64021111 +1319,19.65553889 +1320,19.63224444 +1321,19.60615556 +1322,19.6157 +1323,19.56948333 +1324,19.5534 +1325,19.63542222 +1326,19.66912778 +1327,19.63492778 +1328,19.60633333 +1329,19.6037 +1330,19.6107 +1331,19.60742778 +1332,19.63581667 +1333,19.6513 +1334,19.64208889 +1335,19.62255 +1336,19.61802778 +1337,19.61446111 +1338,19.62802222 +1339,19.61568889 +1340,19.62126667 +1341,19.58486111 +1342,19.54926667 +1343,19.59947778 +1344,19.70202222 +1345,19.70556111 +1346,19.66798333 +1347,19.63606667 +1348,19.60631667 +1349,19.62226667 +1350,19.64046111 +1351,19.63097222 +1352,19.64633333 +1353,19.62181111 +1354,19.65166111 +1355,19.63611111 +1356,19.61043889 +1357,19.6329 +1358,19.62466111 +1359,19.63007778 +1360,19.62415 +1361,19.62661111 +1362,19.63632222 +1363,19.5877 +1364,19.5879 +1365,19.63422222 +1366,19.63117222 +1367,19.6072 +1368,19.58945556 +1369,19.60942222 +1370,19.55298333 +1371,19.51408889 +1372,19.53712778 +1373,19.54642778 +1374,19.58078889 +1375,19.64177778 +1376,19.60968889 +1377,19.57445 +1378,19.58466111 +1379,19.57925 +1380,19.59381111 +1381,19.61065 +1382,19.61065 +1383,19.61065 +1384,19.61065 +1385,19.61065 +1386,19.61065 +1387,19.61065 +1388,19.61065 +1389,19.61065 +1390,19.61065 +1391,19.61065 +1392,19.61065 +1393,19.61065 +1394,19.61065 +1395,19.61065 +1396,19.61065 +1397,19.61065 +1398,19.61065 +1399,19.61065 +1400,19.61065 +1401,19.61065 +1402,19.61065 +1403,19.61065 +1404,19.61065 +1405,19.61065 +1406,19.61065 +1407,19.61065 +1408,19.61065 +1409,19.61065 +1410,19.61065 +1411,19.61065 +1412,19.61065 +1413,19.61065 +1414,19.61065 +1415,19.61065 +1416,19.61065 +1417,19.61065 +1418,19.61065 +1419,19.61065 +1420,19.61065 +1421,19.61065 +1422,19.61065 +1423,19.61065 +1424,19.61065 +1425,19.61065 +1426,19.61065 +1427,19.61065 +1428,19.61065 +1429,19.61065 +1430,19.61065 +1431,19.61065 +1432,19.61065 +1433,19.61065 +1434,19.61065 +1435,19.61065 +1436,19.61065 +1437,19.61065 +1438,19.61065 +1439,19.61065 +1440,19.61065 \ No newline at end of file diff --git a/test/villara_24hr67/inletTschedule.csv b/test/villara_24hr67/inletTschedule.csv new file mode 100644 index 00000000..a9da0008 --- /dev/null +++ b/test/villara_24hr67/inletTschedule.csv @@ -0,0 +1,1442 @@ +default 14.44, +minutes, +1,14.30555556 +2,14.30555556 +3,14.32037222 +4,14.31944444 +5,14.30462778 +6,14.33888889 +7,14.34537222 +8,14.325 +9,14.30462778 +10,14.28055556 +11, +12, +13, +14, +15, +16, +17, +18, +19, +20, +21, +22, +23, +24, +25, +26, +27, +28, +29, +30, +31,13.98240556 +32,13.98240556 +33,14 +34, +35, +36, +37, +38, +39, +40, +41,13.96666667 +42,13.96666667 +43, +44, +45, +46, +47, +48, +49, +50, +51, +52, +53, +54, +55, +56, +57, +58, +59, +60, +61, +62, +63, +64, +65, +66, +67, +68, +69, +70, +71, +72, +73, +74, +75, +76, +77, +78, +79, +80, +81, +82, +83, +84, +85, +86, +87, +88, +89, +90, +91, +92, +93, +94, +95, +96, +97, +98, +99, +100, +101,14.05555556 +102,14.05555556 +103,14.04537222 +104,13.98981667 +105,13.96759444 +106,14.01203889 +107, +108, +109, +110, +111, +112, +113, +114, +115, +116, +117, +118, +119, +120, +121, +122, +123, +124, +125, +126, +127, +128, +129, +130, +131, +132, +133, +134, +135, +136, +137, +138, +139, +140, +141, +142, +143, +144, +145, +146, +147, +148, +149, +150, +151, +152, +153, +154, +155, +156, +157, +158, +159, +160, +161, +162, +163, +164, +165, +166, +167, +168, +169, +170, +171, +172, +173, +174, +175, +176, +177, +178, +179, +180, +181, +182, +183, +184, +185, +186, +187, +188, +189, +190, +191, +192, +193, +194, +195, +196, +197, +198, +199, +200, +201, +202, +203, +204, +205, +206, +207, +208, +209, +210, +211, +212, +213, +214, +215, +216, +217, +218, +219, +220, +221, +222, +223, +224, +225, +226, +227, +228, +229, +230, +231, +232, +233, +234, +235, +236, +237, +238, +239, +240, +241, +242, +243, +244, +245, +246, +247, +248, +249, +250, +251, +252, +253, +254, +255, +256, +257, +258, +259, +260, +261, +262, +263, +264, +265, +266, +267, +268, +269, +270, +271, +272, +273, +274, +275, +276, +277, +278, +279, +280, +281, +282, +283, +284, +285, +286, +287, +288, +289, +290, +291, +292, +293, +294, +295, +296, +297, +298, +299, +300, +301, +302, +303, +304, +305, +306, +307, +308, +309, +310, +311, +312, +313, +314, +315, +316, +317, +318, +319, +320, +321, +322, +323, +324, +325, +326, +327, +328, +329, +330, +331, +332, +333, +334, +335, +336, +337, +338, +339, +340, +341, +342, +343, +344, +345, +346, +347, +348, +349, +350, +351, +352, +353, +354, +355, +356, +357, +358, +359, +360, +361, +362, +363, +364, +365, +366, +367, +368, +369, +370, +371, +372, +373, +374, +375, +376, +377, +378, +379, +380, +381, +382, +383, +384, +385, +386, +387, +388, +389, +390, +391, +392, +393, +394, +395, +396, +397, +398, +399, +400, +401, +402, +403, +404, +405, +406, +407, +408, +409, +410, +411, +412, +413, +414, +415, +416, +417, +418, +419, +420, +421, +422, +423, +424, +425, +426, +427, +428, +429, +430, +431, +432, +433, +434, +435, +436, +437, +438, +439, +440, +441, +442, +443, +444, +445, +446, +447, +448, +449, +450, +451, +452, +453, +454, +455, +456, +457, +458, +459, +460, +461, +462, +463, +464, +465, +466, +467, +468, +469, +470, +471, +472, +473, +474, +475, +476, +477, +478, +479, +480, +481, +482, +483, +484, +485, +486, +487, +488, +489, +490, +491, +492, +493, +494, +495, +496, +497, +498, +499, +500, +501, +502, +503, +504, +505, +506, +507, +508, +509, +510, +511, +512, +513, +514, +515, +516, +517, +518, +519, +520, +521, +522, +523, +524, +525, +526, +527, +528, +529, +530, +531, +532, +533, +534, +535, +536, +537, +538, +539, +540, +541, +542, +543, +544, +545, +546, +547, +548, +549, +550, +551, +552, +553, +554, +555, +556, +557, +558, +559, +560, +561, +562, +563, +564, +565, +566, +567, +568, +569, +570, +571, +572, +573, +574, +575, +576, +577, +578, +579, +580, +581, +582, +583, +584, +585, +586, +587, +588, +589, +590, +591, +592, +593, +594, +595, +596, +597, +598, +599, +600, +601, +602, +603, +604, +605, +606, +607, +608, +609, +610, +611, +612, +613, +614, +615, +616, +617, +618, +619, +620, +621, +622, +623, +624, +625, +626, +627, +628, +629, +630, +631,14.15462778 +632,14.15462778 +633,14.21944444 +634,14.23611111 +635,14.31018889 +636,14.29537222 +637, +638, +639, +640, +641, +642, +643, +644, +645, +646, +647, +648, +649, +650, +651, +652, +653, +654, +655, +656, +657, +658, +659, +660, +661, +662, +663, +664, +665, +666, +667, +668, +669, +670, +671, +672, +673, +674, +675, +676, +677, +678, +679, +680, +681, +682, +683, +684, +685, +686, +687, +688, +689, +690, +691,14.02685 +692,14.02685 +693,14.05555556 +694,14.10462778 +695, +696, +697, +698, +699, +700, +701, +702, +703, +704, +705, +706, +707, +708, +709, +710, +711, +712, +713, +714, +715, +716, +717, +718, +719, +720, +721,14 +722,14 +723, +724, +725, +726, +727, +728, +729, +730, +731, +732, +733, +734, +735, +736, +737, +738, +739, +740, +741, +742, +743, +744, +745, +746, +747, +748, +749, +750, +751, +752, +753, +754, +755, +756, +757, +758, +759, +760, +761, +762, +763, +764, +765, +766,13.93981667 +767,13.93981667 +768, +769, +770, +771,13.99073889 +772,13.99073889 +773, +774, +775, +776, +777, +778, +779, +780, +781, +782, +783, +784, +785, +786, +787, +788, +789, +790, +791, +792, +793, +794, +795, +796, +797, +798, +799, +800, +801, +802, +803, +804, +805, +806, +807, +808, +809, +810, +811, +812, +813, +814, +815, +816, +817, +818, +819, +820, +821, +822, +823, +824, +825, +826, +827, +828, +829, +830, +831, +832, +833, +834, +835, +836, +837, +838, +839, +840, +841, +842, +843, +844, +845, +846, +847, +848, +849, +850, +851, +852, +853, +854, +855, +856, +857, +858, +859, +860, +861, +862, +863, +864, +865, +866, +867, +868, +869, +870, +871, +872, +873, +874, +875, +876, +877, +878, +879, +880, +881, +882, +883, +884, +885, +886, +887, +888, +889, +890, +891, +892, +893, +894, +895, +896, +897, +898, +899, +900, +901, +902, +903, +904, +905, +906, +907, +908, +909, +910, +911, +912, +913, +914, +915, +916, +917, +918, +919, +920, +921, +922, +923, +924, +925, +926, +927, +928, +929, +930, +931, +932, +933, +934, +935, +936, +937, +938, +939, +940, +941, +942, +943, +944, +945, +946, +947, +948, +949, +950, +951, +952, +953, +954, +955, +956, +957, +958, +959, +960, +961,13.94444444 +962,13.94444444 +963,13.99907222 +964, +965, +966, +967, +968, +969, +970, +971, +972, +973, +974, +975, +976,14.00092778 +977,14.00092778 +978,14.01944444 +979, +980, +981, +982, +983, +984, +985, +986, +987, +988, +989, +990, +991,14.06111111 +992,14.06111111 +993, +994, +995, +996, +997, +998, +999, +1000, +1001, +1002, +1003, +1004, +1005, +1006,13.99629444 +1007,13.99629444 +1008, +1009, +1010, +1011, +1012, +1013, +1014, +1015, +1016, +1017, +1018, +1019, +1020, +1021,14.225 +1022,14.225 +1023,14.23888889 +1024,14.28333333 +1025,14.26203889 +1026,14.27870556 +1027, +1028, +1029, +1030, +1031, +1032, +1033, +1034, +1035, +1036, +1037, +1038, +1039, +1040, +1041, +1042, +1043, +1044, +1045, +1046, +1047, +1048, +1049, +1050, +1051, +1052, +1053, +1054, +1055, +1056, +1057, +1058, +1059, +1060, +1061, +1062, +1063, +1064, +1065, +1066, +1067, +1068, +1069, +1070, +1071, +1072, +1073, +1074, +1075, +1076, +1077, +1078, +1079, +1080, +1081, +1082, +1083, +1084, +1085, +1086, +1087, +1088, +1089, +1090, +1091, +1092, +1093, +1094, +1095, +1096, +1097, +1098, +1099, +1100, +1101, +1102, +1103, +1104, +1105, +1106, +1107, +1108, +1109, +1110, +1111, +1112, +1113, +1114, +1115, +1116, +1117, +1118, +1119, +1120, +1121, +1122, +1123, +1124, +1125, +1126, +1127, +1128, +1129, +1130, +1131, +1132, +1133, +1134, +1135, +1136, +1137, +1138, +1139, +1140, +1141, +1142, +1143, +1144, +1145, +1146, +1147, +1148, +1149, +1150, +1151, +1152, +1153, +1154, +1155, +1156, +1157, +1158, +1159, +1160, +1161, +1162, +1163, +1164, +1165, +1166, +1167, +1168, +1169, +1170, +1171, +1172, +1173, +1174, +1175, +1176, +1177, +1178, +1179, +1180, +1181, +1182, +1183, +1184, +1185, +1186, +1187, +1188, +1189, +1190, +1191, +1192, +1193, +1194, +1195, +1196, +1197, +1198, +1199, +1200, +1201, +1202, +1203, +1204, +1205, +1206, +1207, +1208, +1209, +1210, +1211, +1212, +1213, +1214, +1215, +1216, +1217, +1218, +1219, +1220, +1221, +1222, +1223, +1224, +1225, +1226, +1227, +1228, +1229, +1230, +1231, +1232, +1233, +1234, +1235, +1236, +1237, +1238, +1239, +1240, +1241, +1242, +1243, +1244, +1245, +1246, +1247, +1248, +1249, +1250, +1251, +1252, +1253, +1254, +1255, +1256, +1257, +1258, +1259, +1260, +1261, +1262, +1263, +1264, +1265, +1266, +1267, +1268, +1269, +1270, +1271, +1272, +1273, +1274, +1275, +1276, +1277, +1278, +1279, +1280, +1281, +1282, +1283, +1284, +1285, +1286, +1287, +1288, +1289, +1290, +1291, +1292, +1293, +1294, +1295, +1296, +1297, +1298, +1299, +1300, +1301, +1302, +1303, +1304, +1305, +1306, +1307, +1308, +1309, +1310, +1311, +1312, +1313, +1314, +1315, +1316, +1317, +1318, +1319, +1320, +1321, +1322, +1323, +1324, +1325, +1326, +1327, +1328, +1329, +1330, +1331, +1332, +1333, +1334, +1335, +1336, +1337, +1338, +1339, +1340, +1341, +1342, +1343, +1344, +1345, +1346, +1347, +1348, +1349, +1350, +1351, +1352, +1353, +1354, +1355, +1356, +1357, +1358, +1359, +1360, +1361, +1362, +1363, +1364, +1365, +1366, +1367, +1368, +1369, +1370, +1371, +1372, +1373, +1374, +1375, +1376, +1377, +1378, +1379, +1380, +1381, +1382, +1383, +1384, +1385, +1386, +1387, +1388, +1389, +1390, +1391, +1392, +1393, +1394, +1395, +1396, +1397, +1398, +1399, +1400, +1401, +1402, +1403, +1404, +1405, +1406, +1407, +1408, +1409, +1410, +1411, +1412, +1413, +1414, +1415, +1416, +1417, +1418, +1419, +1420, +1421, +1422, +1423, +1424, +1425, +1426, +1427, +1428, +1429, +1430, +1431, +1432, +1433, +1434, +1435, +1436, +1437, +1438, +1439, +1440, \ No newline at end of file diff --git a/test/villara_24hr67/testInfo.txt b/test/villara_24hr67/testInfo.txt new file mode 100644 index 00000000..8bdcbb24 --- /dev/null +++ b/test/villara_24hr67/testInfo.txt @@ -0,0 +1,2 @@ +HPWH_setpoint 51.67 +length_of_test 1441 From 361150266584333b60d9101abf7fd3613151e506 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 20 Nov 2023 13:08:56 -0700 Subject: [PATCH 10/23] Review changes; unlock condenser. --- src/HPWH.cc | 72 +++++++++++++++--------------- src/HPWH.in.hh | 7 +-- src/HPWHpresets.cc | 4 +- test/AquaThermAire.txt | 4 +- test/villara_24hr67/DRschedule.csv | 4 +- 5 files changed, 46 insertions(+), 45 deletions(-) diff --git a/src/HPWH.cc b/src/HPWH.cc index 63a1b322..ad8a1f6e 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -193,8 +193,8 @@ void HPWH::setAllDefaults() { usesSoCLogic = false; setMinutesPerStep(1.0); hpwhVerbosity = VRB_minuteOut; - waterIsDrawnFromTank = true; - heatExchangeEfficiency = 0.9; + hasHeatExchanger = false; + heatExchangerEffectiveness = 0.9; } HPWH::HPWH(const HPWH &hpwh) { @@ -2461,7 +2461,24 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien lowInletV = drawVolume_L - inletVol2_L; } - if (waterIsDrawnFromTank) { + if (hasHeatExchanger) {// heat-exchange models + + const double densityTank_kgperL = DENSITYWATER_kgperL; + const double CpTank_kJperkgC = CPWATER_kJperkgC; + + double C_Node_kJperC = CpTank_kJperkgC * densityTank_kgperL * nodeVolume_L; + double C_draw_kJperC = CPWATER_kJperkgC * DENSITYWATER_kgperL * drawVolume_L; + + outletTemp_C = inletT_C; + for (auto &nodeTemp: tankTemps_C) { + double maxHeatExchange_kJ = (nodeTemp - outletTemp_C) / (1. / C_Node_kJperC + 1. / C_draw_kJperC); + double heatExchange_kJ = heatExchangerEffectiveness * maxHeatExchange_kJ; + + nodeTemp -= heatExchange_kJ / C_Node_kJperC; + outletTemp_C += heatExchange_kJ / C_draw_kJperC; + } + } + else { //calculate how many nodes to draw (drawVolume_N) double drawVolume_N = drawVolume_L / nodeVolume_L; if(drawVolume_L > tankVolume_L) { @@ -2481,7 +2498,6 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien drawVolume_N = 0.; } - while(drawVolume_N > 0) { // Draw one node at a time @@ -2495,18 +2511,18 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien for(int i = getNumNodes() - 1; i >= lowInletH; i--) { - // Reset inlet inputs at this node. - double nodeInletFraction = 0.; - nodeInletTV = 0.; + // Reset inlet inputs at this node. + double nodeInletFraction = 0.; + nodeInletTV = 0.; - // Sum of all inlets Vi*Ti at this node - if(i == highInletH) { - nodeInletTV += highInletV * drawFraction / drawVolume_L * highInletT; - nodeInletFraction += highInletV * drawFraction / drawVolume_L; - } - if(i == lowInletH) { - nodeInletTV += lowInletV * drawFraction / drawVolume_L * lowInletT; - nodeInletFraction += lowInletV * drawFraction / drawVolume_L; + // Sum of all inlets Vi*Ti at this node + if(i == highInletH) { + nodeInletTV += highInletV * drawFraction / drawVolume_L * highInletT; + nodeInletFraction += highInletV * drawFraction / drawVolume_L; + } + if(i == lowInletH) { + nodeInletTV += lowInletV * drawFraction / drawVolume_L * lowInletT; + nodeInletFraction += lowInletV * drawFraction / drawVolume_L; break; // if this is the bottom inlet break out of the four loop and use the boundary condition equation. } @@ -2531,22 +2547,6 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien //fill in average outlet T - it is a weighted averaged, with weights == nodes drawn outletTemp_C /= (drawVolume_L / nodeVolume_L); } - else { // heat-exchange models - const double densityTank_kgperL = DENSITYWATER_kgperL; - const double CpTank_kJperkgC = CPWATER_kJperkgC; - - double C_Node_kJperC = CpTank_kJperkgC * densityTank_kgperL * nodeVolume_L; - double C_draw_kJperC = CPWATER_kJperkgC * DENSITYWATER_kgperL * drawVolume_L; - - outletTemp_C = inletT_C; - for (auto &nodeTemp: tankTemps_C) { - double maxHeatExchange_kJ = (nodeTemp - outletTemp_C) / (1. / C_Node_kJperC + 1. / C_draw_kJperC); - double heatExchange_kJ = heatExchangeEfficiency * maxHeatExchange_kJ; - - nodeTemp -= heatExchange_kJ / C_Node_kJperC; - outletTemp_C += heatExchange_kJ / C_draw_kJperC; - } - } //Account for mixing at the bottom of the tank if(tankMixesOnDraw && drawVolume_L > 0.) { @@ -3242,21 +3242,21 @@ int HPWH::HPWHinit_file(string configFile) { } return HPWH_ABORT; } - } else if(token == "waterIsDrawnFromTank") { + } else if(token == "hasHeatExchanger") { // false of this model uses heat exchange line_ss >> tempString; - if(tempString == "true") waterIsDrawnFromTank = true; - else if(tempString == "false") waterIsDrawnFromTank = false; + if(tempString == "true") hasHeatExchanger = true; + else if(tempString == "false") hasHeatExchanger = false; else { if(hpwhVerbosity >= VRB_reluctant) { msg("Improper value for %s\n",token.c_str()); } return HPWH_ABORT; } - } else if(token == "heatExchangeEfficiency") { + } else if(token == "heatExchangerEffectiveness") { // applies to heat-exchange models only line_ss >> tempDouble; - heatExchangeEfficiency = tempDouble; + heatExchangerEffectiveness = tempDouble; } else if(token == "verbosity") { line_ss >> token; if(token == "silent") { diff --git a/src/HPWH.in.hh b/src/HPWH.in.hh index a6a2536e..9f1792fb 100644 --- a/src/HPWH.in.hh +++ b/src/HPWH.in.hh @@ -1005,10 +1005,11 @@ private: /// Generates a vector of logical nodes std::vector getNodeWeightRange(double bottomFraction,double topFraction); - /// True: water is drawn from the tank itself; False: tank provides heat exchange only - bool waterIsDrawnFromTank; + /// False: water is drawn from the tank itself; True: tank provides heat exchange only + bool hasHeatExchanger; - double heatExchangeEfficiency; + /// Coefficient (0-1) of effectiveness for heat exchange between tank and water line (used by heat-exchange models only). + double heatExchangerEffectiveness; }; //end of HPWH class diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 855ed386..0efaed31 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3833,8 +3833,8 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { tankMixesOnDraw = true; // heat exchangers only - waterIsDrawnFromTank = false; - heatExchangeEfficiency = 0.9; + hasHeatExchanger = true; + heatExchangerEffectiveness = 0.9; HeatSource compressor(this); diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt index de09512f..7711a687 100644 --- a/test/AquaThermAire.txt +++ b/test/AquaThermAire.txt @@ -5,8 +5,8 @@ volume 54.4 gal UA 10.35 kJperHrC depressTemp false mixOnDraw true -waterIsDrawnFromTank false -heatExchangeEfficiency 0.9 +hasHeatExchanger true +heatExchangerEffectiveness 0.9 #a test comment numHeatSources 1 diff --git a/test/villara_24hr67/DRschedule.csv b/test/villara_24hr67/DRschedule.csv index 0fae0f27..bd79ca27 100644 --- a/test/villara_24hr67/DRschedule.csv +++ b/test/villara_24hr67/DRschedule.csv @@ -1,2 +1,2 @@ -default 1 -minutes,OnOff +default 0, +minutes,OnOff \ No newline at end of file From 63b453affe1b11f2d89b3ed497b7779816de99cf Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Wed, 6 Dec 2023 14:27:24 -0700 Subject: [PATCH 11/23] Use 800 C storage tank to pass solar test. --- src/HPWHpresets.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 35554f5c..ab947be6 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -515,7 +515,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { else if (presetNum == MODELS_StorageTank) { setNumNodes(12); - setpoint_C = F_TO_C(127.0); + setpoint_C = 800.; tankSizeFixed = false; tankVolume_L = GAL_TO_L(80); From 592b89e2713765f7f0b822395a23d2b63a3bb2fb Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 11 Dec 2023 12:58:32 -0700 Subject: [PATCH 12/23] Fix heating logic issues. --- src/HPWH.cc | 19 ++++++++++++++++++- src/HPWH.hh | 1 + src/HPWHpresets.cc | 9 ++++++--- test/AquaThermAire.txt | 5 +++-- test/main.cc | 2 +- test/villara_24hr67/testInfo.txt | 3 ++- 6 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/HPWH.cc b/src/HPWH.cc index b9f19dfa..085b2c38 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -1614,7 +1614,7 @@ std::shared_ptr HPWH::topThird(double decisionPoint std::shared_ptr HPWH::topThird_absolute(double decisionPoint) { std::vector nodeWeights = getNodeWeightRange(2./3., 1.); - return std::make_shared("top third absolute",nodeWeights,decisionPoint,this); + return std::make_shared("top third absolute",nodeWeights,decisionPoint,this,true); } std::shared_ptr HPWH::bottomThird(double decisionPoint) { @@ -1667,6 +1667,11 @@ std::shared_ptr HPWH::bottomTwelfth(double decision return std::make_shared("bottom twelfth",nodeWeights,decisionPoint,this); } +std::shared_ptr HPWH::bottomTwelfth_absolute(double decisionPoint) { + std::vector nodeWeights = getNodeWeightRange(0., 1./12.); + return std::make_shared("bottom twelfth",nodeWeights,decisionPoint,this,true); +} + std::shared_ptr HPWH::standby(double decisionPoint) { std::vector nodeWeights; nodeWeights.emplace_back(LOGIC_NODE_SIZE + 1); // uses very top computation node @@ -3404,6 +3409,18 @@ int HPWH::HPWHinit_file(string configFile) { } return HPWH_ABORT; } + } else if(token == "initialTankTemp") { + line_ss >> tempDouble >> units; + if(units == "F") tempDouble = F_TO_C(tempDouble); + else if(units == "C"); + else { + if(hpwhVerbosity >= VRB_reluctant) { + msg("Incorrect units specification for %s. \n",token.c_str()); + } + return HPWH_ABORT; + } + initalTankT_C = tempDouble; + hasInitialTankTemp = true; } else if(token == "hasHeatExchanger") { // false of this model uses heat exchange line_ss >> tempString; diff --git a/src/HPWH.hh b/src/HPWH.hh index 1f187961..ca2acf0f 100644 --- a/src/HPWH.hh +++ b/src/HPWH.hh @@ -379,6 +379,7 @@ public: std::shared_ptr bottomThird(double decisionPoint); std::shared_ptr bottomHalf(double decisionPoint) ; std::shared_ptr bottomTwelfth(double decisionPoint); + std::shared_ptr bottomTwelfth_absolute(double decisionPoint); std::shared_ptr bottomSixth(double decisionPoint); std::shared_ptr bottomSixth_absolute(double decisionPoint); std::shared_ptr secondSixth(double decisionPoint); diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 10f11728..81b2ada4 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3828,13 +3828,16 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { } else if (presetNum == MODELS_AQUATHERMAIRE) { // AquaThermAire setNumNodes(1); - setpoint_C = F_TO_C(125.); + setpoint_C = 50.; + + initialTankT_C = 49.32; + hasInitialTankTemp = true; tankVolume_L = GAL_TO_L(54.4); tankUA_kJperHrC = 10.35; doTempDepression = false; - tankMixesOnDraw = true; + tankMixesOnDraw = false; // heat exchangers only hasHeatExchanger = true; @@ -3882,7 +3885,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.configuration = HeatSource::CONFIG_WRAPPED; //logic conditions - compressor.addTurnOnLogic(HPWH::bottomTwelfth(dF_TO_dC(111))); + compressor.addTurnOnLogic(HPWH::bottomTwelfth_absolute(F_TO_C(111))); compressor.addTurnOnLogic(HPWH::standby(dF_TO_dC(14))); //set everything in its places diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt index 7711a687..4886aa79 100644 --- a/test/AquaThermAire.txt +++ b/test/AquaThermAire.txt @@ -1,10 +1,11 @@ verbosity silent numNodes 1 #number of nodes -setpoint 125 F +setpoint 50 C volume 54.4 gal UA 10.35 kJperHrC depressTemp false -mixOnDraw true +mixOnDraw false +initialTankTemp 49.32 C hasHeatExchanger true heatExchangerEffectiveness 0.9 diff --git a/test/main.cc b/test/main.cc index a949d841..de78e435 100644 --- a/test/main.cc +++ b/test/main.cc @@ -192,7 +192,7 @@ int main(int argc, char *argv[]) else if(var1 == "useSoC") { useSoC = (bool)testVal; } - if(var1 == "initialTankT_C") { // Initialize at this temperature instead of setpoint + else if(var1 == "initialTankT_C") { // Initialize at this temperature instead of setpoint initialTankT_C = testVal; hasInitialTankTemp = true; } diff --git a/test/villara_24hr67/testInfo.txt b/test/villara_24hr67/testInfo.txt index 8bdcbb24..a05c7e54 100644 --- a/test/villara_24hr67/testInfo.txt +++ b/test/villara_24hr67/testInfo.txt @@ -1,2 +1,3 @@ -HPWH_setpoint 51.67 +setpoint 50 length_of_test 1441 +initialTankT_C 49.32 \ No newline at end of file From e2d006f13d1f768c6b542aa8cf7d2e4b2090ecca Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 11 Dec 2023 13:09:38 -0700 Subject: [PATCH 13/23] Set AquaTherm to 12 tank nodes. --- src/HPWHpresets.cc | 2 +- test/AquaThermAire.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 81b2ada4..a7b6bf81 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3827,7 +3827,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { heatSources[0].companionHeatSource = &heatSources[2]; } else if (presetNum == MODELS_AQUATHERMAIRE) { // AquaThermAire - setNumNodes(1); + setNumNodes(12); setpoint_C = 50.; initialTankT_C = 49.32; diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt index 4886aa79..7b2e093b 100644 --- a/test/AquaThermAire.txt +++ b/test/AquaThermAire.txt @@ -1,5 +1,5 @@ verbosity silent -numNodes 1 #number of nodes +numNodes 12 #number of nodes setpoint 50 C volume 54.4 gal UA 10.35 kJperHrC From b8e569c8e237da7ebb600cf45196b515b078c0cf Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 11 Dec 2023 15:41:58 -0700 Subject: [PATCH 14/23] Use whole-tank logic. --- src/HPWH.cc | 50 ++++++++++++++++++++++++++++++++++++++---- src/HPWH.hh | 2 ++ src/HPWHpresets.cc | 2 +- test/AquaThermAire.txt | 2 +- 4 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/HPWH.cc b/src/HPWH.cc index 085b2c38..f381a9f5 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -1607,6 +1607,16 @@ std::vector HPWH::getNodeWeightRange(double bottomFraction, do return nodeWeights; } +std::shared_ptr HPWH::wholeTank(double decisionPoint) { + std::vector nodeWeights = getNodeWeightRange(0., 1.); + return std::make_shared("whole tank",nodeWeights,decisionPoint,this); +} + +std::shared_ptr HPWH::wholeTank_absolute(double decisionPoint) { + std::vector nodeWeights = getNodeWeightRange(0., 1.); + return std::make_shared("whole tank",nodeWeights,decisionPoint,this,true); +} + std::shared_ptr HPWH::topThird(double decisionPoint) { std::vector nodeWeights = getNodeWeightRange(2./3., 1.); return std::make_shared("top third",nodeWeights,decisionPoint,this); @@ -3588,16 +3598,48 @@ int HPWH::HPWHinit_file(string configFile) { heatSources[heatsource].standbyLogic = std::make_shared("standby logic",nodeWeights,tempDouble,this,absolute,compare); } } else if(token == "onlogic") { - line_ss >> tempDouble >> units; - if(units == "F") tempDouble = dF_TO_dC(tempDouble); - else if(units == "C"); //do nothing, lol + std::string nextToken; + line_ss >> nextToken; + bool absolute = (nextToken == "absolute"); + if(absolute) { + std::string compareStr; + line_ss >> compareStr >> tempDouble >> units; + std::function compare; + if(compareStr == "<") compare = std::less(); + else if(compareStr == ">") compare = std::greater(); + else { + if(hpwhVerbosity >= VRB_reluctant) { + msg("Improper comparison, \"%s\", for heat source %d %s. Should be \"<\" or \">\".\n",compareStr.c_str(),heatsource,token.c_str()); + } + return HPWH_ABORT; + } + line_ss >> tempDouble; + } + else { + tempDouble = std::stod(nextToken); + } + line_ss >> units; + if(units == "F") { + if(absolute) { + tempDouble = F_TO_C(tempDouble); + } else { + tempDouble = dF_TO_dC(tempDouble); + } + } else if(units == "C"); //do nothing, lol else { if(hpwhVerbosity >= VRB_reluctant) { msg("Incorrect units specification for %s from heatsource %d. \n",token.c_str(),heatsource); } return HPWH_ABORT; } - if(tempString == "topThird") { + if(tempString == "wholeTank") { + if (absolute) { + heatSources[heatsource].addTurnOnLogic(HPWH::wholeTank_absolute(tempDouble)); + } + else { + heatSources[heatsource].addTurnOnLogic(HPWH::wholeTank(tempDouble)); + } + } else if(tempString == "topThird") { heatSources[heatsource].addTurnOnLogic(HPWH::topThird(tempDouble)); } else if(tempString == "bottomThird") { heatSources[heatsource].addTurnOnLogic(HPWH::bottomThird(tempDouble)); diff --git a/src/HPWH.hh b/src/HPWH.hh index ca2acf0f..85347a5e 100644 --- a/src/HPWH.hh +++ b/src/HPWH.hh @@ -374,6 +374,8 @@ public: std::shared_ptr turnOnSoC(std::string desc,double targetSoC,double hystFract,double tempMinUseful_C, bool constMains,double mains_C); + std::shared_ptr wholeTank(double decisionPoint); + std::shared_ptr wholeTank_absolute(double decisionPoint); std::shared_ptr topThird(double decisionPoint); std::shared_ptr topThird_absolute(double decisionPoint); std::shared_ptr bottomThird(double decisionPoint); diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index a7b6bf81..2b9837fa 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3885,7 +3885,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.configuration = HeatSource::CONFIG_WRAPPED; //logic conditions - compressor.addTurnOnLogic(HPWH::bottomTwelfth_absolute(F_TO_C(111))); + compressor.addTurnOnLogic(HPWH::wholeTank_absolute(F_TO_C(111))); compressor.addTurnOnLogic(HPWH::standby(dF_TO_dC(14))); //set everything in its places diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt index 7b2e093b..6b9bb067 100644 --- a/test/AquaThermAire.txt +++ b/test/AquaThermAire.txt @@ -65,7 +65,7 @@ heatsource 0 hysteresis 1 F heatsource 0 coilConfig wrapped #Turns on when average tank temperature is 111F or colder -heatsource 0 onlogic nodes 1 absolute < 111 F +heatsource 0 onlogic wholeTank absolute < 111 F #BL not sure how to specify standby turn on. Trying this for now #Intent is to get it to turn on at 111F which is 14F below 125F From 504349472f6b70d103014f62ff7535ef73deb219 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Tue, 12 Dec 2023 09:07:45 -0700 Subject: [PATCH 15/23] Improve unit conversion. --- src/HPWH.cc | 21 ++++++++------------- src/HPWH.hh | 6 ++++-- src/HPWHpresets.cc | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/HPWH.cc b/src/HPWH.cc index e7a3dd67..717411e9 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -63,6 +63,10 @@ const double HPWH::MAXOUTLET_R410A = F_TO_C(140.); const double HPWH::MAXOUTLET_R744 = F_TO_C(190.); const double HPWH::MINSINGLEPASSLIFT = dF_TO_dC(15.); +double makeC(const double T_F_or_C,const HPWH::UNITS units,const bool absolute){ + return (units == HPWH::UNITS_C) ? T_F_or_C : (absolute ? F_TO_C(T_F_or_C) : dF_TO_dC(T_F_or_C)); +} + //----------------------------------------------------------------------------- /// @brief Samples a std::vector to extract a single value spanning the fractional /// coordinate range from frac_begin to frac_end. @@ -1732,14 +1736,10 @@ std::vector HPWH::getNodeWeightRange(double bottomFraction, do return nodeWeights; } -std::shared_ptr HPWH::wholeTank(double decisionPoint) { - std::vector nodeWeights = getNodeWeightRange(0., 1.); - return std::make_shared("whole tank",nodeWeights,decisionPoint,this); -} - -std::shared_ptr HPWH::wholeTank_absolute(double decisionPoint) { +std::shared_ptr HPWH::wholeTank(double decisionPoint,const UNITS units /* = UNITS_C */, const bool absolute /* = false */) { std::vector nodeWeights = getNodeWeightRange(0., 1.); - return std::make_shared("whole tank",nodeWeights,decisionPoint,this,true); + double decisionPoint_C = makeC(decisionPoint,units,absolute); + return std::make_shared("whole tank",nodeWeights,decisionPoint_C,this,absolute); } std::shared_ptr HPWH::topThird(double decisionPoint) { @@ -3742,12 +3742,7 @@ int HPWH::HPWHinit_file(string configFile) { return HPWH_ABORT; } if(tempString == "wholeTank") { - if (absolute) { - heatSources[heatsource].addTurnOnLogic(HPWH::wholeTank_absolute(tempDouble)); - } - else { - heatSources[heatsource].addTurnOnLogic(HPWH::wholeTank(tempDouble)); - } + heatSources[heatsource].addTurnOnLogic(HPWH::wholeTank(tempDouble,UNITS_C,absolute)); } else if(tempString == "topThird") { heatSources[heatsource].addTurnOnLogic(HPWH::topThird(tempDouble)); } else if(tempString == "bottomThird") { diff --git a/src/HPWH.hh b/src/HPWH.hh index 0d6038aa..8efd12e5 100644 --- a/src/HPWH.hh +++ b/src/HPWH.hh @@ -373,8 +373,7 @@ public: std::shared_ptr turnOnSoC(std::string desc,double targetSoC,double hystFract,double tempMinUseful_C, bool constMains,double mains_C); - std::shared_ptr wholeTank(double decisionPoint); - std::shared_ptr wholeTank_absolute(double decisionPoint); + std::shared_ptr wholeTank(double decisionPoint,const UNITS units = UNITS_C, const bool absolute = false); std::shared_ptr topThird(double decisionPoint); std::shared_ptr topThird_absolute(double decisionPoint); std::shared_ptr bottomThird(double decisionPoint); @@ -1359,6 +1358,9 @@ inline HPWH::DRMODES operator|(HPWH::DRMODES a,HPWH::DRMODES b) template< typename T> inline bool aboutEqual(T a,T b) { return fabs(a - b) < HPWH::TOL_MINVALUE; } +/// Generate an absolute or relative temperature in degC. +double makeC(const double T_F_or_C,const HPWH::UNITS units,const bool absolute); + // resampling utility functions double getResampledValue(const std::vector &values,double beginFraction,double endFraction); bool resample(std::vector &values,const std::vector &sampleValues); diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 4d48d57b..f16415af 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3868,7 +3868,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.configuration = HeatSource::CONFIG_WRAPPED; //logic conditions - compressor.addTurnOnLogic(HPWH::wholeTank_absolute(F_TO_C(111))); + compressor.addTurnOnLogic(HPWH::wholeTank(111,UNITS_F,true)); compressor.addTurnOnLogic(HPWH::standby(dF_TO_dC(14))); //set everything in its places From 0dcc92354be501e2773e0c7c91746f2bc98573a9 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Tue, 12 Dec 2023 09:24:06 -0700 Subject: [PATCH 16/23] Conform case. --- src/HPWH.hh | 2 +- src/HPWHpresets.cc | 2 +- test/testUtilityFcts.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/HPWH.hh b/src/HPWH.hh index 8efd12e5..5de38f9a 100644 --- a/src/HPWH.hh +++ b/src/HPWH.hh @@ -218,7 +218,7 @@ public: MODELS_RHEEM_HPHD135HNU_483_MP = 352, // really bad fit to data due to inconsistency in data MODELS_RHEEM_HPHD135VNU_483_MP = 353, // really bad fit to data due to inconsistency in data - MODELS_AQUATHERMAIRE = 400 // heat exchanger model + MODELS_AquaThermAire = 400 // heat exchanger model }; ///specifies the modes for writing output diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index f16415af..979af9b1 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3809,7 +3809,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { heatSources[0].companionHeatSource = &heatSources[2]; } - else if (presetNum == MODELS_AQUATHERMAIRE) { // AquaThermAire + else if (presetNum == MODELS_AquaThermAire) { // AquaThermAire setNumNodes(12); setpoint_C = 50.; diff --git a/test/testUtilityFcts.cc b/test/testUtilityFcts.cc index 6176a476..f1a85566 100644 --- a/test/testUtilityFcts.cc +++ b/test/testUtilityFcts.cc @@ -298,7 +298,7 @@ HPWH::MODELS mapStringToPreset(string modelName) { hpwhModel = HPWH::MODELS_AWHSTier3Generic80; } else if (modelName == "AquaThermAire") { - hpwhModel = HPWH::MODELS_AQUATHERMAIRE; + hpwhModel = HPWH::MODELS_AquaThermAire; } else { hpwhModel = HPWH::MODELS_basicIntegrated; From 533ec62da1b746c9e2f53a535fd085b873490865 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Thu, 14 Dec 2023 09:08:48 -0700 Subject: [PATCH 17/23] Change heat-exch-eff coeff. --- src/HPWH.cc | 3 ++- src/HPWHpresets.cc | 2 +- test/AquaThermAire.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/HPWH.cc b/src/HPWH.cc index d022ad98..f37b8dc7 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -2609,11 +2609,12 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien outletTemp_C = inletT_C; for (auto &nodeTemp: tankTemps_C) { - double maxHeatExchange_kJ = (nodeTemp - outletTemp_C) / (1. / C_Node_kJperC + 1. / C_draw_kJperC); + double maxHeatExchange_kJ = C_draw_kJperC * (nodeTemp - outletTemp_C); double heatExchange_kJ = heatExchangerEffectiveness * maxHeatExchange_kJ; nodeTemp -= heatExchange_kJ / C_Node_kJperC; outletTemp_C += heatExchange_kJ / C_draw_kJperC; + } } else { diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 31b82d5e..7838afa0 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3828,7 +3828,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { // heat exchangers only hasHeatExchanger = true; - heatExchangerEffectiveness = 0.9; + heatExchangerEffectiveness = 0.97; HeatSource compressor(this); diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt index 6b9bb067..3ba68d76 100644 --- a/test/AquaThermAire.txt +++ b/test/AquaThermAire.txt @@ -7,7 +7,7 @@ depressTemp false mixOnDraw false initialTankTemp 49.32 C hasHeatExchanger true -heatExchangerEffectiveness 0.9 +heatExchangerEffectiveness 0.97 #a test comment numHeatSources 1 From 4de5ef163bde8cabd61447e481844b62852c4f19 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Thu, 14 Dec 2023 10:37:35 -0700 Subject: [PATCH 18/23] Define node-heat-exch-effec. --- src/HPWH.cc | 6 ++++-- src/HPWH.hh | 3 +++ src/HPWHpresets.cc | 2 +- test/AquaThermAire.txt | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/HPWH.cc b/src/HPWH.cc index f37b8dc7..da2666f7 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -2610,11 +2610,10 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien outletTemp_C = inletT_C; for (auto &nodeTemp: tankTemps_C) { double maxHeatExchange_kJ = C_draw_kJperC * (nodeTemp - outletTemp_C); - double heatExchange_kJ = heatExchangerEffectiveness * maxHeatExchange_kJ; + double heatExchange_kJ = nodeHeatExchangerEffectiveness * maxHeatExchange_kJ; nodeTemp -= heatExchange_kJ / C_Node_kJperC; outletTemp_C += heatExchange_kJ / C_draw_kJperC; - } } else { @@ -3058,6 +3057,9 @@ void HPWH::calcSizeConstants() { // fracAreaSide is the faction of the area of the cylinder that's not the top or bottom. fracAreaSide = tankHeight_m / (tankHeight_m + tankRad_m); + + /// Single-node heat-exchange effectiveness + nodeHeatExchangerEffectiveness = 1. - pow(1. - heatExchangerEffectiveness, 1./ static_cast(getNumNodes())); } void HPWH::calcDerivedValues() { diff --git a/src/HPWH.hh b/src/HPWH.hh index aebbb8b8..29851605 100644 --- a/src/HPWH.hh +++ b/src/HPWH.hh @@ -1036,6 +1036,9 @@ private: /// Coefficient (0-1) of effectiveness for heat exchange between tank and water line (used by heat-exchange models only). double heatExchangerEffectiveness; + /// Coefficient (0-1) of effectiveness for heat exchange between a single tank node and water line (derived from heatExchangerEffectiveness). + double nodeHeatExchangerEffectiveness; + }; //end of HPWH class class HPWH::HeatSource { diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 7838afa0..c3d68c39 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3828,7 +3828,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { // heat exchangers only hasHeatExchanger = true; - heatExchangerEffectiveness = 0.97; + heatExchangerEffectiveness = 0.93; HeatSource compressor(this); diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt index 3ba68d76..16a7eff4 100644 --- a/test/AquaThermAire.txt +++ b/test/AquaThermAire.txt @@ -7,7 +7,7 @@ depressTemp false mixOnDraw false initialTankTemp 49.32 C hasHeatExchanger true -heatExchangerEffectiveness 0.97 +heatExchangerEffectiveness 0.93 #a test comment numHeatSources 1 From c5e0c996fde01d13069624cb1ba4670861d59297 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Thu, 14 Dec 2023 10:48:43 -0700 Subject: [PATCH 19/23] Check validity. --- src/HPWH.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/HPWH.cc b/src/HPWH.cc index da2666f7..cf751611 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -3364,6 +3364,14 @@ int HPWH::checkInputs() { returnVal = HPWH_ABORT; } + // Check single-node heat-exchange effectiveness validity + if( heatExchangerEffectiveness > 1.) { + if(hpwhVerbosity >= VRB_reluctant) { + msg("Heat-exchanger effectiveness cannot exceed 1.\n"); + } + returnVal = HPWH_ABORT; + } + //if there's no failures, return 0 return returnVal; } From e3f4a7cf6d1aa005ff5e1fad2b1dede5965a20c5 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Thu, 14 Dec 2023 14:57:19 -0700 Subject: [PATCH 20/23] Add 2nd third function. --- src/HPWH.cc | 8 +++++++- src/HPWH.hh | 1 + src/HPWHpresets.cc | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/HPWH.cc b/src/HPWH.cc index cf751611..a8c9b233 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -944,7 +944,7 @@ int HPWH::WriteCSVHeading(FILE* outFILE,const char* preamble,int nTCouples,int o fprintf(outFILE,",tcouple%d (%s)",iTC + 1,doIP ? "F" : "C"); } - fprintf(outFILE,", toutlet (%s)",doIP ? "F" : "C"); + fprintf(outFILE,",toutlet (%s)",doIP ? "F" : "C"); fprintf(outFILE,"\n"); @@ -1760,6 +1760,12 @@ std::shared_ptr HPWH::topThird_absolute(double deci return std::make_shared("top third absolute",nodeWeights,decisionPoint,this,true); } +std::shared_ptr HPWH::secondThird(double decisionPoint,const UNITS units /* = UNITS_C */, const bool absolute /* = false */) { + std::vector nodeWeights = getNodeWeightRange(1./3., 2./3.); + double decisionPoint_C = makeC(decisionPoint,units,absolute); + return std::make_shared("second third",nodeWeights,decisionPoint_C,this,absolute); +} + std::shared_ptr HPWH::bottomThird(double decisionPoint) { std::vector nodeWeights = getNodeWeightRange(0., 1./3.); return std::make_shared("bottom third",nodeWeights,decisionPoint,this); diff --git a/src/HPWH.hh b/src/HPWH.hh index 29851605..4bdfa08c 100644 --- a/src/HPWH.hh +++ b/src/HPWH.hh @@ -377,6 +377,7 @@ public: std::shared_ptr wholeTank(double decisionPoint,const UNITS units = UNITS_C, const bool absolute = false); std::shared_ptr topThird(double decisionPoint); std::shared_ptr topThird_absolute(double decisionPoint); + std::shared_ptr secondThird(double decisionPoint,const UNITS units = UNITS_C, const bool absolute = false); std::shared_ptr bottomThird(double decisionPoint); std::shared_ptr bottomHalf(double decisionPoint) ; std::shared_ptr bottomTwelfth(double decisionPoint); diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index c3d68c39..5b173af6 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3828,7 +3828,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { // heat exchangers only hasHeatExchanger = true; - heatExchangerEffectiveness = 0.93; + heatExchangerEffectiveness = 0.95; HeatSource compressor(this); From 2e25a7141f5b7c6badb762eab59893d901fb8f11 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Fri, 15 Dec 2023 13:07:22 -0700 Subject: [PATCH 21/23] Review comments; remove outletT space. --- src/HPWH.cc | 13 ++----------- src/HPWH.hh | 5 +++-- src/HPWHpresets.cc | 2 +- test/ref/test30_File_AOSmithHPTS50.csv | 2 +- test/ref/test30_File_AOSmithHPTU80.csv | 2 +- test/ref/test30_File_AOSmithPHPT60.csv | 2 +- test/ref/test30_File_GE502014.csv | 2 +- test/ref/test30_File_Rheem2020Build50.csv | 2 +- test/ref/test30_File_Rheem2020Prem40.csv | 2 +- test/ref/test30_File_Rheem2020Prem50.csv | 2 +- test/ref/test30_File_RheemHB50.csv | 2 +- test/ref/test30_File_Sanden80.csv | 2 +- test/ref/test30_File_Stiebel220e.csv | 2 +- test/ref/test30_Preset_AOSmithHPTS50.csv | 2 +- test/ref/test30_Preset_AOSmithHPTU80.csv | 2 +- test/ref/test30_Preset_AOSmithPHPT60.csv | 2 +- test/ref/test30_Preset_GE502014.csv | 2 +- test/ref/test30_Preset_Rheem2020Build50.csv | 2 +- test/ref/test30_Preset_Rheem2020Prem40.csv | 2 +- test/ref/test30_Preset_Rheem2020Prem50.csv | 2 +- test/ref/test30_Preset_RheemHB50.csv | 2 +- test/ref/test30_Preset_Sanden80.csv | 2 +- test/ref/test30_Preset_Stiebel220e.csv | 2 +- test/ref/test50_File_AOSmithHPTS50.csv | 2 +- test/ref/test50_File_AOSmithHPTU80.csv | 2 +- test/ref/test50_File_AOSmithPHPT60.csv | 2 +- test/ref/test50_File_GE502014.csv | 2 +- test/ref/test50_File_Rheem2020Build50.csv | 2 +- test/ref/test50_File_Rheem2020Prem40.csv | 2 +- test/ref/test50_File_Rheem2020Prem50.csv | 2 +- test/ref/test50_File_RheemHB50.csv | 2 +- test/ref/test50_File_Sanden80.csv | 2 +- test/ref/test50_File_Stiebel220e.csv | 2 +- test/ref/test50_Preset_AOSmithHPTS50.csv | 2 +- test/ref/test50_Preset_AOSmithHPTU80.csv | 2 +- test/ref/test50_Preset_AOSmithPHPT60.csv | 2 +- test/ref/test50_Preset_GE502014.csv | 2 +- test/ref/test50_Preset_Rheem2020Build50.csv | 2 +- test/ref/test50_Preset_Rheem2020Prem40.csv | 2 +- test/ref/test50_Preset_Rheem2020Prem50.csv | 2 +- test/ref/test50_Preset_RheemHB50.csv | 2 +- test/ref/test50_Preset_Sanden80.csv | 2 +- test/ref/test50_Preset_Stiebel220e.csv | 2 +- test/ref/test70_File_AOSmithHPTS50.csv | 2 +- test/ref/test70_File_AOSmithHPTU80.csv | 2 +- test/ref/test70_File_AOSmithPHPT60.csv | 2 +- test/ref/test70_File_GE502014.csv | 2 +- test/ref/test70_File_Rheem2020Build50.csv | 2 +- test/ref/test70_File_Rheem2020Prem40.csv | 2 +- test/ref/test70_File_Rheem2020Prem50.csv | 2 +- test/ref/test70_File_RheemHB50.csv | 2 +- test/ref/test70_File_Sanden80.csv | 2 +- test/ref/test70_File_Stiebel220e.csv | 2 +- test/ref/test70_Preset_AOSmithHPTS50.csv | 2 +- test/ref/test70_Preset_AOSmithHPTU80.csv | 2 +- test/ref/test70_Preset_AOSmithPHPT60.csv | 2 +- test/ref/test70_Preset_GE502014.csv | 2 +- test/ref/test70_Preset_Rheem2020Build50.csv | 2 +- test/ref/test70_Preset_Rheem2020Prem40.csv | 2 +- test/ref/test70_Preset_Rheem2020Prem50.csv | 2 +- test/ref/test70_Preset_RheemHB50.csv | 2 +- test/ref/test70_Preset_Sanden80.csv | 2 +- test/ref/test70_Preset_Stiebel220e.csv | 2 +- test/ref/test95_File_AOSmithHPTS50.csv | 2 +- test/ref/test95_File_AOSmithHPTU80.csv | 2 +- test/ref/test95_File_AOSmithPHPT60.csv | 2 +- test/ref/test95_File_GE502014.csv | 2 +- test/ref/test95_File_Rheem2020Build50.csv | 2 +- test/ref/test95_File_Rheem2020Prem40.csv | 2 +- test/ref/test95_File_Rheem2020Prem50.csv | 2 +- test/ref/test95_File_RheemHB50.csv | 2 +- test/ref/test95_File_Sanden80.csv | 2 +- test/ref/test95_File_Stiebel220e.csv | 2 +- test/ref/test95_Preset_AOSmithHPTS50.csv | 2 +- test/ref/test95_Preset_AOSmithHPTU80.csv | 2 +- test/ref/test95_Preset_AOSmithPHPT60.csv | 2 +- test/ref/test95_Preset_GE502014.csv | 2 +- test/ref/test95_Preset_Rheem2020Build50.csv | 2 +- test/ref/test95_Preset_Rheem2020Prem40.csv | 2 +- test/ref/test95_Preset_Rheem2020Prem50.csv | 2 +- test/ref/test95_Preset_RheemHB50.csv | 2 +- test/ref/test95_Preset_Sanden80.csv | 2 +- test/ref/test95_Preset_Stiebel220e.csv | 2 +- test/ref/testDR_TOTLOR_File_AOSmithHPTS50.csv | 2 +- test/ref/testDR_TOTLOR_File_AOSmithHPTU80.csv | 2 +- test/ref/testDR_TOTLOR_File_AOSmithPHPT60.csv | 2 +- test/ref/testDR_TOTLOR_File_GE502014.csv | 2 +- test/ref/testDR_TOTLOR_File_Rheem2020Build50.csv | 2 +- test/ref/testDR_TOTLOR_File_Rheem2020Prem40.csv | 2 +- test/ref/testDR_TOTLOR_File_Rheem2020Prem50.csv | 2 +- test/ref/testDR_TOTLOR_File_RheemHB50.csv | 2 +- test/ref/testDR_TOTLOR_File_Sanden80.csv | 2 +- test/ref/testDR_TOTLOR_File_Stiebel220e.csv | 2 +- test/ref/testDR_TOTLOR_Preset_AOSmithHPTS50.csv | 2 +- test/ref/testDR_TOTLOR_Preset_AOSmithHPTU80.csv | 2 +- test/ref/testDR_TOTLOR_Preset_AOSmithPHPT60.csv | 2 +- test/ref/testDR_TOTLOR_Preset_GE502014.csv | 2 +- test/ref/testDR_TOTLOR_Preset_Rheem2020Build50.csv | 2 +- test/ref/testDR_TOTLOR_Preset_Rheem2020Prem40.csv | 2 +- test/ref/testDR_TOTLOR_Preset_Rheem2020Prem50.csv | 2 +- test/ref/testDR_TOTLOR_Preset_RheemHB50.csv | 2 +- test/ref/testDR_TOTLOR_Preset_Sanden80.csv | 2 +- test/ref/testDR_TOTLOR_Preset_Stiebel220e.csv | 2 +- test/ref/testDr_LO_File_AOSmithHPTS50.csv | 2 +- test/ref/testDr_LO_File_AOSmithHPTU80.csv | 2 +- test/ref/testDr_LO_File_AOSmithPHPT60.csv | 2 +- test/ref/testDr_LO_File_GE502014.csv | 2 +- test/ref/testDr_LO_File_Rheem2020Build50.csv | 2 +- test/ref/testDr_LO_File_Rheem2020Prem40.csv | 2 +- test/ref/testDr_LO_File_Rheem2020Prem50.csv | 2 +- test/ref/testDr_LO_File_RheemHB50.csv | 2 +- test/ref/testDr_LO_File_Sanden80.csv | 2 +- test/ref/testDr_LO_File_Stiebel220e.csv | 2 +- test/ref/testDr_LO_Preset_AOSmithHPTS50.csv | 2 +- test/ref/testDr_LO_Preset_AOSmithHPTU80.csv | 2 +- test/ref/testDr_LO_Preset_AOSmithPHPT60.csv | 2 +- test/ref/testDr_LO_Preset_GE502014.csv | 2 +- test/ref/testDr_LO_Preset_Rheem2020Build50.csv | 2 +- test/ref/testDr_LO_Preset_Rheem2020Prem40.csv | 2 +- test/ref/testDr_LO_Preset_Rheem2020Prem50.csv | 2 +- test/ref/testDr_LO_Preset_RheemHB50.csv | 2 +- test/ref/testDr_LO_Preset_Sanden80.csv | 2 +- test/ref/testDr_LO_Preset_Stiebel220e.csv | 2 +- test/ref/testDr_TOO2_File_AOSmithHPTS50.csv | 2 +- test/ref/testDr_TOO2_File_AOSmithHPTU80.csv | 2 +- test/ref/testDr_TOO2_File_AOSmithPHPT60.csv | 2 +- test/ref/testDr_TOO2_File_GE502014.csv | 2 +- test/ref/testDr_TOO2_File_Rheem2020Build50.csv | 2 +- test/ref/testDr_TOO2_File_Rheem2020Prem40.csv | 2 +- test/ref/testDr_TOO2_File_Rheem2020Prem50.csv | 2 +- test/ref/testDr_TOO2_File_RheemHB50.csv | 2 +- test/ref/testDr_TOO2_File_Sanden80.csv | 2 +- test/ref/testDr_TOO2_File_Stiebel220e.csv | 2 +- test/ref/testDr_TOO2_Preset_AOSmithHPTS50.csv | 2 +- test/ref/testDr_TOO2_Preset_AOSmithHPTU80.csv | 2 +- test/ref/testDr_TOO2_Preset_AOSmithPHPT60.csv | 2 +- test/ref/testDr_TOO2_Preset_GE502014.csv | 2 +- test/ref/testDr_TOO2_Preset_Rheem2020Build50.csv | 2 +- test/ref/testDr_TOO2_Preset_Rheem2020Prem40.csv | 2 +- test/ref/testDr_TOO2_Preset_Rheem2020Prem50.csv | 2 +- test/ref/testDr_TOO2_Preset_RheemHB50.csv | 2 +- test/ref/testDr_TOO2_Preset_Sanden80.csv | 2 +- test/ref/testDr_TOO2_Preset_Stiebel220e.csv | 2 +- test/ref/testDr_TOO_File_AOSmithHPTS50.csv | 2 +- test/ref/testDr_TOO_File_AOSmithHPTU80.csv | 2 +- test/ref/testDr_TOO_File_AOSmithPHPT60.csv | 2 +- test/ref/testDr_TOO_File_GE502014.csv | 2 +- test/ref/testDr_TOO_File_Rheem2020Build50.csv | 2 +- test/ref/testDr_TOO_File_Rheem2020Prem40.csv | 2 +- test/ref/testDr_TOO_File_Rheem2020Prem50.csv | 2 +- test/ref/testDr_TOO_File_RheemHB50.csv | 2 +- test/ref/testDr_TOO_File_Sanden80.csv | 2 +- test/ref/testDr_TOO_File_Stiebel220e.csv | 2 +- test/ref/testDr_TOO_Preset_AOSmithHPTS50.csv | 2 +- test/ref/testDr_TOO_Preset_AOSmithHPTU80.csv | 2 +- test/ref/testDr_TOO_Preset_AOSmithPHPT60.csv | 2 +- test/ref/testDr_TOO_Preset_GE502014.csv | 2 +- test/ref/testDr_TOO_Preset_Rheem2020Build50.csv | 2 +- test/ref/testDr_TOO_Preset_Rheem2020Prem40.csv | 2 +- test/ref/testDr_TOO_Preset_Rheem2020Prem50.csv | 2 +- test/ref/testDr_TOO_Preset_RheemHB50.csv | 2 +- test/ref/testDr_TOO_Preset_Sanden80.csv | 2 +- test/ref/testDr_TOO_Preset_Stiebel220e.csv | 2 +- test/ref/testDr_TOT_File_AOSmithHPTS50.csv | 2 +- test/ref/testDr_TOT_File_AOSmithHPTU80.csv | 2 +- test/ref/testDr_TOT_File_AOSmithPHPT60.csv | 2 +- test/ref/testDr_TOT_File_GE502014.csv | 2 +- test/ref/testDr_TOT_File_Rheem2020Build50.csv | 2 +- test/ref/testDr_TOT_File_Rheem2020Prem40.csv | 2 +- test/ref/testDr_TOT_File_Rheem2020Prem50.csv | 2 +- test/ref/testDr_TOT_File_RheemHB50.csv | 2 +- test/ref/testDr_TOT_File_Sanden80.csv | 2 +- test/ref/testDr_TOT_File_Stiebel220e.csv | 2 +- test/ref/testDr_TOT_Preset_AOSmithHPTS50.csv | 2 +- test/ref/testDr_TOT_Preset_AOSmithHPTU80.csv | 2 +- test/ref/testDr_TOT_Preset_AOSmithPHPT60.csv | 2 +- test/ref/testDr_TOT_Preset_GE502014.csv | 2 +- test/ref/testDr_TOT_Preset_Rheem2020Build50.csv | 2 +- test/ref/testDr_TOT_Preset_Rheem2020Prem40.csv | 2 +- test/ref/testDr_TOT_Preset_Rheem2020Prem50.csv | 2 +- test/ref/testDr_TOT_Preset_RheemHB50.csv | 2 +- test/ref/testDr_TOT_Preset_Sanden80.csv | 2 +- test/ref/testDr_TOT_Preset_Stiebel220e.csv | 2 +- test/ref/testLargeComp45_Preset_AOSmithCAHP120.csv | 2 +- test/ref/testLargeComp45_Preset_ColmacCxA_10_SP.csv | 2 +- test/ref/testLargeComp45_Preset_ColmacCxA_15_SP.csv | 2 +- test/ref/testLargeComp45_Preset_ColmacCxA_20_MP.csv | 2 +- test/ref/testLargeComp45_Preset_ColmacCxA_20_SP.csv | 2 +- test/ref/testLargeComp45_Preset_ColmacCxA_25_SP.csv | 2 +- test/ref/testLargeComp45_Preset_ColmacCxA_30_SP.csv | 2 +- test/ref/testLargeComp45_Preset_ColmacCxV_5_MP.csv | 2 +- test/ref/testLargeComp45_Preset_ColmacCxV_5_SP.csv | 2 +- test/ref/testLargeComp45_Preset_NyleC185A_C_SP.csv | 2 +- test/ref/testLargeComp45_Preset_NyleC185A_SP.csv | 2 +- test/ref/testLargeComp45_Preset_NyleC250A_C_MP.csv | 2 +- test/ref/testLargeComp45_Preset_NyleC250A_C_SP.csv | 2 +- test/ref/testLargeComp45_Preset_NyleC250A_MP.csv | 2 +- test/ref/testLargeComp45_Preset_NyleC250A_SP.csv | 2 +- test/ref/testLargeComp45_Preset_NyleC25A_SP.csv | 2 +- test/ref/testLargeComp45_Preset_NyleC90A_C_MP.csv | 2 +- test/ref/testLargeComp45_Preset_NyleC90A_C_SP.csv | 2 +- test/ref/testLargeComp45_Preset_NyleC90A_MP.csv | 2 +- test/ref/testLargeComp45_Preset_NyleC90A_SP.csv | 2 +- .../testLargeComp45_Preset_QAHV_N136TAU_HPB_SP.csv | 2 +- test/ref/testLargeComp45_Preset_RheemHPHD135.csv | 2 +- test/ref/testLargeComp45_Preset_RheemHPHD60.csv | 2 +- .../testLargeComp45_Preset_TamScalable_SP_Half.csv | 2 +- test/ref/testLargeComp60_Preset_AOSmithCAHP120.csv | 2 +- test/ref/testLargeComp60_Preset_ColmacCxA_10_SP.csv | 2 +- test/ref/testLargeComp60_Preset_ColmacCxA_15_SP.csv | 2 +- test/ref/testLargeComp60_Preset_ColmacCxA_20_MP.csv | 2 +- test/ref/testLargeComp60_Preset_ColmacCxA_20_SP.csv | 2 +- test/ref/testLargeComp60_Preset_ColmacCxA_25_SP.csv | 2 +- test/ref/testLargeComp60_Preset_ColmacCxA_30_SP.csv | 2 +- test/ref/testLargeComp60_Preset_ColmacCxV_5_MP.csv | 2 +- test/ref/testLargeComp60_Preset_ColmacCxV_5_SP.csv | 2 +- test/ref/testLargeComp60_Preset_NyleC185A_C_SP.csv | 2 +- test/ref/testLargeComp60_Preset_NyleC185A_SP.csv | 2 +- test/ref/testLargeComp60_Preset_NyleC250A_C_MP.csv | 2 +- test/ref/testLargeComp60_Preset_NyleC250A_C_SP.csv | 2 +- test/ref/testLargeComp60_Preset_NyleC250A_MP.csv | 2 +- test/ref/testLargeComp60_Preset_NyleC250A_SP.csv | 2 +- test/ref/testLargeComp60_Preset_NyleC25A_SP.csv | 2 +- test/ref/testLargeComp60_Preset_NyleC90A_C_MP.csv | 2 +- test/ref/testLargeComp60_Preset_NyleC90A_C_SP.csv | 2 +- test/ref/testLargeComp60_Preset_NyleC90A_MP.csv | 2 +- test/ref/testLargeComp60_Preset_NyleC90A_SP.csv | 2 +- .../testLargeComp60_Preset_QAHV_N136TAU_HPB_SP.csv | 2 +- test/ref/testLargeComp60_Preset_RheemHPHD135.csv | 2 +- test/ref/testLargeComp60_Preset_RheemHPHD60.csv | 2 +- .../testLargeComp60_Preset_TamScalable_SP_Half.csv | 2 +- test/ref/testLargeCompHot_Preset_AOSmithCAHP120.csv | 2 +- .../ref/testLargeCompHot_Preset_ColmacCxA_10_SP.csv | 2 +- .../ref/testLargeCompHot_Preset_ColmacCxA_15_SP.csv | 2 +- .../ref/testLargeCompHot_Preset_ColmacCxA_20_MP.csv | 2 +- .../ref/testLargeCompHot_Preset_ColmacCxA_20_SP.csv | 2 +- .../ref/testLargeCompHot_Preset_ColmacCxA_25_SP.csv | 2 +- .../ref/testLargeCompHot_Preset_ColmacCxA_30_SP.csv | 2 +- test/ref/testLargeCompHot_Preset_ColmacCxV_5_MP.csv | 2 +- test/ref/testLargeCompHot_Preset_ColmacCxV_5_SP.csv | 2 +- test/ref/testLargeCompHot_Preset_NyleC185A_C_SP.csv | 2 +- test/ref/testLargeCompHot_Preset_NyleC185A_SP.csv | 2 +- test/ref/testLargeCompHot_Preset_NyleC250A_C_MP.csv | 2 +- test/ref/testLargeCompHot_Preset_NyleC250A_C_SP.csv | 2 +- test/ref/testLargeCompHot_Preset_NyleC250A_MP.csv | 2 +- test/ref/testLargeCompHot_Preset_NyleC250A_SP.csv | 2 +- test/ref/testLargeCompHot_Preset_NyleC25A_SP.csv | 2 +- test/ref/testLargeCompHot_Preset_NyleC90A_C_MP.csv | 2 +- test/ref/testLargeCompHot_Preset_NyleC90A_C_SP.csv | 2 +- test/ref/testLargeCompHot_Preset_NyleC90A_MP.csv | 2 +- test/ref/testLargeCompHot_Preset_NyleC90A_SP.csv | 2 +- .../testLargeCompHot_Preset_QAHV_N136TAU_HPB_SP.csv | 2 +- test/ref/testLargeCompHot_Preset_RheemHPHD135.csv | 2 +- test/ref/testLargeCompHot_Preset_RheemHPHD60.csv | 2 +- .../testLargeCompHot_Preset_TamScalable_SP_Half.csv | 2 +- test/ref/testLockout_File_AOSmithHPTU80.csv | 2 +- test/ref/testLockout_File_AOSmithPHPT60.csv | 2 +- test/ref/testLockout_File_GE502014.csv | 2 +- test/ref/testLockout_File_RheemHB50.csv | 2 +- test/ref/testLockout_File_Stiebel220e.csv | 2 +- test/ref/testLockout_Preset_AOSmithHPTU80.csv | 2 +- test/ref/testLockout_Preset_AOSmithPHPT60.csv | 2 +- test/ref/testLockout_Preset_GE502014.csv | 2 +- test/ref/testLockout_Preset_RheemHB50.csv | 2 +- test/ref/testLockout_Preset_Stiebel220e.csv | 2 +- .../testREGoesTo93CCold_Preset_AOSmithCAHP120.csv | 2 +- .../testREGoesTo93CCold_Preset_AOSmithHPTU80.csv | 2 +- test/ref/testREGoesTo93CCold_Preset_GE502014.csv | 2 +- .../testREGoesTo93CCold_Preset_Rheem2020Build50.csv | 2 +- test/ref/testREGoesTo93CCold_Preset_RheemHB50.csv | 2 +- test/ref/testREGoesTo93CCold_Preset_Stiebel220e.csv | 2 +- .../testREGoesTo93CCold_Preset_TamScalable_SP.csv | 2 +- test/ref/testREGoesTo93C_Preset_AOSmithCAHP120.csv | 2 +- test/ref/testREGoesTo93C_Preset_AOSmithHPTU80.csv | 2 +- test/ref/testREGoesTo93C_Preset_GE502014.csv | 2 +- .../ref/testREGoesTo93C_Preset_Rheem2020Build50.csv | 2 +- test/ref/testREGoesTo93C_Preset_RheemHB50.csv | 2 +- test/ref/testREGoesTo93C_Preset_Stiebel220e.csv | 2 +- test/ref/testREGoesTo93C_Preset_TamScalable_SP.csv | 2 +- test/ref/testSandenCombi_File_AOSmithHPTS50.csv | 2 +- test/ref/testSandenCombi_File_AOSmithHPTU80.csv | 2 +- test/ref/testSandenCombi_File_AOSmithPHPT60.csv | 2 +- test/ref/testSandenCombi_File_GE502014.csv | 2 +- test/ref/testSandenCombi_File_Rheem2020Build50.csv | 2 +- test/ref/testSandenCombi_File_Rheem2020Prem40.csv | 2 +- test/ref/testSandenCombi_File_Rheem2020Prem50.csv | 2 +- test/ref/testSandenCombi_File_RheemHB50.csv | 2 +- test/ref/testSandenCombi_File_Sanden80.csv | 2 +- test/ref/testSandenCombi_File_Stiebel220e.csv | 2 +- test/ref/testSandenCombi_Preset_AOSmithHPTS50.csv | 2 +- test/ref/testSandenCombi_Preset_AOSmithHPTU80.csv | 2 +- test/ref/testSandenCombi_Preset_AOSmithPHPT60.csv | 2 +- test/ref/testSandenCombi_Preset_GE502014.csv | 2 +- .../ref/testSandenCombi_Preset_Rheem2020Build50.csv | 2 +- test/ref/testSandenCombi_Preset_Rheem2020Prem40.csv | 2 +- test/ref/testSandenCombi_Preset_Rheem2020Prem50.csv | 2 +- test/ref/testSandenCombi_Preset_RheemHB50.csv | 2 +- test/ref/testSandenCombi_Preset_Sanden80.csv | 2 +- test/ref/testSandenCombi_Preset_Stiebel220e.csv | 2 +- test/ref/testSoC70_Preset_NyleC25A_SP.csv | 2 +- test/ref/testSoC70_Preset_Sanden120.csv | 2 +- .../testSoCHighEnteringWater_Preset_NyleC25A_SP.csv | 2 +- .../testSoCHighEnteringWater_Preset_Sanden120.csv | 2 +- test/ref/testSoCLockout_Preset_NyleC25A_SP.csv | 2 +- test/ref/testSoCLockout_Preset_Sanden120.csv | 2 +- .../testSoCSetpointChange_Preset_NyleC25A_SP.csv | 2 +- test/ref/testSoCSetpointChange_Preset_Sanden120.csv | 2 +- 307 files changed, 310 insertions(+), 318 deletions(-) diff --git a/src/HPWH.cc b/src/HPWH.cc index a8c9b233..ed79317a 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -63,10 +63,6 @@ const double HPWH::MAXOUTLET_R410A = F_TO_C(140.); const double HPWH::MAXOUTLET_R744 = F_TO_C(190.); const double HPWH::MINSINGLEPASSLIFT = dF_TO_dC(15.); -double makeC(const double T_F_or_C,const HPWH::UNITS units,const bool absolute){ - return (units == HPWH::UNITS_C) ? T_F_or_C : (absolute ? F_TO_C(T_F_or_C) : dF_TO_dC(T_F_or_C)); -} - //----------------------------------------------------------------------------- /// @brief Samples a std::vector to extract a single value spanning the fractional /// coordinate range from frac_begin to frac_end. @@ -1746,7 +1742,7 @@ std::vector HPWH::getNodeWeightRange(double bottomFraction, do std::shared_ptr HPWH::wholeTank(double decisionPoint,const UNITS units /* = UNITS_C */, const bool absolute /* = false */) { std::vector nodeWeights = getNodeWeightRange(0., 1.); - double decisionPoint_C = makeC(decisionPoint,units,absolute); + double decisionPoint_C = convertTempToC(decisionPoint,units,absolute); return std::make_shared("whole tank",nodeWeights,decisionPoint_C,this,absolute); } @@ -1762,7 +1758,7 @@ std::shared_ptr HPWH::topThird_absolute(double deci std::shared_ptr HPWH::secondThird(double decisionPoint,const UNITS units /* = UNITS_C */, const bool absolute /* = false */) { std::vector nodeWeights = getNodeWeightRange(1./3., 2./3.); - double decisionPoint_C = makeC(decisionPoint,units,absolute); + double decisionPoint_C = convertTempToC(decisionPoint,units,absolute); return std::make_shared("second third",nodeWeights,decisionPoint_C,this,absolute); } @@ -1816,11 +1812,6 @@ std::shared_ptr HPWH::bottomTwelfth(double decision return std::make_shared("bottom twelfth",nodeWeights,decisionPoint,this); } -std::shared_ptr HPWH::bottomTwelfth_absolute(double decisionPoint) { - std::vector nodeWeights = getNodeWeightRange(0., 1./12.); - return std::make_shared("bottom twelfth",nodeWeights,decisionPoint,this,true); -} - std::shared_ptr HPWH::standby(double decisionPoint) { std::vector nodeWeights; nodeWeights.emplace_back(LOGIC_NODE_SIZE + 1); // uses very top computation node diff --git a/src/HPWH.hh b/src/HPWH.hh index 4bdfa08c..48ae88af 100644 --- a/src/HPWH.hh +++ b/src/HPWH.hh @@ -381,7 +381,6 @@ public: std::shared_ptr bottomThird(double decisionPoint); std::shared_ptr bottomHalf(double decisionPoint) ; std::shared_ptr bottomTwelfth(double decisionPoint); - std::shared_ptr bottomTwelfth_absolute(double decisionPoint); std::shared_ptr bottomSixth(double decisionPoint); std::shared_ptr bottomSixth_absolute(double decisionPoint); std::shared_ptr secondSixth(double decisionPoint); @@ -1365,7 +1364,9 @@ inline HPWH::DRMODES operator|(HPWH::DRMODES a,HPWH::DRMODES b) template< typename T> inline bool aboutEqual(T a,T b) { return fabs(a - b) < HPWH::TOL_MINVALUE; } /// Generate an absolute or relative temperature in degC. -double makeC(const double T_F_or_C,const HPWH::UNITS units,const bool absolute); +inline double convertTempToC(const double T_F_or_C,const HPWH::UNITS units,const bool absolute){ + return (units == HPWH::UNITS_C) ? T_F_or_C : (absolute ? F_TO_C(T_F_or_C) : dF_TO_dC(T_F_or_C)); +} // resampling utility functions double getResampledValue(const std::vector &values,double beginFraction,double endFraction); diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 5b173af6..c3d68c39 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3828,7 +3828,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { // heat exchangers only hasHeatExchanger = true; - heatExchangerEffectiveness = 0.95; + heatExchangerEffectiveness = 0.93; HeatSource compressor(this); diff --git a/test/ref/test30_File_AOSmithHPTS50.csv b/test/ref/test30_File_AOSmithHPTS50.csv index de0dbf6d..3571b5a3 100644 --- a/test/ref/test30_File_AOSmithHPTS50.csv +++ b/test/ref/test30_File_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.46,50.88,52.98,52.99,52.99,52.99,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.81,47.45,52.42,52.98,52.98,52.98,52.99 diff --git a/test/ref/test30_File_AOSmithHPTU80.csv b/test/ref/test30_File_AOSmithHPTU80.csv index 8a83e7b7..10751245 100644 --- a/test/ref/test30_File_AOSmithHPTU80.csv +++ b/test/ref/test30_File_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.92,51.78,52.99,52.99,52.99,52.99,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.81,49.78,52.79,52.98,52.98,52.98,52.99 diff --git a/test/ref/test30_File_AOSmithPHPT60.csv b/test/ref/test30_File_AOSmithPHPT60.csv index 4cc036ff..e9e495ab 100644 --- a/test/ref/test30_File_AOSmithPHPT60.csv +++ b/test/ref/test30_File_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.30,52.99,52.99,52.99,52.99,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.57,48.55,52.62,52.98,52.98,52.98,52.99 diff --git a/test/ref/test30_File_GE502014.csv b/test/ref/test30_File_GE502014.csv index 280bb400..7664971a 100644 --- a/test/ref/test30_File_GE502014.csv +++ b/test/ref/test30_File_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.32,50.85,52.98,52.98,52.98,52.98,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.56,47.38,52.40,52.98,52.98,52.98,52.98 diff --git a/test/ref/test30_File_Rheem2020Build50.csv b/test/ref/test30_File_Rheem2020Build50.csv index bfe7d085..5cd0a3a7 100644 --- a/test/ref/test30_File_Rheem2020Build50.csv +++ b/test/ref/test30_File_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.33,50.86,52.98,52.98,52.98,52.98,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.59,47.38,52.40,52.97,52.97,52.97,52.98 diff --git a/test/ref/test30_File_Rheem2020Prem40.csv b/test/ref/test30_File_Rheem2020Prem40.csv index 6420c816..cc19a29b 100644 --- a/test/ref/test30_File_Rheem2020Prem40.csv +++ b/test/ref/test30_File_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,39.67,50.32,52.97,52.97,52.97,52.97,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,28.91,46.00,52.07,52.96,52.96,52.96,52.97 diff --git a/test/ref/test30_File_Rheem2020Prem50.csv b/test/ref/test30_File_Rheem2020Prem50.csv index bfe7d085..5cd0a3a7 100644 --- a/test/ref/test30_File_Rheem2020Prem50.csv +++ b/test/ref/test30_File_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.33,50.86,52.98,52.98,52.98,52.98,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.59,47.38,52.40,52.97,52.97,52.97,52.98 diff --git a/test/ref/test30_File_RheemHB50.csv b/test/ref/test30_File_RheemHB50.csv index 8d9a55b0..1617f911 100644 --- a/test/ref/test30_File_RheemHB50.csv +++ b/test/ref/test30_File_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.31,50.85,52.98,52.98,52.98,52.98,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.56,47.38,52.40,52.97,52.97,52.97,52.98 diff --git a/test/ref/test30_File_Sanden80.csv b/test/ref/test30_File_Sanden80.csv index 941f1cca..de0584f3 100644 --- a/test/ref/test30_File_Sanden80.csv +++ b/test/ref/test30_File_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 65.000000, 5.000000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 0.000000, 65.000000, 5.000000, 2.000000, 0,0.00,0.00,56.34,64.99,64.99,64.99,64.99,64.99,64.99 2, 0.000000, 65.000000, 5.000000, 2.000000, 0,0.00,0.00,47.68,64.98,64.98,64.98,64.98,64.98,64.99 diff --git a/test/ref/test30_File_Stiebel220e.csv b/test/ref/test30_File_Stiebel220e.csv index 3bfeea78..b29423a9 100644 --- a/test/ref/test30_File_Stiebel220e.csv +++ b/test/ref/test30_File_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,42.69,52.98,52.98,52.98,52.98,52.98,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,32.42,52.96,52.97,52.97,52.97,52.97,52.98 diff --git a/test/ref/test30_Preset_AOSmithHPTS50.csv b/test/ref/test30_Preset_AOSmithHPTS50.csv index de0dbf6d..3571b5a3 100644 --- a/test/ref/test30_Preset_AOSmithHPTS50.csv +++ b/test/ref/test30_Preset_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.46,50.88,52.98,52.99,52.99,52.99,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.81,47.45,52.42,52.98,52.98,52.98,52.99 diff --git a/test/ref/test30_Preset_AOSmithHPTU80.csv b/test/ref/test30_Preset_AOSmithHPTU80.csv index 8a83e7b7..10751245 100644 --- a/test/ref/test30_Preset_AOSmithHPTU80.csv +++ b/test/ref/test30_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.92,51.78,52.99,52.99,52.99,52.99,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.81,49.78,52.79,52.98,52.98,52.98,52.99 diff --git a/test/ref/test30_Preset_AOSmithPHPT60.csv b/test/ref/test30_Preset_AOSmithPHPT60.csv index 4cc036ff..e9e495ab 100644 --- a/test/ref/test30_Preset_AOSmithPHPT60.csv +++ b/test/ref/test30_Preset_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.30,52.99,52.99,52.99,52.99,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.57,48.55,52.62,52.98,52.98,52.98,52.99 diff --git a/test/ref/test30_Preset_GE502014.csv b/test/ref/test30_Preset_GE502014.csv index 280bb400..7664971a 100644 --- a/test/ref/test30_Preset_GE502014.csv +++ b/test/ref/test30_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.32,50.85,52.98,52.98,52.98,52.98,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.56,47.38,52.40,52.98,52.98,52.98,52.98 diff --git a/test/ref/test30_Preset_Rheem2020Build50.csv b/test/ref/test30_Preset_Rheem2020Build50.csv index bfe7d085..5cd0a3a7 100644 --- a/test/ref/test30_Preset_Rheem2020Build50.csv +++ b/test/ref/test30_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.33,50.86,52.98,52.98,52.98,52.98,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.59,47.38,52.40,52.97,52.97,52.97,52.98 diff --git a/test/ref/test30_Preset_Rheem2020Prem40.csv b/test/ref/test30_Preset_Rheem2020Prem40.csv index 6420c816..cc19a29b 100644 --- a/test/ref/test30_Preset_Rheem2020Prem40.csv +++ b/test/ref/test30_Preset_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,39.67,50.32,52.97,52.97,52.97,52.97,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,28.91,46.00,52.07,52.96,52.96,52.96,52.97 diff --git a/test/ref/test30_Preset_Rheem2020Prem50.csv b/test/ref/test30_Preset_Rheem2020Prem50.csv index bfe7d085..5cd0a3a7 100644 --- a/test/ref/test30_Preset_Rheem2020Prem50.csv +++ b/test/ref/test30_Preset_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.33,50.86,52.98,52.98,52.98,52.98,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.59,47.38,52.40,52.97,52.97,52.97,52.98 diff --git a/test/ref/test30_Preset_RheemHB50.csv b/test/ref/test30_Preset_RheemHB50.csv index 8d9a55b0..1617f911 100644 --- a/test/ref/test30_Preset_RheemHB50.csv +++ b/test/ref/test30_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.31,50.85,52.98,52.98,52.98,52.98,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.56,47.38,52.40,52.97,52.97,52.97,52.98 diff --git a/test/ref/test30_Preset_Sanden80.csv b/test/ref/test30_Preset_Sanden80.csv index 941f1cca..de0584f3 100644 --- a/test/ref/test30_Preset_Sanden80.csv +++ b/test/ref/test30_Preset_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 65.000000, 5.000000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 0.000000, 65.000000, 5.000000, 2.000000, 0,0.00,0.00,56.34,64.99,64.99,64.99,64.99,64.99,64.99 2, 0.000000, 65.000000, 5.000000, 2.000000, 0,0.00,0.00,47.68,64.98,64.98,64.98,64.98,64.98,64.99 diff --git a/test/ref/test30_Preset_Stiebel220e.csv b/test/ref/test30_Preset_Stiebel220e.csv index 3bfeea78..b29423a9 100644 --- a/test/ref/test30_Preset_Stiebel220e.csv +++ b/test/ref/test30_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,42.69,52.98,52.98,52.98,52.98,52.98,52.99 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,32.42,52.96,52.97,52.97,52.97,52.97,52.98 diff --git a/test/ref/test50_File_AOSmithHPTS50.csv b/test/ref/test50_File_AOSmithHPTS50.csv index a907d72d..68702833 100644 --- a/test/ref/test50_File_AOSmithHPTS50.csv +++ b/test/ref/test50_File_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.56,51.10,52.99,52.99,52.99,52.99,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.81,48.03,52.48,52.98,52.98,52.98,52.99 diff --git a/test/ref/test50_File_AOSmithHPTU80.csv b/test/ref/test50_File_AOSmithHPTU80.csv index 79cdce1e..2ef755ce 100644 --- a/test/ref/test50_File_AOSmithHPTU80.csv +++ b/test/ref/test50_File_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,47.55,51.91,52.99,52.99,52.99,52.99,53.00 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.98,50.12,52.82,52.99,52.99,52.99,52.99 diff --git a/test/ref/test50_File_AOSmithPHPT60.csv b/test/ref/test50_File_AOSmithPHPT60.csv index 570d96a6..54f4051a 100644 --- a/test/ref/test50_File_AOSmithPHPT60.csv +++ b/test/ref/test50_File_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,45.44,51.48,52.99,52.99,52.99,52.99,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,39.18,49.01,52.66,52.98,52.98,52.98,52.99 diff --git a/test/ref/test50_File_GE502014.csv b/test/ref/test50_File_GE502014.csv index bfcd88f6..15550471 100644 --- a/test/ref/test50_File_GE502014.csv +++ b/test/ref/test50_File_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.43,51.08,52.99,52.99,52.99,52.99,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.59,47.97,52.47,52.98,52.98,52.98,52.99 diff --git a/test/ref/test50_File_Rheem2020Build50.csv b/test/ref/test50_File_Rheem2020Build50.csv index 94c87ea3..cab57743 100644 --- a/test/ref/test50_File_Rheem2020Build50.csv +++ b/test/ref/test50_File_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.45,51.08,52.98,52.98,52.98,52.98,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.62,47.97,52.46,52.98,52.98,52.98,52.98 diff --git a/test/ref/test50_File_Rheem2020Prem40.csv b/test/ref/test50_File_Rheem2020Prem40.csv index 1eda62f4..208d3853 100644 --- a/test/ref/test50_File_Rheem2020Prem40.csv +++ b/test/ref/test50_File_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.07,50.60,52.98,52.98,52.98,52.98,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,31.42,46.73,52.17,52.97,52.97,52.97,52.98 diff --git a/test/ref/test50_File_Rheem2020Prem50.csv b/test/ref/test50_File_Rheem2020Prem50.csv index 78a0227a..65bcb9b0 100644 --- a/test/ref/test50_File_Rheem2020Prem50.csv +++ b/test/ref/test50_File_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.45,51.08,52.98,52.98,52.98,52.98,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.62,47.97,52.46,52.98,52.98,52.98,52.98 diff --git a/test/ref/test50_File_RheemHB50.csv b/test/ref/test50_File_RheemHB50.csv index 44d9d09c..0f584a6b 100644 --- a/test/ref/test50_File_RheemHB50.csv +++ b/test/ref/test50_File_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.43,51.08,52.98,52.99,52.99,52.99,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.58,47.96,52.47,52.98,52.98,52.98,52.99 diff --git a/test/ref/test50_File_Sanden80.csv b/test/ref/test50_File_Sanden80.csv index e009cd5f..8eb6dbe5 100644 --- a/test/ref/test50_File_Sanden80.csv +++ b/test/ref/test50_File_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 10.000000, 65.000000, 10.000000, 2.000000, 0,0.00,0.00,57.06,64.99,64.99,64.99,64.99,64.99,65.00 2, 10.000000, 65.000000, 10.000000, 2.000000, 0,0.00,0.00,49.13,64.99,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/test50_File_Stiebel220e.csv b/test/ref/test50_File_Stiebel220e.csv index 381f4432..d84b5d1f 100644 --- a/test/ref/test50_File_Stiebel220e.csv +++ b/test/ref/test50_File_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,43.77,52.99,52.99,52.99,52.99,52.99,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,34.57,52.96,52.98,52.98,52.98,52.98,52.99 diff --git a/test/ref/test50_Preset_AOSmithHPTS50.csv b/test/ref/test50_Preset_AOSmithHPTS50.csv index a907d72d..68702833 100644 --- a/test/ref/test50_Preset_AOSmithHPTS50.csv +++ b/test/ref/test50_Preset_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.56,51.10,52.99,52.99,52.99,52.99,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.81,48.03,52.48,52.98,52.98,52.98,52.99 diff --git a/test/ref/test50_Preset_AOSmithHPTU80.csv b/test/ref/test50_Preset_AOSmithHPTU80.csv index 79cdce1e..2ef755ce 100644 --- a/test/ref/test50_Preset_AOSmithHPTU80.csv +++ b/test/ref/test50_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,47.55,51.91,52.99,52.99,52.99,52.99,53.00 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.98,50.12,52.82,52.99,52.99,52.99,52.99 diff --git a/test/ref/test50_Preset_AOSmithPHPT60.csv b/test/ref/test50_Preset_AOSmithPHPT60.csv index 570d96a6..54f4051a 100644 --- a/test/ref/test50_Preset_AOSmithPHPT60.csv +++ b/test/ref/test50_Preset_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,45.44,51.48,52.99,52.99,52.99,52.99,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,39.18,49.01,52.66,52.98,52.98,52.98,52.99 diff --git a/test/ref/test50_Preset_GE502014.csv b/test/ref/test50_Preset_GE502014.csv index bfcd88f6..15550471 100644 --- a/test/ref/test50_Preset_GE502014.csv +++ b/test/ref/test50_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.43,51.08,52.99,52.99,52.99,52.99,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.59,47.97,52.47,52.98,52.98,52.98,52.99 diff --git a/test/ref/test50_Preset_Rheem2020Build50.csv b/test/ref/test50_Preset_Rheem2020Build50.csv index 94c87ea3..cab57743 100644 --- a/test/ref/test50_Preset_Rheem2020Build50.csv +++ b/test/ref/test50_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.45,51.08,52.98,52.98,52.98,52.98,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.62,47.97,52.46,52.98,52.98,52.98,52.98 diff --git a/test/ref/test50_Preset_Rheem2020Prem40.csv b/test/ref/test50_Preset_Rheem2020Prem40.csv index 1eda62f4..208d3853 100644 --- a/test/ref/test50_Preset_Rheem2020Prem40.csv +++ b/test/ref/test50_Preset_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.07,50.60,52.98,52.98,52.98,52.98,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,31.42,46.73,52.17,52.97,52.97,52.97,52.98 diff --git a/test/ref/test50_Preset_Rheem2020Prem50.csv b/test/ref/test50_Preset_Rheem2020Prem50.csv index 78a0227a..65bcb9b0 100644 --- a/test/ref/test50_Preset_Rheem2020Prem50.csv +++ b/test/ref/test50_Preset_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.45,51.08,52.98,52.98,52.98,52.98,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.62,47.97,52.46,52.98,52.98,52.98,52.98 diff --git a/test/ref/test50_Preset_RheemHB50.csv b/test/ref/test50_Preset_RheemHB50.csv index 44d9d09c..0f584a6b 100644 --- a/test/ref/test50_Preset_RheemHB50.csv +++ b/test/ref/test50_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.43,51.08,52.98,52.99,52.99,52.99,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.58,47.96,52.47,52.98,52.98,52.98,52.99 diff --git a/test/ref/test50_Preset_Sanden80.csv b/test/ref/test50_Preset_Sanden80.csv index e009cd5f..8eb6dbe5 100644 --- a/test/ref/test50_Preset_Sanden80.csv +++ b/test/ref/test50_Preset_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 10.000000, 65.000000, 10.000000, 2.000000, 0,0.00,0.00,57.06,64.99,64.99,64.99,64.99,64.99,65.00 2, 10.000000, 65.000000, 10.000000, 2.000000, 0,0.00,0.00,49.13,64.99,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/test50_Preset_Stiebel220e.csv b/test/ref/test50_Preset_Stiebel220e.csv index 381f4432..d84b5d1f 100644 --- a/test/ref/test50_Preset_Stiebel220e.csv +++ b/test/ref/test50_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,43.77,52.99,52.99,52.99,52.99,52.99,52.99 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,34.57,52.96,52.98,52.98,52.98,52.98,52.99 diff --git a/test/ref/test70_File_AOSmithHPTS50.csv b/test/ref/test70_File_AOSmithHPTS50.csv index 13589c8d..07f1b07a 100644 --- a/test/ref/test70_File_AOSmithHPTS50.csv +++ b/test/ref/test70_File_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.66,51.33,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.81,48.61,52.54,52.99,52.99,52.99,52.99 diff --git a/test/ref/test70_File_AOSmithHPTU80.csv b/test/ref/test70_File_AOSmithHPTU80.csv index 9cdedea0..99cc0fbf 100644 --- a/test/ref/test70_File_AOSmithHPTU80.csv +++ b/test/ref/test70_File_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,48.19,52.03,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.15,50.46,52.84,52.99,52.99,52.99,52.99 diff --git a/test/ref/test70_File_AOSmithPHPT60.csv b/test/ref/test70_File_AOSmithPHPT60.csv index d0fb1804..6a83811f 100644 --- a/test/ref/test70_File_AOSmithPHPT60.csv +++ b/test/ref/test70_File_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.32,51.66,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,40.79,49.48,52.70,52.99,52.99,52.99,52.99 diff --git a/test/ref/test70_File_GE502014.csv b/test/ref/test70_File_GE502014.csv index 9803ed6b..fd774fb4 100644 --- a/test/ref/test70_File_GE502014.csv +++ b/test/ref/test70_File_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.55,51.30,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.99,52.99,52.99,52.99 diff --git a/test/ref/test70_File_Rheem2020Build50.csv b/test/ref/test70_File_Rheem2020Build50.csv index ca5bbc02..488e5886 100644 --- a/test/ref/test70_File_Rheem2020Build50.csv +++ b/test/ref/test70_File_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/test70_File_Rheem2020Prem40.csv b/test/ref/test70_File_Rheem2020Prem40.csv index baaa5876..a69db296 100644 --- a/test/ref/test70_File_Rheem2020Prem40.csv +++ b/test/ref/test70_File_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.46,50.88,52.98,52.98,52.98,52.98,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.94,47.47,52.27,52.97,52.97,52.97,52.98 diff --git a/test/ref/test70_File_Rheem2020Prem50.csv b/test/ref/test70_File_Rheem2020Prem50.csv index 93a65711..fc6398ad 100644 --- a/test/ref/test70_File_Rheem2020Prem50.csv +++ b/test/ref/test70_File_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/test70_File_RheemHB50.csv b/test/ref/test70_File_RheemHB50.csv index 8cf87e28..6a6ff1d9 100644 --- a/test/ref/test70_File_RheemHB50.csv +++ b/test/ref/test70_File_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.54,51.30,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/test70_File_Sanden80.csv b/test/ref/test70_File_Sanden80.csv index b1948bf8..bd04a5d0 100644 --- a/test/ref/test70_File_Sanden80.csv +++ b/test/ref/test70_File_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 20.000000, 65.000000, 15.000000, 2.000000, 0,0.00,0.00,57.78,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 2.000000, 0,0.00,0.00,50.57,64.99,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/test70_File_Stiebel220e.csv b/test/ref/test70_File_Stiebel220e.csv index eb28cb06..47325688 100644 --- a/test/ref/test70_File_Stiebel220e.csv +++ b/test/ref/test70_File_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,44.85,52.99,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,36.72,52.97,52.98,52.98,52.98,52.98,52.99 diff --git a/test/ref/test70_Preset_AOSmithHPTS50.csv b/test/ref/test70_Preset_AOSmithHPTS50.csv index 13589c8d..07f1b07a 100644 --- a/test/ref/test70_Preset_AOSmithHPTS50.csv +++ b/test/ref/test70_Preset_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.66,51.33,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.81,48.61,52.54,52.99,52.99,52.99,52.99 diff --git a/test/ref/test70_Preset_AOSmithHPTU80.csv b/test/ref/test70_Preset_AOSmithHPTU80.csv index 9cdedea0..99cc0fbf 100644 --- a/test/ref/test70_Preset_AOSmithHPTU80.csv +++ b/test/ref/test70_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,48.19,52.03,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.15,50.46,52.84,52.99,52.99,52.99,52.99 diff --git a/test/ref/test70_Preset_AOSmithPHPT60.csv b/test/ref/test70_Preset_AOSmithPHPT60.csv index d0fb1804..6a83811f 100644 --- a/test/ref/test70_Preset_AOSmithPHPT60.csv +++ b/test/ref/test70_Preset_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.32,51.66,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,40.79,49.48,52.70,52.99,52.99,52.99,52.99 diff --git a/test/ref/test70_Preset_GE502014.csv b/test/ref/test70_Preset_GE502014.csv index 9803ed6b..fd774fb4 100644 --- a/test/ref/test70_Preset_GE502014.csv +++ b/test/ref/test70_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.55,51.30,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.99,52.99,52.99,52.99 diff --git a/test/ref/test70_Preset_Rheem2020Build50.csv b/test/ref/test70_Preset_Rheem2020Build50.csv index ca5bbc02..488e5886 100644 --- a/test/ref/test70_Preset_Rheem2020Build50.csv +++ b/test/ref/test70_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/test70_Preset_Rheem2020Prem40.csv b/test/ref/test70_Preset_Rheem2020Prem40.csv index baaa5876..a69db296 100644 --- a/test/ref/test70_Preset_Rheem2020Prem40.csv +++ b/test/ref/test70_Preset_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.46,50.88,52.98,52.98,52.98,52.98,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.94,47.47,52.27,52.97,52.97,52.97,52.98 diff --git a/test/ref/test70_Preset_Rheem2020Prem50.csv b/test/ref/test70_Preset_Rheem2020Prem50.csv index 93a65711..fc6398ad 100644 --- a/test/ref/test70_Preset_Rheem2020Prem50.csv +++ b/test/ref/test70_Preset_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/test70_Preset_RheemHB50.csv b/test/ref/test70_Preset_RheemHB50.csv index 8cf87e28..6a6ff1d9 100644 --- a/test/ref/test70_Preset_RheemHB50.csv +++ b/test/ref/test70_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.54,51.30,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/test70_Preset_Sanden80.csv b/test/ref/test70_Preset_Sanden80.csv index b1948bf8..bd04a5d0 100644 --- a/test/ref/test70_Preset_Sanden80.csv +++ b/test/ref/test70_Preset_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 20.000000, 65.000000, 15.000000, 2.000000, 0,0.00,0.00,57.78,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 2.000000, 0,0.00,0.00,50.57,64.99,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/test70_Preset_Stiebel220e.csv b/test/ref/test70_Preset_Stiebel220e.csv index eb28cb06..47325688 100644 --- a/test/ref/test70_Preset_Stiebel220e.csv +++ b/test/ref/test70_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,44.85,52.99,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,36.72,52.97,52.98,52.98,52.98,52.98,52.99 diff --git a/test/ref/test95_File_AOSmithHPTS50.csv b/test/ref/test95_File_AOSmithHPTS50.csv index a2b57efb..407107fb 100644 --- a/test/ref/test95_File_AOSmithHPTS50.csv +++ b/test/ref/test95_File_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.85,51.77,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.81,49.77,52.67,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_File_AOSmithHPTU80.csv b/test/ref/test95_File_AOSmithHPTU80.csv index 55fc123d..eda14cf0 100644 --- a/test/ref/test95_File_AOSmithHPTU80.csv +++ b/test/ref/test95_File_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,49.46,52.29,52.99,53.00,53.00,53.00,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.48,51.13,52.88,52.99,52.99,52.99,53.00 diff --git a/test/ref/test95_File_AOSmithPHPT60.csv b/test/ref/test95_File_AOSmithPHPT60.csv index f794d4cf..3c0924d4 100644 --- a/test/ref/test95_File_AOSmithPHPT60.csv +++ b/test/ref/test95_File_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,48.08,52.01,52.99,53.00,53.00,53.00,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.00,50.41,52.78,52.99,52.99,52.99,53.00 diff --git a/test/ref/test95_File_GE502014.csv b/test/ref/test95_File_GE502014.csv index ee3f955e..b8aeee4b 100644 --- a/test/ref/test95_File_GE502014.csv +++ b/test/ref/test95_File_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.77,51.75,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.66,49.73,52.66,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_File_Rheem2020Build50.csv b/test/ref/test95_File_Rheem2020Build50.csv index 2d5abc07..a1a006bd 100644 --- a/test/ref/test95_File_Rheem2020Build50.csv +++ b/test/ref/test95_File_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.78,51.75,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.69,49.73,52.66,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_File_Rheem2020Prem40.csv b/test/ref/test95_File_Rheem2020Prem40.csv index 8290eb91..5bc2a095 100644 --- a/test/ref/test95_File_Rheem2020Prem40.csv +++ b/test/ref/test95_File_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,45.24,51.44,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,38.96,48.93,52.47,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_File_Rheem2020Prem50.csv b/test/ref/test95_File_Rheem2020Prem50.csv index 63d866ee..dbe4f7f7 100644 --- a/test/ref/test95_File_Rheem2020Prem50.csv +++ b/test/ref/test95_File_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.78,51.75,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.69,49.73,52.66,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_File_RheemHB50.csv b/test/ref/test95_File_RheemHB50.csv index 887e0226..92a7618d 100644 --- a/test/ref/test95_File_RheemHB50.csv +++ b/test/ref/test95_File_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.77,51.75,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.66,49.73,52.66,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_File_Sanden80.csv b/test/ref/test95_File_Sanden80.csv index d71532c5..7224161f 100644 --- a/test/ref/test95_File_Sanden80.csv +++ b/test/ref/test95_File_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 65.000000, 25.000000, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 35.000000, 65.000000, 25.000000, 2.000000, 0,0.00,0.00,59.23,65.00,65.00,65.00,65.00,65.00,65.00 2, 35.000000, 65.000000, 25.000000, 2.000000, 0,0.00,0.00,53.46,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/test95_File_Stiebel220e.csv b/test/ref/test95_File_Stiebel220e.csv index c23ef8d3..c10c8215 100644 --- a/test/ref/test95_File_Stiebel220e.csv +++ b/test/ref/test95_File_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,46.99,52.99,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,41.00,52.98,52.99,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_Preset_AOSmithHPTS50.csv b/test/ref/test95_Preset_AOSmithHPTS50.csv index a2b57efb..407107fb 100644 --- a/test/ref/test95_Preset_AOSmithHPTS50.csv +++ b/test/ref/test95_Preset_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.85,51.77,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.81,49.77,52.67,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_Preset_AOSmithHPTU80.csv b/test/ref/test95_Preset_AOSmithHPTU80.csv index 55fc123d..eda14cf0 100644 --- a/test/ref/test95_Preset_AOSmithHPTU80.csv +++ b/test/ref/test95_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,49.46,52.29,52.99,53.00,53.00,53.00,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.48,51.13,52.88,52.99,52.99,52.99,53.00 diff --git a/test/ref/test95_Preset_AOSmithPHPT60.csv b/test/ref/test95_Preset_AOSmithPHPT60.csv index f794d4cf..3c0924d4 100644 --- a/test/ref/test95_Preset_AOSmithPHPT60.csv +++ b/test/ref/test95_Preset_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,48.08,52.01,52.99,53.00,53.00,53.00,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.00,50.41,52.78,52.99,52.99,52.99,53.00 diff --git a/test/ref/test95_Preset_GE502014.csv b/test/ref/test95_Preset_GE502014.csv index ee3f955e..b8aeee4b 100644 --- a/test/ref/test95_Preset_GE502014.csv +++ b/test/ref/test95_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.77,51.75,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.66,49.73,52.66,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_Preset_Rheem2020Build50.csv b/test/ref/test95_Preset_Rheem2020Build50.csv index 2d5abc07..a1a006bd 100644 --- a/test/ref/test95_Preset_Rheem2020Build50.csv +++ b/test/ref/test95_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.78,51.75,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.69,49.73,52.66,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_Preset_Rheem2020Prem40.csv b/test/ref/test95_Preset_Rheem2020Prem40.csv index 8290eb91..5bc2a095 100644 --- a/test/ref/test95_Preset_Rheem2020Prem40.csv +++ b/test/ref/test95_Preset_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,45.24,51.44,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,38.96,48.93,52.47,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_Preset_Rheem2020Prem50.csv b/test/ref/test95_Preset_Rheem2020Prem50.csv index 63d866ee..dbe4f7f7 100644 --- a/test/ref/test95_Preset_Rheem2020Prem50.csv +++ b/test/ref/test95_Preset_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.78,51.75,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.69,49.73,52.66,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_Preset_RheemHB50.csv b/test/ref/test95_Preset_RheemHB50.csv index 887e0226..92a7618d 100644 --- a/test/ref/test95_Preset_RheemHB50.csv +++ b/test/ref/test95_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.77,51.75,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.66,49.73,52.66,52.99,52.99,52.99,52.99 diff --git a/test/ref/test95_Preset_Sanden80.csv b/test/ref/test95_Preset_Sanden80.csv index d71532c5..7224161f 100644 --- a/test/ref/test95_Preset_Sanden80.csv +++ b/test/ref/test95_Preset_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 65.000000, 25.000000, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 35.000000, 65.000000, 25.000000, 2.000000, 0,0.00,0.00,59.23,65.00,65.00,65.00,65.00,65.00,65.00 2, 35.000000, 65.000000, 25.000000, 2.000000, 0,0.00,0.00,53.46,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/test95_Preset_Stiebel220e.csv b/test/ref/test95_Preset_Stiebel220e.csv index c23ef8d3..c10c8215 100644 --- a/test/ref/test95_Preset_Stiebel220e.csv +++ b/test/ref/test95_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 35.000000, 53.000000, 25.000000, 0.000000, 0,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,46.99,52.99,52.99,52.99,52.99,52.99,53.00 2, 35.000000, 53.000000, 25.000000, 2.000000, 0,0.00,0.00,0.00,0.00,41.00,52.98,52.99,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDR_TOTLOR_File_AOSmithHPTS50.csv b/test/ref/testDR_TOTLOR_File_AOSmithHPTS50.csv index a87e0b46..0cc8fb81 100644 --- a/test/ref/testDR_TOTLOR_File_AOSmithHPTS50.csv +++ b/test/ref/testDR_TOTLOR_File_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.77,52.77,52.77,52.77,52.77, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDR_TOTLOR_File_AOSmithHPTU80.csv b/test/ref/testDR_TOTLOR_File_AOSmithHPTU80.csv index 2f74d49f..c9f734db 100644 --- a/test/ref/testDR_TOTLOR_File_AOSmithHPTU80.csv +++ b/test/ref/testDR_TOTLOR_File_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.77,52.77,52.77,52.77,52.77, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDR_TOTLOR_File_AOSmithPHPT60.csv b/test/ref/testDR_TOTLOR_File_AOSmithPHPT60.csv index 8d72401a..32425cc5 100644 --- a/test/ref/testDR_TOTLOR_File_AOSmithPHPT60.csv +++ b/test/ref/testDR_TOTLOR_File_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.77,52.77,52.77,52.77,52.77, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDR_TOTLOR_File_GE502014.csv b/test/ref/testDR_TOTLOR_File_GE502014.csv index f8d41057..32eb2ca6 100644 --- a/test/ref/testDR_TOTLOR_File_GE502014.csv +++ b/test/ref/testDR_TOTLOR_File_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.77,52.77,52.77,52.77,52.77, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDR_TOTLOR_File_Rheem2020Build50.csv b/test/ref/testDR_TOTLOR_File_Rheem2020Build50.csv index 55f77db2..502b5fd2 100644 --- a/test/ref/testDR_TOTLOR_File_Rheem2020Build50.csv +++ b/test/ref/testDR_TOTLOR_File_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.74,52.75,52.75,52.75,52.75,52.75, diff --git a/test/ref/testDR_TOTLOR_File_Rheem2020Prem40.csv b/test/ref/testDR_TOTLOR_File_Rheem2020Prem40.csv index c9468cb3..3d93c09e 100644 --- a/test/ref/testDR_TOTLOR_File_Rheem2020Prem40.csv +++ b/test/ref/testDR_TOTLOR_File_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.74,52.75,52.75,52.75,52.75,52.75, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.73,52.74,52.74,52.74,52.74,52.74, diff --git a/test/ref/testDR_TOTLOR_File_Rheem2020Prem50.csv b/test/ref/testDR_TOTLOR_File_Rheem2020Prem50.csv index 3581fa3b..5ece27cb 100644 --- a/test/ref/testDR_TOTLOR_File_Rheem2020Prem50.csv +++ b/test/ref/testDR_TOTLOR_File_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.74,52.75,52.75,52.75,52.75,52.75, diff --git a/test/ref/testDR_TOTLOR_File_RheemHB50.csv b/test/ref/testDR_TOTLOR_File_RheemHB50.csv index cdc26514..7ad9e68f 100644 --- a/test/ref/testDR_TOTLOR_File_RheemHB50.csv +++ b/test/ref/testDR_TOTLOR_File_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.76,52.76,52.76,52.76,52.76, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDR_TOTLOR_File_Sanden80.csv b/test/ref/testDR_TOTLOR_File_Sanden80.csv index 271ff9b3..cbc8c42a 100644 --- a/test/ref/testDR_TOTLOR_File_Sanden80.csv +++ b/test/ref/testDR_TOTLOR_File_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 65.000000, 10.855000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 8.280000, 65.000000, 10.855000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 2, 8.280000, 65.000000, 10.855000, 0.000000, 0,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, diff --git a/test/ref/testDR_TOTLOR_File_Stiebel220e.csv b/test/ref/testDR_TOTLOR_File_Stiebel220e.csv index 7806e85c..6018e2b1 100644 --- a/test/ref/testDR_TOTLOR_File_Stiebel220e.csv +++ b/test/ref/testDR_TOTLOR_File_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,52.76,52.76,52.76,52.76,52.76,52.76, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDR_TOTLOR_Preset_AOSmithHPTS50.csv b/test/ref/testDR_TOTLOR_Preset_AOSmithHPTS50.csv index a87e0b46..0cc8fb81 100644 --- a/test/ref/testDR_TOTLOR_Preset_AOSmithHPTS50.csv +++ b/test/ref/testDR_TOTLOR_Preset_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.77,52.77,52.77,52.77,52.77, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDR_TOTLOR_Preset_AOSmithHPTU80.csv b/test/ref/testDR_TOTLOR_Preset_AOSmithHPTU80.csv index 2f74d49f..c9f734db 100644 --- a/test/ref/testDR_TOTLOR_Preset_AOSmithHPTU80.csv +++ b/test/ref/testDR_TOTLOR_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.77,52.77,52.77,52.77,52.77, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDR_TOTLOR_Preset_AOSmithPHPT60.csv b/test/ref/testDR_TOTLOR_Preset_AOSmithPHPT60.csv index 8d72401a..32425cc5 100644 --- a/test/ref/testDR_TOTLOR_Preset_AOSmithPHPT60.csv +++ b/test/ref/testDR_TOTLOR_Preset_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.77,52.77,52.77,52.77,52.77, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDR_TOTLOR_Preset_GE502014.csv b/test/ref/testDR_TOTLOR_Preset_GE502014.csv index f8d41057..32eb2ca6 100644 --- a/test/ref/testDR_TOTLOR_Preset_GE502014.csv +++ b/test/ref/testDR_TOTLOR_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.77,52.77,52.77,52.77,52.77, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDR_TOTLOR_Preset_Rheem2020Build50.csv b/test/ref/testDR_TOTLOR_Preset_Rheem2020Build50.csv index 55f77db2..502b5fd2 100644 --- a/test/ref/testDR_TOTLOR_Preset_Rheem2020Build50.csv +++ b/test/ref/testDR_TOTLOR_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.74,52.75,52.75,52.75,52.75,52.75, diff --git a/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem40.csv b/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem40.csv index c9468cb3..3d93c09e 100644 --- a/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem40.csv +++ b/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.74,52.75,52.75,52.75,52.75,52.75, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.73,52.74,52.74,52.74,52.74,52.74, diff --git a/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem50.csv b/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem50.csv index 3581fa3b..5ece27cb 100644 --- a/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem50.csv +++ b/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.74,52.75,52.75,52.75,52.75,52.75, diff --git a/test/ref/testDR_TOTLOR_Preset_RheemHB50.csv b/test/ref/testDR_TOTLOR_Preset_RheemHB50.csv index cdc26514..7ad9e68f 100644 --- a/test/ref/testDR_TOTLOR_Preset_RheemHB50.csv +++ b/test/ref/testDR_TOTLOR_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.76,52.76,52.76,52.76,52.76,52.76, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDR_TOTLOR_Preset_Sanden80.csv b/test/ref/testDR_TOTLOR_Preset_Sanden80.csv index 271ff9b3..cbc8c42a 100644 --- a/test/ref/testDR_TOTLOR_Preset_Sanden80.csv +++ b/test/ref/testDR_TOTLOR_Preset_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 65.000000, 10.855000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 8.280000, 65.000000, 10.855000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 2, 8.280000, 65.000000, 10.855000, 0.000000, 0,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, diff --git a/test/ref/testDR_TOTLOR_Preset_Stiebel220e.csv b/test/ref/testDR_TOTLOR_Preset_Stiebel220e.csv index 7806e85c..6018e2b1 100644 --- a/test/ref/testDR_TOTLOR_Preset_Stiebel220e.csv +++ b/test/ref/testDR_TOTLOR_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,52.76,52.76,52.76,52.76,52.76,52.76, 2, 8.280000, 51.666600, 10.855000, 0.000000, 0,0.00,0.00,0.00,0.00,52.75,52.76,52.76,52.76,52.76,52.76, diff --git a/test/ref/testDr_LO_File_AOSmithHPTS50.csv b/test/ref/testDr_LO_File_AOSmithHPTS50.csv index a5ed817e..63c5f9a5 100644 --- a/test/ref/testDr_LO_File_AOSmithHPTS50.csv +++ b/test/ref/testDr_LO_File_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.66,51.33,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,37.81,48.61,52.54,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_LO_File_AOSmithHPTU80.csv b/test/ref/testDr_LO_File_AOSmithHPTU80.csv index 6a64fea1..0e54dd51 100644 --- a/test/ref/testDr_LO_File_AOSmithHPTU80.csv +++ b/test/ref/testDr_LO_File_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,48.19,52.03,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.15,50.46,52.84,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_LO_File_AOSmithPHPT60.csv b/test/ref/testDr_LO_File_AOSmithPHPT60.csv index 6046ab83..c65fdec8 100644 --- a/test/ref/testDr_LO_File_AOSmithPHPT60.csv +++ b/test/ref/testDr_LO_File_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,46.32,51.66,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,40.79,49.48,52.70,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_LO_File_GE502014.csv b/test/ref/testDr_LO_File_GE502014.csv index 11b266ee..9c6712ca 100644 --- a/test/ref/testDr_LO_File_GE502014.csv +++ b/test/ref/testDr_LO_File_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.55,51.30,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_LO_File_Rheem2020Build50.csv b/test/ref/testDr_LO_File_Rheem2020Build50.csv index 6aafb55a..ca42e768 100644 --- a/test/ref/testDr_LO_File_Rheem2020Build50.csv +++ b/test/ref/testDr_LO_File_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_LO_File_Rheem2020Prem40.csv b/test/ref/testDr_LO_File_Rheem2020Prem40.csv index 826a8bea..bdd13343 100644 --- a/test/ref/testDr_LO_File_Rheem2020Prem40.csv +++ b/test/ref/testDr_LO_File_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,42.46,50.88,52.98,52.98,52.98,52.98,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,33.94,47.47,52.27,52.97,52.97,52.97,52.98 diff --git a/test/ref/testDr_LO_File_Rheem2020Prem50.csv b/test/ref/testDr_LO_File_Rheem2020Prem50.csv index 29c31f45..199d79b5 100644 --- a/test/ref/testDr_LO_File_Rheem2020Prem50.csv +++ b/test/ref/testDr_LO_File_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_LO_File_RheemHB50.csv b/test/ref/testDr_LO_File_RheemHB50.csv index 3a92acbc..3425def0 100644 --- a/test/ref/testDr_LO_File_RheemHB50.csv +++ b/test/ref/testDr_LO_File_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.54,51.30,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_LO_File_Sanden80.csv b/test/ref/testDr_LO_File_Sanden80.csv index ae1fbf2d..e557c340 100644 --- a/test/ref/testDr_LO_File_Sanden80.csv +++ b/test/ref/testDr_LO_File_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 20.000000, 65.000000, 15.000000, 2.000000, 3,0.00,0.00,57.78,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 2.000000, 3,0.00,0.00,50.57,64.99,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/testDr_LO_File_Stiebel220e.csv b/test/ref/testDr_LO_File_Stiebel220e.csv index 30168830..dfaa01b2 100644 --- a/test/ref/testDr_LO_File_Stiebel220e.csv +++ b/test/ref/testDr_LO_File_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,44.85,52.99,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,36.72,52.97,52.98,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_LO_Preset_AOSmithHPTS50.csv b/test/ref/testDr_LO_Preset_AOSmithHPTS50.csv index a5ed817e..63c5f9a5 100644 --- a/test/ref/testDr_LO_Preset_AOSmithHPTS50.csv +++ b/test/ref/testDr_LO_Preset_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.66,51.33,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,37.81,48.61,52.54,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_LO_Preset_AOSmithHPTU80.csv b/test/ref/testDr_LO_Preset_AOSmithHPTU80.csv index 6a64fea1..0e54dd51 100644 --- a/test/ref/testDr_LO_Preset_AOSmithHPTU80.csv +++ b/test/ref/testDr_LO_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,48.19,52.03,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.15,50.46,52.84,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_LO_Preset_AOSmithPHPT60.csv b/test/ref/testDr_LO_Preset_AOSmithPHPT60.csv index 6046ab83..c65fdec8 100644 --- a/test/ref/testDr_LO_Preset_AOSmithPHPT60.csv +++ b/test/ref/testDr_LO_Preset_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,46.32,51.66,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,40.79,49.48,52.70,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_LO_Preset_GE502014.csv b/test/ref/testDr_LO_Preset_GE502014.csv index 11b266ee..9c6712ca 100644 --- a/test/ref/testDr_LO_Preset_GE502014.csv +++ b/test/ref/testDr_LO_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.55,51.30,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_LO_Preset_Rheem2020Build50.csv b/test/ref/testDr_LO_Preset_Rheem2020Build50.csv index 6aafb55a..ca42e768 100644 --- a/test/ref/testDr_LO_Preset_Rheem2020Build50.csv +++ b/test/ref/testDr_LO_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_LO_Preset_Rheem2020Prem40.csv b/test/ref/testDr_LO_Preset_Rheem2020Prem40.csv index 826a8bea..bdd13343 100644 --- a/test/ref/testDr_LO_Preset_Rheem2020Prem40.csv +++ b/test/ref/testDr_LO_Preset_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,42.46,50.88,52.98,52.98,52.98,52.98,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,33.94,47.47,52.27,52.97,52.97,52.97,52.98 diff --git a/test/ref/testDr_LO_Preset_Rheem2020Prem50.csv b/test/ref/testDr_LO_Preset_Rheem2020Prem50.csv index 29c31f45..199d79b5 100644 --- a/test/ref/testDr_LO_Preset_Rheem2020Prem50.csv +++ b/test/ref/testDr_LO_Preset_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_LO_Preset_RheemHB50.csv b/test/ref/testDr_LO_Preset_RheemHB50.csv index 3a92acbc..3425def0 100644 --- a/test/ref/testDr_LO_Preset_RheemHB50.csv +++ b/test/ref/testDr_LO_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,44.54,51.30,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_LO_Preset_Sanden80.csv b/test/ref/testDr_LO_Preset_Sanden80.csv index ae1fbf2d..e557c340 100644 --- a/test/ref/testDr_LO_Preset_Sanden80.csv +++ b/test/ref/testDr_LO_Preset_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 20.000000, 65.000000, 15.000000, 2.000000, 3,0.00,0.00,57.78,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 2.000000, 3,0.00,0.00,50.57,64.99,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/testDr_LO_Preset_Stiebel220e.csv b/test/ref/testDr_LO_Preset_Stiebel220e.csv index 30168830..dfaa01b2 100644 --- a/test/ref/testDr_LO_Preset_Stiebel220e.csv +++ b/test/ref/testDr_LO_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,44.85,52.99,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 3,0.00,0.00,0.00,0.00,36.72,52.97,52.98,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOO2_File_AOSmithHPTS50.csv b/test/ref/testDr_TOO2_File_AOSmithHPTS50.csv index dfbcfd27..90658eb4 100644 --- a/test/ref/testDr_TOO2_File_AOSmithHPTS50.csv +++ b/test/ref/testDr_TOO2_File_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_File_AOSmithHPTU80.csv b/test/ref/testDr_TOO2_File_AOSmithHPTU80.csv index 22843581..f649d7e6 100644 --- a/test/ref/testDr_TOO2_File_AOSmithHPTU80.csv +++ b/test/ref/testDr_TOO2_File_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_File_AOSmithPHPT60.csv b/test/ref/testDr_TOO2_File_AOSmithPHPT60.csv index dc32490a..b3c97a0c 100644 --- a/test/ref/testDr_TOO2_File_AOSmithPHPT60.csv +++ b/test/ref/testDr_TOO2_File_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_File_GE502014.csv b/test/ref/testDr_TOO2_File_GE502014.csv index 0de89fba..98e4f166 100644 --- a/test/ref/testDr_TOO2_File_GE502014.csv +++ b/test/ref/testDr_TOO2_File_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_File_Rheem2020Build50.csv b/test/ref/testDr_TOO2_File_Rheem2020Build50.csv index 2fcf24c4..c5b2ce26 100644 --- a/test/ref/testDr_TOO2_File_Rheem2020Build50.csv +++ b/test/ref/testDr_TOO2_File_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_File_Rheem2020Prem40.csv b/test/ref/testDr_TOO2_File_Rheem2020Prem40.csv index d59b8968..e429b352 100644 --- a/test/ref/testDr_TOO2_File_Rheem2020Prem40.csv +++ b/test/ref/testDr_TOO2_File_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.97,52.98,52.98,52.98,52.98,52.98, diff --git a/test/ref/testDr_TOO2_File_Rheem2020Prem50.csv b/test/ref/testDr_TOO2_File_Rheem2020Prem50.csv index 933c06a2..2884e964 100644 --- a/test/ref/testDr_TOO2_File_Rheem2020Prem50.csv +++ b/test/ref/testDr_TOO2_File_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_File_RheemHB50.csv b/test/ref/testDr_TOO2_File_RheemHB50.csv index 2fad25b1..e0f97b9e 100644 --- a/test/ref/testDr_TOO2_File_RheemHB50.csv +++ b/test/ref/testDr_TOO2_File_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_File_Sanden80.csv b/test/ref/testDr_TOO2_File_Sanden80.csv index 07521cf6..aeb61d9c 100644 --- a/test/ref/testDr_TOO2_File_Sanden80.csv +++ b/test/ref/testDr_TOO2_File_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 65.000000, 17.110000, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 29.455556, 65.000000, 17.110000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 2, 29.455556, 65.000000, 17.110000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, diff --git a/test/ref/testDr_TOO2_File_Stiebel220e.csv b/test/ref/testDr_TOO2_File_Stiebel220e.csv index 1c9263ec..0a935485 100644 --- a/test/ref/testDr_TOO2_File_Stiebel220e.csv +++ b/test/ref/testDr_TOO2_File_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_Preset_AOSmithHPTS50.csv b/test/ref/testDr_TOO2_Preset_AOSmithHPTS50.csv index dfbcfd27..90658eb4 100644 --- a/test/ref/testDr_TOO2_Preset_AOSmithHPTS50.csv +++ b/test/ref/testDr_TOO2_Preset_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_Preset_AOSmithHPTU80.csv b/test/ref/testDr_TOO2_Preset_AOSmithHPTU80.csv index 22843581..f649d7e6 100644 --- a/test/ref/testDr_TOO2_Preset_AOSmithHPTU80.csv +++ b/test/ref/testDr_TOO2_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_Preset_AOSmithPHPT60.csv b/test/ref/testDr_TOO2_Preset_AOSmithPHPT60.csv index dc32490a..b3c97a0c 100644 --- a/test/ref/testDr_TOO2_Preset_AOSmithPHPT60.csv +++ b/test/ref/testDr_TOO2_Preset_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,53.00,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_Preset_GE502014.csv b/test/ref/testDr_TOO2_Preset_GE502014.csv index 0de89fba..98e4f166 100644 --- a/test/ref/testDr_TOO2_Preset_GE502014.csv +++ b/test/ref/testDr_TOO2_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_Preset_Rheem2020Build50.csv b/test/ref/testDr_TOO2_Preset_Rheem2020Build50.csv index 2fcf24c4..c5b2ce26 100644 --- a/test/ref/testDr_TOO2_Preset_Rheem2020Build50.csv +++ b/test/ref/testDr_TOO2_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_Preset_Rheem2020Prem40.csv b/test/ref/testDr_TOO2_Preset_Rheem2020Prem40.csv index d59b8968..e429b352 100644 --- a/test/ref/testDr_TOO2_Preset_Rheem2020Prem40.csv +++ b/test/ref/testDr_TOO2_Preset_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.97,52.98,52.98,52.98,52.98,52.98, diff --git a/test/ref/testDr_TOO2_Preset_Rheem2020Prem50.csv b/test/ref/testDr_TOO2_Preset_Rheem2020Prem50.csv index 933c06a2..2884e964 100644 --- a/test/ref/testDr_TOO2_Preset_Rheem2020Prem50.csv +++ b/test/ref/testDr_TOO2_Preset_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_Preset_RheemHB50.csv b/test/ref/testDr_TOO2_Preset_RheemHB50.csv index 2fad25b1..e0f97b9e 100644 --- a/test/ref/testDr_TOO2_Preset_RheemHB50.csv +++ b/test/ref/testDr_TOO2_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO2_Preset_Sanden80.csv b/test/ref/testDr_TOO2_Preset_Sanden80.csv index 07521cf6..aeb61d9c 100644 --- a/test/ref/testDr_TOO2_Preset_Sanden80.csv +++ b/test/ref/testDr_TOO2_Preset_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 65.000000, 17.110000, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 29.455556, 65.000000, 17.110000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 2, 29.455556, 65.000000, 17.110000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, diff --git a/test/ref/testDr_TOO2_Preset_Stiebel220e.csv b/test/ref/testDr_TOO2_Preset_Stiebel220e.csv index 1c9263ec..0a935485 100644 --- a/test/ref/testDr_TOO2_Preset_Stiebel220e.csv +++ b/test/ref/testDr_TOO2_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 2, 29.455556, 53.000000, 17.110000, 0.000000, 0,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99, diff --git a/test/ref/testDr_TOO_File_AOSmithHPTS50.csv b/test/ref/testDr_TOO_File_AOSmithHPTS50.csv index d0865197..d567fa9a 100644 --- a/test/ref/testDr_TOO_File_AOSmithHPTS50.csv +++ b/test/ref/testDr_TOO_File_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,6.41,25.23,44.91,51.82,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,6.23,26.05,38.42,49.38,52.70,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOO_File_AOSmithHPTU80.csv b/test/ref/testDr_TOO_File_AOSmithHPTU80.csv index 2c8b7c32..04683443 100644 --- a/test/ref/testDr_TOO_File_AOSmithHPTU80.csv +++ b/test/ref/testDr_TOO_File_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,7.25,22.76,48.57,52.05,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,7.04,23.45,44.86,50.54,52.84,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOO_File_AOSmithPHPT60.csv b/test/ref/testDr_TOO_File_AOSmithPHPT60.csv index 649fbdce..fb3d914f 100644 --- a/test/ref/testDr_TOO_File_AOSmithPHPT60.csv +++ b/test/ref/testDr_TOO_File_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,16.39,39.90,0.00,0.00,47.18,51.77,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,15.91,41.12,0.00,0.00,42.36,49.82,52.73,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOO_File_GE502014.csv b/test/ref/testDr_TOO_File_GE502014.csv index 9b983879..eba5544a 100644 --- a/test/ref/testDr_TOO_File_GE502014.csv +++ b/test/ref/testDr_TOO_File_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,7.44,23.68,45.22,51.35,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,7.11,24.48,38.87,48.75,52.55,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOO_File_Rheem2020Build50.csv b/test/ref/testDr_TOO_File_Rheem2020Build50.csv index e9f3fae7..201940b5 100644 --- a/test/ref/testDr_TOO_File_Rheem2020Build50.csv +++ b/test/ref/testDr_TOO_File_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,7.06,21.43,45.16,51.36,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,6.72,22.45,38.76,48.75,52.55,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOO_File_Rheem2020Prem40.csv b/test/ref/testDr_TOO_File_Rheem2020Prem40.csv index b6368bd4..525cf16b 100644 --- a/test/ref/testDr_TOO_File_Rheem2020Prem40.csv +++ b/test/ref/testDr_TOO_File_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,6.99,25.56,43.38,50.93,52.98,52.98,52.98,52.98,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,6.58,26.20,35.64,47.71,52.29,52.97,52.97,52.97,52.98 diff --git a/test/ref/testDr_TOO_File_Rheem2020Prem50.csv b/test/ref/testDr_TOO_File_Rheem2020Prem50.csv index 74a0c0cd..427d647d 100644 --- a/test/ref/testDr_TOO_File_Rheem2020Prem50.csv +++ b/test/ref/testDr_TOO_File_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,7.08,25.39,45.27,51.37,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,6.74,25.96,38.95,48.79,52.55,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOO_File_RheemHB50.csv b/test/ref/testDr_TOO_File_RheemHB50.csv index 6a33bc6b..d3aa9b05 100644 --- a/test/ref/testDr_TOO_File_RheemHB50.csv +++ b/test/ref/testDr_TOO_File_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,15.27,42.49,45.75,51.39,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,14.59,43.91,39.87,48.90,52.56,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOO_File_Sanden80.csv b/test/ref/testDr_TOO_File_Sanden80.csv index 182d787d..bdff31f9 100644 --- a/test/ref/testDr_TOO_File_Sanden80.csv +++ b/test/ref/testDr_TOO_File_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 20.000000, 65.000000, 15.000000, 2.000000, 6,16.23,72.09,58.97,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 2.000000, 2,16.23,72.09,52.95,64.99,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/testDr_TOO_File_Stiebel220e.csv b/test/ref/testDr_TOO_File_Stiebel220e.csv index 9ff1cac9..6a9e84cb 100644 --- a/test/ref/testDr_TOO_File_Stiebel220e.csv +++ b/test/ref/testDr_TOO_File_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,1.00,3.01,0.00,0.00,44.87,53.00,53.00,53.00,53.00,53.00,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,36.73,52.99,52.99,52.99,52.99,52.99,53.00 diff --git a/test/ref/testDr_TOO_Preset_AOSmithHPTS50.csv b/test/ref/testDr_TOO_Preset_AOSmithHPTS50.csv index d0865197..d567fa9a 100644 --- a/test/ref/testDr_TOO_Preset_AOSmithHPTS50.csv +++ b/test/ref/testDr_TOO_Preset_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,6.41,25.23,44.91,51.82,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,6.23,26.05,38.42,49.38,52.70,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOO_Preset_AOSmithHPTU80.csv b/test/ref/testDr_TOO_Preset_AOSmithHPTU80.csv index 2c8b7c32..04683443 100644 --- a/test/ref/testDr_TOO_Preset_AOSmithHPTU80.csv +++ b/test/ref/testDr_TOO_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,7.25,22.76,48.57,52.05,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,7.04,23.45,44.86,50.54,52.84,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOO_Preset_AOSmithPHPT60.csv b/test/ref/testDr_TOO_Preset_AOSmithPHPT60.csv index 649fbdce..fb3d914f 100644 --- a/test/ref/testDr_TOO_Preset_AOSmithPHPT60.csv +++ b/test/ref/testDr_TOO_Preset_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,16.39,39.90,0.00,0.00,47.18,51.77,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,15.91,41.12,0.00,0.00,42.36,49.82,52.73,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOO_Preset_GE502014.csv b/test/ref/testDr_TOO_Preset_GE502014.csv index 9b983879..eba5544a 100644 --- a/test/ref/testDr_TOO_Preset_GE502014.csv +++ b/test/ref/testDr_TOO_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,7.44,23.68,45.22,51.35,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,7.11,24.48,38.87,48.75,52.55,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOO_Preset_Rheem2020Build50.csv b/test/ref/testDr_TOO_Preset_Rheem2020Build50.csv index e9f3fae7..201940b5 100644 --- a/test/ref/testDr_TOO_Preset_Rheem2020Build50.csv +++ b/test/ref/testDr_TOO_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,7.06,21.43,45.16,51.36,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,6.72,22.45,38.76,48.75,52.55,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOO_Preset_Rheem2020Prem40.csv b/test/ref/testDr_TOO_Preset_Rheem2020Prem40.csv index b6368bd4..525cf16b 100644 --- a/test/ref/testDr_TOO_Preset_Rheem2020Prem40.csv +++ b/test/ref/testDr_TOO_Preset_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,6.99,25.56,43.38,50.93,52.98,52.98,52.98,52.98,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,6.58,26.20,35.64,47.71,52.29,52.97,52.97,52.97,52.98 diff --git a/test/ref/testDr_TOO_Preset_Rheem2020Prem50.csv b/test/ref/testDr_TOO_Preset_Rheem2020Prem50.csv index 74a0c0cd..427d647d 100644 --- a/test/ref/testDr_TOO_Preset_Rheem2020Prem50.csv +++ b/test/ref/testDr_TOO_Preset_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,7.08,25.39,45.27,51.37,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,6.74,25.96,38.95,48.79,52.55,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOO_Preset_RheemHB50.csv b/test/ref/testDr_TOO_Preset_RheemHB50.csv index 6a33bc6b..d3aa9b05 100644 --- a/test/ref/testDr_TOO_Preset_RheemHB50.csv +++ b/test/ref/testDr_TOO_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,0.00,0.00,0.00,0.00,15.27,42.49,45.75,51.39,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,14.59,43.91,39.87,48.90,52.56,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOO_Preset_Sanden80.csv b/test/ref/testDr_TOO_Preset_Sanden80.csv index 182d787d..bdff31f9 100644 --- a/test/ref/testDr_TOO_Preset_Sanden80.csv +++ b/test/ref/testDr_TOO_Preset_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 20.000000, 65.000000, 15.000000, 2.000000, 6,16.23,72.09,58.97,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 2.000000, 2,16.23,72.09,52.95,64.99,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/testDr_TOO_Preset_Stiebel220e.csv b/test/ref/testDr_TOO_Preset_Stiebel220e.csv index 9ff1cac9..6a9e84cb 100644 --- a/test/ref/testDr_TOO_Preset_Stiebel220e.csv +++ b/test/ref/testDr_TOO_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 6,1.00,3.01,0.00,0.00,44.87,53.00,53.00,53.00,53.00,53.00,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 2,0.00,0.00,0.00,0.00,36.73,52.99,52.99,52.99,52.99,52.99,53.00 diff --git a/test/ref/testDr_TOT_File_AOSmithHPTS50.csv b/test/ref/testDr_TOT_File_AOSmithHPTS50.csv index 310d5c82..84e4a87a 100644 --- a/test/ref/testDr_TOT_File_AOSmithHPTS50.csv +++ b/test/ref/testDr_TOT_File_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.66,51.33,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.81,48.61,52.54,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOT_File_AOSmithHPTU80.csv b/test/ref/testDr_TOT_File_AOSmithHPTU80.csv index a73fb60a..b2fa60c5 100644 --- a/test/ref/testDr_TOT_File_AOSmithHPTU80.csv +++ b/test/ref/testDr_TOT_File_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,48.19,52.03,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.15,50.46,52.84,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOT_File_AOSmithPHPT60.csv b/test/ref/testDr_TOT_File_AOSmithPHPT60.csv index fda72521..218a6996 100644 --- a/test/ref/testDr_TOT_File_AOSmithPHPT60.csv +++ b/test/ref/testDr_TOT_File_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.32,51.66,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,40.79,49.48,52.70,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOT_File_GE502014.csv b/test/ref/testDr_TOT_File_GE502014.csv index 403b7226..c904d4ba 100644 --- a/test/ref/testDr_TOT_File_GE502014.csv +++ b/test/ref/testDr_TOT_File_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.55,51.30,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOT_File_Rheem2020Build50.csv b/test/ref/testDr_TOT_File_Rheem2020Build50.csv index bc84e8e5..a2884a8c 100644 --- a/test/ref/testDr_TOT_File_Rheem2020Build50.csv +++ b/test/ref/testDr_TOT_File_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOT_File_Rheem2020Prem40.csv b/test/ref/testDr_TOT_File_Rheem2020Prem40.csv index 61fd8f9c..9a65fb26 100644 --- a/test/ref/testDr_TOT_File_Rheem2020Prem40.csv +++ b/test/ref/testDr_TOT_File_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.46,50.88,52.98,52.98,52.98,52.98,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.94,47.47,52.27,52.97,52.97,52.97,52.98 diff --git a/test/ref/testDr_TOT_File_Rheem2020Prem50.csv b/test/ref/testDr_TOT_File_Rheem2020Prem50.csv index b0c4f594..21f672db 100644 --- a/test/ref/testDr_TOT_File_Rheem2020Prem50.csv +++ b/test/ref/testDr_TOT_File_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOT_File_RheemHB50.csv b/test/ref/testDr_TOT_File_RheemHB50.csv index a989fa5d..69462629 100644 --- a/test/ref/testDr_TOT_File_RheemHB50.csv +++ b/test/ref/testDr_TOT_File_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.54,51.30,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOT_File_Sanden80.csv b/test/ref/testDr_TOT_File_Sanden80.csv index 9b75ce77..fbf4b8aa 100644 --- a/test/ref/testDr_TOT_File_Sanden80.csv +++ b/test/ref/testDr_TOT_File_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 20.000000, 65.000000, 15.000000, 2.000000, 0,0.00,0.00,57.78,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 2.000000, 0,0.00,0.00,50.57,64.99,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/testDr_TOT_File_Stiebel220e.csv b/test/ref/testDr_TOT_File_Stiebel220e.csv index ecdb76f6..cd9b8640 100644 --- a/test/ref/testDr_TOT_File_Stiebel220e.csv +++ b/test/ref/testDr_TOT_File_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,44.85,52.99,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,36.72,52.97,52.98,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOT_Preset_AOSmithHPTS50.csv b/test/ref/testDr_TOT_Preset_AOSmithHPTS50.csv index 310d5c82..84e4a87a 100644 --- a/test/ref/testDr_TOT_Preset_AOSmithHPTS50.csv +++ b/test/ref/testDr_TOT_Preset_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.66,51.33,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.81,48.61,52.54,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOT_Preset_AOSmithHPTU80.csv b/test/ref/testDr_TOT_Preset_AOSmithHPTU80.csv index a73fb60a..b2fa60c5 100644 --- a/test/ref/testDr_TOT_Preset_AOSmithHPTU80.csv +++ b/test/ref/testDr_TOT_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,48.19,52.03,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.15,50.46,52.84,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOT_Preset_AOSmithPHPT60.csv b/test/ref/testDr_TOT_Preset_AOSmithPHPT60.csv index fda72521..218a6996 100644 --- a/test/ref/testDr_TOT_Preset_AOSmithPHPT60.csv +++ b/test/ref/testDr_TOT_Preset_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.32,51.66,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,40.79,49.48,52.70,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOT_Preset_GE502014.csv b/test/ref/testDr_TOT_Preset_GE502014.csv index 403b7226..c904d4ba 100644 --- a/test/ref/testDr_TOT_Preset_GE502014.csv +++ b/test/ref/testDr_TOT_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,53.00,53.00,53.00,53.00,53.00, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.55,51.30,52.99,52.99,52.99,52.99,53.00 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.99,52.99,52.99,52.99 diff --git a/test/ref/testDr_TOT_Preset_Rheem2020Build50.csv b/test/ref/testDr_TOT_Preset_Rheem2020Build50.csv index bc84e8e5..a2884a8c 100644 --- a/test/ref/testDr_TOT_Preset_Rheem2020Build50.csv +++ b/test/ref/testDr_TOT_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOT_Preset_Rheem2020Prem40.csv b/test/ref/testDr_TOT_Preset_Rheem2020Prem40.csv index 61fd8f9c..9a65fb26 100644 --- a/test/ref/testDr_TOT_Preset_Rheem2020Prem40.csv +++ b/test/ref/testDr_TOT_Preset_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.46,50.88,52.98,52.98,52.98,52.98,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.94,47.47,52.27,52.97,52.97,52.97,52.98 diff --git a/test/ref/testDr_TOT_Preset_Rheem2020Prem50.csv b/test/ref/testDr_TOT_Preset_Rheem2020Prem50.csv index b0c4f594..21f672db 100644 --- a/test/ref/testDr_TOT_Preset_Rheem2020Prem50.csv +++ b/test/ref/testDr_TOT_Preset_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.31,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.64,48.56,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOT_Preset_RheemHB50.csv b/test/ref/testDr_TOT_Preset_RheemHB50.csv index a989fa5d..69462629 100644 --- a/test/ref/testDr_TOT_Preset_RheemHB50.csv +++ b/test/ref/testDr_TOT_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.54,51.30,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.61,48.55,52.53,52.98,52.98,52.98,52.99 diff --git a/test/ref/testDr_TOT_Preset_Sanden80.csv b/test/ref/testDr_TOT_Preset_Sanden80.csv index 9b75ce77..fbf4b8aa 100644 --- a/test/ref/testDr_TOT_Preset_Sanden80.csv +++ b/test/ref/testDr_TOT_Preset_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 20.000000, 65.000000, 15.000000, 2.000000, 0,0.00,0.00,57.78,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 2.000000, 0,0.00,0.00,50.57,64.99,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/testDr_TOT_Preset_Stiebel220e.csv b/test/ref/testDr_TOT_Preset_Stiebel220e.csv index ecdb76f6..cd9b8640 100644 --- a/test/ref/testDr_TOT_Preset_Stiebel220e.csv +++ b/test/ref/testDr_TOT_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 53.000000, 15.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,44.85,52.99,52.99,52.99,52.99,52.99,52.99 2, 20.000000, 53.000000, 15.000000, 2.000000, 0,0.00,0.00,0.00,0.00,36.72,52.97,52.98,52.98,52.98,52.98,52.99 diff --git a/test/ref/testLargeComp45_Preset_AOSmithCAHP120.csv b/test/ref/testLargeComp45_Preset_AOSmithCAHP120.csv index 05daf830..3bf7f9cf 100644 --- a/test/ref/testLargeComp45_Preset_AOSmithCAHP120.csv +++ b/test/ref/testLargeComp45_Preset_AOSmithCAHP120.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 65.555556, 4.444444, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,65.55,65.55,65.55,65.55,65.55,65.55, 1, 7.222300, 65.555556, 4.444444, 40.000000, 0,0.00,0.00,100.00,100.00,0.00,0.00,5.03,5.12,56.50,65.55,65.55,65.55,65.55 2, 7.222300, 65.555556, 4.444444, 40.000000, 0,0.00,0.00,100.00,100.00,0.00,0.00,4.98,5.02,5.05,5.13,47.58,65.54,65.55 diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_10_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_10_SP.csv index 61fd0962..49497b42 100644 --- a/test/ref/testLargeComp45_Preset_ColmacCxA_10_SP.csv +++ b/test/ref/testLargeComp45_Preset_ColmacCxA_10_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,31.89,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,6.64,57.13,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_15_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_15_SP.csv index ccc121b3..e3856897 100644 --- a/test/ref/testLargeComp45_Preset_ColmacCxA_15_SP.csv +++ b/test/ref/testLargeComp45_Preset_ColmacCxA_15_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,36.11,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,15.00,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_20_MP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_20_MP.csv index b464d741..e276fc42 100644 --- a/test/ref/testLargeComp45_Preset_ColmacCxA_20_MP.csv +++ b/test/ref/testLargeComp45_Preset_ColmacCxA_20_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_20_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_20_SP.csv index 95bd228d..660fa9ad 100644 --- a/test/ref/testLargeComp45_Preset_ColmacCxA_20_SP.csv +++ b/test/ref/testLargeComp45_Preset_ColmacCxA_20_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_25_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_25_SP.csv index 2b665835..17e4afd7 100644 --- a/test/ref/testLargeComp45_Preset_ColmacCxA_25_SP.csv +++ b/test/ref/testLargeComp45_Preset_ColmacCxA_25_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,44.55,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,31.89,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_30_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_30_SP.csv index b41b16fc..888129aa 100644 --- a/test/ref/testLargeComp45_Preset_ColmacCxA_30_SP.csv +++ b/test/ref/testLargeComp45_Preset_ColmacCxA_30_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,46.66,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,36.11,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_ColmacCxV_5_MP.csv b/test/ref/testLargeComp45_Preset_ColmacCxV_5_MP.csv index c0109430..aef75234 100644 --- a/test/ref/testLargeComp45_Preset_ColmacCxV_5_MP.csv +++ b/test/ref/testLargeComp45_Preset_ColmacCxV_5_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,4.45,46.65,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 36.124496, 42.332963, 9.000000, 0,89.93,244.36,36.36,36.37,36.39,36.39,36.39,36.39,57.22 diff --git a/test/ref/testLargeComp45_Preset_ColmacCxV_5_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxV_5_SP.csv index f01a1a31..2a3ac592 100644 --- a/test/ref/testLargeComp45_Preset_ColmacCxV_5_SP.csv +++ b/test/ref/testLargeComp45_Preset_ColmacCxV_5_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,4.44,46.66,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,95.81,241.70,4.44,4.44,37.76,57.21,57.21,57.21,57.22 diff --git a/test/ref/testLargeComp45_Preset_NyleC185A_C_SP.csv b/test/ref/testLargeComp45_Preset_NyleC185A_C_SP.csv index 4b2032d5..e322bd3e 100644 --- a/test/ref/testLargeComp45_Preset_NyleC185A_C_SP.csv +++ b/test/ref/testLargeComp45_Preset_NyleC185A_C_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_NyleC185A_SP.csv b/test/ref/testLargeComp45_Preset_NyleC185A_SP.csv index 038269e3..a057dfda 100644 --- a/test/ref/testLargeComp45_Preset_NyleC185A_SP.csv +++ b/test/ref/testLargeComp45_Preset_NyleC185A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_NyleC250A_C_MP.csv b/test/ref/testLargeComp45_Preset_NyleC250A_C_MP.csv index ae9278ef..04ffb6f3 100644 --- a/test/ref/testLargeComp45_Preset_NyleC250A_C_MP.csv +++ b/test/ref/testLargeComp45_Preset_NyleC250A_C_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,44.02,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,30.83,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_NyleC250A_C_SP.csv b/test/ref/testLargeComp45_Preset_NyleC250A_C_SP.csv index 3c983010..96009b82 100644 --- a/test/ref/testLargeComp45_Preset_NyleC250A_C_SP.csv +++ b/test/ref/testLargeComp45_Preset_NyleC250A_C_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_NyleC250A_MP.csv b/test/ref/testLargeComp45_Preset_NyleC250A_MP.csv index 0731ebb6..0ced5405 100644 --- a/test/ref/testLargeComp45_Preset_NyleC250A_MP.csv +++ b/test/ref/testLargeComp45_Preset_NyleC250A_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,44.02,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,30.83,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_NyleC250A_SP.csv b/test/ref/testLargeComp45_Preset_NyleC250A_SP.csv index 88a0db59..85b2c3bf 100644 --- a/test/ref/testLargeComp45_Preset_NyleC250A_SP.csv +++ b/test/ref/testLargeComp45_Preset_NyleC250A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_NyleC25A_SP.csv b/test/ref/testLargeComp45_Preset_NyleC25A_SP.csv index a1c98461..695778fc 100644 --- a/test/ref/testLargeComp45_Preset_NyleC25A_SP.csv +++ b/test/ref/testLargeComp45_Preset_NyleC25A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,4.44,46.66,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,50.45,88.78,4.44,4.44,36.71,57.21,57.21,57.21,57.22 diff --git a/test/ref/testLargeComp45_Preset_NyleC90A_C_MP.csv b/test/ref/testLargeComp45_Preset_NyleC90A_C_MP.csv index 5094e345..a3eb1f7d 100644 --- a/test/ref/testLargeComp45_Preset_NyleC90A_C_MP.csv +++ b/test/ref/testLargeComp45_Preset_NyleC90A_C_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,30.83,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,4.49,57.17,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_NyleC90A_C_SP.csv b/test/ref/testLargeComp45_Preset_NyleC90A_C_SP.csv index 5b2d7135..6cc91e60 100644 --- a/test/ref/testLargeComp45_Preset_NyleC90A_C_SP.csv +++ b/test/ref/testLargeComp45_Preset_NyleC90A_C_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,4.44,46.66,57.21,57.21,57.21,57.21,57.22 diff --git a/test/ref/testLargeComp45_Preset_NyleC90A_MP.csv b/test/ref/testLargeComp45_Preset_NyleC90A_MP.csv index c5bb0817..ca5769de 100644 --- a/test/ref/testLargeComp45_Preset_NyleC90A_MP.csv +++ b/test/ref/testLargeComp45_Preset_NyleC90A_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,30.83,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,4.49,57.17,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_NyleC90A_SP.csv b/test/ref/testLargeComp45_Preset_NyleC90A_SP.csv index 41b0b903..8ffb0dbf 100644 --- a/test/ref/testLargeComp45_Preset_NyleC90A_SP.csv +++ b/test/ref/testLargeComp45_Preset_NyleC90A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,4.44,46.66,57.21,57.21,57.21,57.21,57.22 diff --git a/test/ref/testLargeComp45_Preset_QAHV_N136TAU_HPB_SP.csv b/test/ref/testLargeComp45_Preset_QAHV_N136TAU_HPB_SP.csv index 25086959..0c30d3bb 100644 --- a/test/ref/testLargeComp45_Preset_QAHV_N136TAU_HPB_SP.csv +++ b/test/ref/testLargeComp45_Preset_QAHV_N136TAU_HPB_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 7.222300, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,35.93,65.00,65.00,65.00,65.00,65.00,65.00 2, 7.222300, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,6.97,64.90,65.00,65.00,65.00,65.00,65.00 diff --git a/test/ref/testLargeComp45_Preset_RheemHPHD135.csv b/test/ref/testLargeComp45_Preset_RheemHPHD135.csv index 80c145ad..65600833 100644 --- a/test/ref/testLargeComp45_Preset_RheemHPHD135.csv +++ b/test/ref/testLargeComp45_Preset_RheemHPHD135.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,31.89,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,6.60,57.17,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp45_Preset_RheemHPHD60.csv b/test/ref/testLargeComp45_Preset_RheemHPHD60.csv index 356fd376..b4df0aca 100644 --- a/test/ref/testLargeComp45_Preset_RheemHPHD60.csv +++ b/test/ref/testLargeComp45_Preset_RheemHPHD60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,6.59,57.18,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 40.371977, 43.043541, 17.400000, 0,67.90,203.29,40.44,40.46,40.54,40.54,40.54,40.54,57.22 diff --git a/test/ref/testLargeComp45_Preset_TamScalable_SP_Half.csv b/test/ref/testLargeComp45_Preset_TamScalable_SP_Half.csv index 9d65b68f..87c4e9bd 100644 --- a/test/ref/testLargeComp45_Preset_TamScalable_SP_Half.csv +++ b/test/ref/testLargeComp45_Preset_TamScalable_SP_Half.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222300, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,36.11,57.22,57.22,57.22,57.22,57.22,57.22 2, 7.222300, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,15.01,57.20,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_AOSmithCAHP120.csv b/test/ref/testLargeComp60_Preset_AOSmithCAHP120.csv index afa8ee8f..3cbf7d53 100644 --- a/test/ref/testLargeComp60_Preset_AOSmithCAHP120.csv +++ b/test/ref/testLargeComp60_Preset_AOSmithCAHP120.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.555556, 4.444444, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,65.55,65.55,65.55,65.55,65.55,65.55, 1, 15.555556, 65.555556, 4.444444, 40.000000, 0,0.00,0.00,0.00,0.00,34.22,178.37,5.54,5.57,56.51,65.55,65.55,65.55,65.55 2, 15.555556, 65.555556, 4.444444, 40.000000, 0,0.00,0.00,0.00,0.00,33.84,184.35,5.01,5.01,5.92,6.10,47.73,65.54,65.55 diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_10_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_10_SP.csv index 1b7423ca..b7d7d4c1 100644 --- a/test/ref/testLargeComp60_Preset_ColmacCxA_10_SP.csv +++ b/test/ref/testLargeComp60_Preset_ColmacCxA_10_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,31.89,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,6.64,57.13,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_15_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_15_SP.csv index 8834c518..800c9714 100644 --- a/test/ref/testLargeComp60_Preset_ColmacCxA_15_SP.csv +++ b/test/ref/testLargeComp60_Preset_ColmacCxA_15_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,36.11,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,15.00,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_20_MP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_20_MP.csv index 46b0077a..1d178eca 100644 --- a/test/ref/testLargeComp60_Preset_ColmacCxA_20_MP.csv +++ b/test/ref/testLargeComp60_Preset_ColmacCxA_20_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,25.56,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_20_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_20_SP.csv index fb85f5ce..fabb5ca1 100644 --- a/test/ref/testLargeComp60_Preset_ColmacCxA_20_SP.csv +++ b/test/ref/testLargeComp60_Preset_ColmacCxA_20_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_25_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_25_SP.csv index f965bbc2..b013c172 100644 --- a/test/ref/testLargeComp60_Preset_ColmacCxA_25_SP.csv +++ b/test/ref/testLargeComp60_Preset_ColmacCxA_25_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,44.55,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,31.89,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_30_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_30_SP.csv index 55288f25..8b03846e 100644 --- a/test/ref/testLargeComp60_Preset_ColmacCxA_30_SP.csv +++ b/test/ref/testLargeComp60_Preset_ColmacCxA_30_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,46.66,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,36.11,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_ColmacCxV_5_MP.csv b/test/ref/testLargeComp60_Preset_ColmacCxV_5_MP.csv index ae3f78dc..24eee919 100644 --- a/test/ref/testLargeComp60_Preset_ColmacCxV_5_MP.csv +++ b/test/ref/testLargeComp60_Preset_ColmacCxV_5_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,4.45,46.65,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 36.129456, 43.506163, 9.000000, 0,90.57,290.35,36.41,36.42,36.45,36.45,36.45,36.45,57.22 diff --git a/test/ref/testLargeComp60_Preset_ColmacCxV_5_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxV_5_SP.csv index 4990dad3..83cff304 100644 --- a/test/ref/testLargeComp60_Preset_ColmacCxV_5_SP.csv +++ b/test/ref/testLargeComp60_Preset_ColmacCxV_5_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,4.45,46.66,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,97.55,287.58,4.45,4.45,38.08,57.21,57.21,57.21,57.22 diff --git a/test/ref/testLargeComp60_Preset_NyleC185A_C_SP.csv b/test/ref/testLargeComp60_Preset_NyleC185A_C_SP.csv index f8b60134..c8b33193 100644 --- a/test/ref/testLargeComp60_Preset_NyleC185A_C_SP.csv +++ b/test/ref/testLargeComp60_Preset_NyleC185A_C_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_NyleC185A_SP.csv b/test/ref/testLargeComp60_Preset_NyleC185A_SP.csv index 193c7f2e..05c949c4 100644 --- a/test/ref/testLargeComp60_Preset_NyleC185A_SP.csv +++ b/test/ref/testLargeComp60_Preset_NyleC185A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_NyleC250A_C_MP.csv b/test/ref/testLargeComp60_Preset_NyleC250A_C_MP.csv index 72f2cfaf..f675211c 100644 --- a/test/ref/testLargeComp60_Preset_NyleC250A_C_MP.csv +++ b/test/ref/testLargeComp60_Preset_NyleC250A_C_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,44.03,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,30.83,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_NyleC250A_C_SP.csv b/test/ref/testLargeComp60_Preset_NyleC250A_C_SP.csv index 093d5a13..fb84b8a3 100644 --- a/test/ref/testLargeComp60_Preset_NyleC250A_C_SP.csv +++ b/test/ref/testLargeComp60_Preset_NyleC250A_C_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_NyleC250A_MP.csv b/test/ref/testLargeComp60_Preset_NyleC250A_MP.csv index 365b998c..2554ca3a 100644 --- a/test/ref/testLargeComp60_Preset_NyleC250A_MP.csv +++ b/test/ref/testLargeComp60_Preset_NyleC250A_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,44.03,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,30.83,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_NyleC250A_SP.csv b/test/ref/testLargeComp60_Preset_NyleC250A_SP.csv index 8bcd669e..02be9bfa 100644 --- a/test/ref/testLargeComp60_Preset_NyleC250A_SP.csv +++ b/test/ref/testLargeComp60_Preset_NyleC250A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,41.39,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_NyleC25A_SP.csv b/test/ref/testLargeComp60_Preset_NyleC25A_SP.csv index 0cb9d4a3..7983e363 100644 --- a/test/ref/testLargeComp60_Preset_NyleC25A_SP.csv +++ b/test/ref/testLargeComp60_Preset_NyleC25A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,4.45,46.66,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,48.80,111.97,4.45,4.45,36.87,57.21,57.21,57.21,57.22 diff --git a/test/ref/testLargeComp60_Preset_NyleC90A_C_MP.csv b/test/ref/testLargeComp60_Preset_NyleC90A_C_MP.csv index 86895da4..7ed22ada 100644 --- a/test/ref/testLargeComp60_Preset_NyleC90A_C_MP.csv +++ b/test/ref/testLargeComp60_Preset_NyleC90A_C_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,30.83,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,4.49,57.17,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_NyleC90A_C_SP.csv b/test/ref/testLargeComp60_Preset_NyleC90A_C_SP.csv index 103b6bef..1f94f3f4 100644 --- a/test/ref/testLargeComp60_Preset_NyleC90A_C_SP.csv +++ b/test/ref/testLargeComp60_Preset_NyleC90A_C_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,4.45,46.66,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_NyleC90A_MP.csv b/test/ref/testLargeComp60_Preset_NyleC90A_MP.csv index 48cef1ba..988af8e0 100644 --- a/test/ref/testLargeComp60_Preset_NyleC90A_MP.csv +++ b/test/ref/testLargeComp60_Preset_NyleC90A_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,30.83,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,4.49,57.17,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_NyleC90A_SP.csv b/test/ref/testLargeComp60_Preset_NyleC90A_SP.csv index 5d78cf30..4a69d6eb 100644 --- a/test/ref/testLargeComp60_Preset_NyleC90A_SP.csv +++ b/test/ref/testLargeComp60_Preset_NyleC90A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,25.55,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,4.45,46.66,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_QAHV_N136TAU_HPB_SP.csv b/test/ref/testLargeComp60_Preset_QAHV_N136TAU_HPB_SP.csv index c2e2cdb7..81002a4e 100644 --- a/test/ref/testLargeComp60_Preset_QAHV_N136TAU_HPB_SP.csv +++ b/test/ref/testLargeComp60_Preset_QAHV_N136TAU_HPB_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,35.93,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,6.97,64.90,65.00,65.00,65.00,65.00,65.00 diff --git a/test/ref/testLargeComp60_Preset_RheemHPHD135.csv b/test/ref/testLargeComp60_Preset_RheemHPHD135.csv index 4be6b211..de165b30 100644 --- a/test/ref/testLargeComp60_Preset_RheemHPHD135.csv +++ b/test/ref/testLargeComp60_Preset_RheemHPHD135.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,31.89,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,6.60,57.18,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeComp60_Preset_RheemHPHD60.csv b/test/ref/testLargeComp60_Preset_RheemHPHD60.csv index 899df8eb..f764be12 100644 --- a/test/ref/testLargeComp60_Preset_RheemHPHD60.csv +++ b/test/ref/testLargeComp60_Preset_RheemHPHD60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,6.59,57.18,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 40.385432, 43.783084, 17.400000, 0,69.88,258.55,40.47,40.50,40.60,40.60,40.60,40.60,57.22 diff --git a/test/ref/testLargeComp60_Preset_TamScalable_SP_Half.csv b/test/ref/testLargeComp60_Preset_TamScalable_SP_Half.csv index 1a010d39..6b7b01f5 100644 --- a/test/ref/testLargeComp60_Preset_TamScalable_SP_Half.csv +++ b/test/ref/testLargeComp60_Preset_TamScalable_SP_Half.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,36.11,57.22,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,15.01,57.20,57.22,57.22,57.22,57.22,57.22 diff --git a/test/ref/testLargeCompHot_Preset_AOSmithCAHP120.csv b/test/ref/testLargeCompHot_Preset_AOSmithCAHP120.csv index 26413cf2..a4cfd1a1 100644 --- a/test/ref/testLargeCompHot_Preset_AOSmithCAHP120.csv +++ b/test/ref/testLargeCompHot_Preset_AOSmithCAHP120.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,0.00,0.00,34.21,178.42,5.54,5.57,56.04,64.99,64.99,64.99,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,0.00,0.00,33.84,184.35,5.01,5.01,5.92,6.10,47.34,64.99,64.99 diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_10_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_10_SP.csv index a0a9f596..75767f8a 100644 --- a/test/ref/testLargeCompHot_Preset_ColmacCxA_10_SP.csv +++ b/test/ref/testLargeCompHot_Preset_ColmacCxA_10_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,35.93,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,6.97,64.89,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_15_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_15_SP.csv index 6a45c82f..ffc5ed8f 100644 --- a/test/ref/testLargeCompHot_Preset_ColmacCxA_15_SP.csv +++ b/test/ref/testLargeCompHot_Preset_ColmacCxA_15_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,40.77,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,16.55,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_20_MP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_20_MP.csv index df0ddcef..a315191f 100644 --- a/test/ref/testLargeCompHot_Preset_ColmacCxA_20_MP.csv +++ b/test/ref/testLargeCompHot_Preset_ColmacCxA_20_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,46.83,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,28.67,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_20_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_20_SP.csv index 1c8e21bf..5f5842db 100644 --- a/test/ref/testLargeCompHot_Preset_ColmacCxA_20_SP.csv +++ b/test/ref/testLargeCompHot_Preset_ColmacCxA_20_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,46.83,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,28.66,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_25_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_25_SP.csv index 32dba0f6..5a34dd77 100644 --- a/test/ref/testLargeCompHot_Preset_ColmacCxA_25_SP.csv +++ b/test/ref/testLargeCompHot_Preset_ColmacCxA_25_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,50.46,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,35.93,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_30_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_30_SP.csv index 420f4232..6c72c1f8 100644 --- a/test/ref/testLargeCompHot_Preset_ColmacCxA_30_SP.csv +++ b/test/ref/testLargeCompHot_Preset_ColmacCxA_30_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,52.89,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,40.77,65.00,65.00,65.00,65.00,65.00,65.00 diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxV_5_MP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxV_5_MP.csv index 70c26717..b8f09432 100644 --- a/test/ref/testLargeCompHot_Preset_ColmacCxV_5_MP.csv +++ b/test/ref/testLargeCompHot_Preset_ColmacCxV_5_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,4.45,46.65,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 36.129456, 43.506163, 9.000000, 0,90.57,290.35,36.41,36.42,36.45,36.45,36.45,36.45,57.22 diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxV_5_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxV_5_SP.csv index 16fe4ff4..842da84f 100644 --- a/test/ref/testLargeCompHot_Preset_ColmacCxV_5_SP.csv +++ b/test/ref/testLargeCompHot_Preset_ColmacCxV_5_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 57.222222, 4.444444, 0.000000, 0,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 15.555556, 57.222222, 4.444444, 40.000000, 0,0.00,0.00,4.45,46.66,57.22,57.22,57.22,57.22,57.22 2, 15.555556, 57.222222, 4.444444, 40.000000, 0,97.55,287.58,4.45,4.45,38.08,57.21,57.21,57.21,57.22 diff --git a/test/ref/testLargeCompHot_Preset_NyleC185A_C_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC185A_C_SP.csv index 17e7c3e1..e50a7940 100644 --- a/test/ref/testLargeCompHot_Preset_NyleC185A_C_SP.csv +++ b/test/ref/testLargeCompHot_Preset_NyleC185A_C_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,46.83,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,28.66,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_NyleC185A_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC185A_SP.csv index d1bd41ba..0b4ad468 100644 --- a/test/ref/testLargeCompHot_Preset_NyleC185A_SP.csv +++ b/test/ref/testLargeCompHot_Preset_NyleC185A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,46.83,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,28.66,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_NyleC250A_C_MP.csv b/test/ref/testLargeCompHot_Preset_NyleC250A_C_MP.csv index 83bf0fe3..c49bf358 100644 --- a/test/ref/testLargeCompHot_Preset_NyleC250A_C_MP.csv +++ b/test/ref/testLargeCompHot_Preset_NyleC250A_C_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,49.86,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,34.72,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_NyleC250A_C_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC250A_C_SP.csv index 4fc656d1..06b4fb63 100644 --- a/test/ref/testLargeCompHot_Preset_NyleC250A_C_SP.csv +++ b/test/ref/testLargeCompHot_Preset_NyleC250A_C_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,46.83,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,28.66,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_NyleC250A_MP.csv b/test/ref/testLargeCompHot_Preset_NyleC250A_MP.csv index 31ce939d..45d37f0a 100644 --- a/test/ref/testLargeCompHot_Preset_NyleC250A_MP.csv +++ b/test/ref/testLargeCompHot_Preset_NyleC250A_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,49.86,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,34.72,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_NyleC250A_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC250A_SP.csv index 0a504cfd..5658cb48 100644 --- a/test/ref/testLargeCompHot_Preset_NyleC250A_SP.csv +++ b/test/ref/testLargeCompHot_Preset_NyleC250A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,46.83,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,28.66,64.99,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_NyleC25A_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC25A_SP.csv index 63c65d0b..cefe9a68 100644 --- a/test/ref/testLargeCompHot_Preset_NyleC25A_SP.csv +++ b/test/ref/testLargeCompHot_Preset_NyleC25A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,4.45,52.88,64.99,64.99,64.99,64.99,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,52.57,111.20,4.45,4.45,41.53,64.99,64.99,64.99,64.99 diff --git a/test/ref/testLargeCompHot_Preset_NyleC90A_C_MP.csv b/test/ref/testLargeCompHot_Preset_NyleC90A_C_MP.csv index cc73fd8f..8b4b8002 100644 --- a/test/ref/testLargeCompHot_Preset_NyleC90A_C_MP.csv +++ b/test/ref/testLargeCompHot_Preset_NyleC90A_C_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,34.72,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,4.50,64.94,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_NyleC90A_C_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC90A_C_SP.csv index 8dcd0c57..873e705f 100644 --- a/test/ref/testLargeCompHot_Preset_NyleC90A_C_SP.csv +++ b/test/ref/testLargeCompHot_Preset_NyleC90A_C_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,28.66,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,4.45,52.88,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_NyleC90A_MP.csv b/test/ref/testLargeCompHot_Preset_NyleC90A_MP.csv index c87a3cfa..cf840363 100644 --- a/test/ref/testLargeCompHot_Preset_NyleC90A_MP.csv +++ b/test/ref/testLargeCompHot_Preset_NyleC90A_MP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,34.72,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,4.50,64.94,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_NyleC90A_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC90A_SP.csv index 44faac81..80478eed 100644 --- a/test/ref/testLargeCompHot_Preset_NyleC90A_SP.csv +++ b/test/ref/testLargeCompHot_Preset_NyleC90A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,28.66,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,4.45,52.88,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_QAHV_N136TAU_HPB_SP.csv b/test/ref/testLargeCompHot_Preset_QAHV_N136TAU_HPB_SP.csv index b5492469..655a2d43 100644 --- a/test/ref/testLargeCompHot_Preset_QAHV_N136TAU_HPB_SP.csv +++ b/test/ref/testLargeCompHot_Preset_QAHV_N136TAU_HPB_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,35.93,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,6.97,64.90,65.00,65.00,65.00,65.00,65.00 diff --git a/test/ref/testLargeCompHot_Preset_RheemHPHD135.csv b/test/ref/testLargeCompHot_Preset_RheemHPHD135.csv index df88af4e..5d7fbc14 100644 --- a/test/ref/testLargeCompHot_Preset_RheemHPHD135.csv +++ b/test/ref/testLargeCompHot_Preset_RheemHPHD135.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,35.93,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,6.91,64.95,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLargeCompHot_Preset_RheemHPHD60.csv b/test/ref/testLargeCompHot_Preset_RheemHPHD60.csv index 59f31e53..4201182d 100644 --- a/test/ref/testLargeCompHot_Preset_RheemHPHD60.csv +++ b/test/ref/testLargeCompHot_Preset_RheemHPHD60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,condenserInletT,condenserOutletT,externalVolGPM,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0.000000, 0.000000, 0.000000, 0,0.00,0.00,6.90,64.96,64.99,64.99,64.99,64.99,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 45.673396, 49.072561, 17.400000, 0,77.74,258.66,45.76,45.79,45.89,45.89,45.89,45.89,64.99 diff --git a/test/ref/testLargeCompHot_Preset_TamScalable_SP_Half.csv b/test/ref/testLargeCompHot_Preset_TamScalable_SP_Half.csv index 6b8504ba..1b9dfd84 100644 --- a/test/ref/testLargeCompHot_Preset_TamScalable_SP_Half.csv +++ b/test/ref/testLargeCompHot_Preset_TamScalable_SP_Half.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 15.555556, 65.000000, 4.444444, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,40.77,65.00,65.00,65.00,65.00,65.00,65.00 2, 15.555556, 65.000000, 4.444444, 40.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,16.57,64.98,64.99,64.99,64.99,64.99,65.00 diff --git a/test/ref/testLockout_File_AOSmithHPTU80.csv b/test/ref/testLockout_File_AOSmithHPTU80.csv index 8b542515..872f7dda 100644 --- a/test/ref/testLockout_File_AOSmithHPTU80.csv +++ b/test/ref/testLockout_File_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222222, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 7.222222, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,47.55,51.90,52.99,52.99,52.99,52.99,52.99 2, 7.222222, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.98,50.12,52.82,52.98,52.98,52.98,52.99 diff --git a/test/ref/testLockout_File_AOSmithPHPT60.csv b/test/ref/testLockout_File_AOSmithPHPT60.csv index 77ef66da..35a86a28 100644 --- a/test/ref/testLockout_File_AOSmithPHPT60.csv +++ b/test/ref/testLockout_File_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.888889, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 8.888889, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,45.44,51.48,52.99,52.99,52.99,52.99,52.99 2, 8.888889, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,39.18,49.01,52.66,52.98,52.98,52.98,52.99 diff --git a/test/ref/testLockout_File_GE502014.csv b/test/ref/testLockout_File_GE502014.csv index 6d5ad32d..77564b0f 100644 --- a/test/ref/testLockout_File_GE502014.csv +++ b/test/ref/testLockout_File_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 4.444444, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 4.444444, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.43,51.08,52.98,52.99,52.99,52.99,52.99 2, 4.444444, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.58,47.96,52.47,52.98,52.98,52.98,52.99 diff --git a/test/ref/testLockout_File_RheemHB50.csv b/test/ref/testLockout_File_RheemHB50.csv index 0b1259de..c6dc771b 100644 --- a/test/ref/testLockout_File_RheemHB50.csv +++ b/test/ref/testLockout_File_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 6.111111, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 6.111111, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.43,51.08,52.98,52.99,52.99,52.99,52.99 2, 6.111111, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.58,47.96,52.46,52.98,52.98,52.98,52.99 diff --git a/test/ref/testLockout_File_Stiebel220e.csv b/test/ref/testLockout_File_Stiebel220e.csv index 4dcc2956..2ac4cf8c 100644 --- a/test/ref/testLockout_File_Stiebel220e.csv +++ b/test/ref/testLockout_File_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 1.666667, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 1.666667, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,43.77,52.98,52.98,52.98,52.98,52.98,52.99 2, 1.666667, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,34.56,52.96,52.98,52.98,52.98,52.98,52.98 diff --git a/test/ref/testLockout_Preset_AOSmithHPTU80.csv b/test/ref/testLockout_Preset_AOSmithHPTU80.csv index 8b542515..872f7dda 100644 --- a/test/ref/testLockout_Preset_AOSmithHPTU80.csv +++ b/test/ref/testLockout_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 7.222222, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 7.222222, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,47.55,51.90,52.99,52.99,52.99,52.99,52.99 2, 7.222222, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.98,50.12,52.82,52.98,52.98,52.98,52.99 diff --git a/test/ref/testLockout_Preset_AOSmithPHPT60.csv b/test/ref/testLockout_Preset_AOSmithPHPT60.csv index 77ef66da..35a86a28 100644 --- a/test/ref/testLockout_Preset_AOSmithPHPT60.csv +++ b/test/ref/testLockout_Preset_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 8.888889, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 8.888889, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,45.44,51.48,52.99,52.99,52.99,52.99,52.99 2, 8.888889, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,39.18,49.01,52.66,52.98,52.98,52.98,52.99 diff --git a/test/ref/testLockout_Preset_GE502014.csv b/test/ref/testLockout_Preset_GE502014.csv index 6d5ad32d..77564b0f 100644 --- a/test/ref/testLockout_Preset_GE502014.csv +++ b/test/ref/testLockout_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 4.444444, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 4.444444, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.43,51.08,52.98,52.99,52.99,52.99,52.99 2, 4.444444, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.58,47.96,52.47,52.98,52.98,52.98,52.99 diff --git a/test/ref/testLockout_Preset_RheemHB50.csv b/test/ref/testLockout_Preset_RheemHB50.csv index 0b1259de..c6dc771b 100644 --- a/test/ref/testLockout_Preset_RheemHB50.csv +++ b/test/ref/testLockout_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 6.111111, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 6.111111, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.43,51.08,52.98,52.99,52.99,52.99,52.99 2, 6.111111, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.58,47.96,52.46,52.98,52.98,52.98,52.99 diff --git a/test/ref/testLockout_Preset_Stiebel220e.csv b/test/ref/testLockout_Preset_Stiebel220e.csv index 4dcc2956..2ac4cf8c 100644 --- a/test/ref/testLockout_Preset_Stiebel220e.csv +++ b/test/ref/testLockout_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 1.666667, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 1.666667, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,43.77,52.98,52.98,52.98,52.98,52.98,52.99 2, 1.666667, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,34.56,52.96,52.98,52.98,52.98,52.98,52.98 diff --git a/test/ref/testREGoesTo93CCold_Preset_AOSmithCAHP120.csv b/test/ref/testREGoesTo93CCold_Preset_AOSmithCAHP120.csv index 0f1155a9..cdb98499 100644 --- a/test/ref/testREGoesTo93CCold_Preset_AOSmithCAHP120.csv +++ b/test/ref/testREGoesTo93CCold_Preset_AOSmithCAHP120.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 59.000000, 20.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,65.55,65.55,65.55,65.55,65.55,65.55, 1, 0.000000, 59.000000, 20.000000, 20.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,20.04,62.15,65.55,65.55,65.55,65.55,65.55 2, 0.000000, 59.000000, 20.000000, 20.000000, 0,0.00,0.00,100.00,100.00,0.00,0.00,20.59,20.69,58.77,65.54,65.54,65.54,65.55 diff --git a/test/ref/testREGoesTo93CCold_Preset_AOSmithHPTU80.csv b/test/ref/testREGoesTo93CCold_Preset_AOSmithHPTU80.csv index ce1c155c..afbe4906 100644 --- a/test/ref/testREGoesTo93CCold_Preset_AOSmithHPTU80.csv +++ b/test/ref/testREGoesTo93CCold_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 59.000000, 20.000000, 0.000000, 0,0.00,0.00,75.00,75.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99, 1, 0.000000, 59.000000, 20.000000, 20.000000, 0,0.00,0.00,75.00,75.00,0.00,0.00,23.54,33.71,52.97,52.98,52.98,52.98,52.99 2, 0.000000, 59.000000, 20.000000, 20.000000, 0,0.00,0.00,75.00,75.00,0.00,0.00,21.15,21.86,23.57,47.89,52.98,52.98,52.98 diff --git a/test/ref/testREGoesTo93CCold_Preset_GE502014.csv b/test/ref/testREGoesTo93CCold_Preset_GE502014.csv index 110f606c..4d3c772c 100644 --- a/test/ref/testREGoesTo93CCold_Preset_GE502014.csv +++ b/test/ref/testREGoesTo93CCold_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 59.000000, 20.000000, 0.000000, 0,0.00,0.00,66.67,66.67,0.00,0.00,52.95,53.14,53.14,53.14,53.14,53.14, 1, 0.000000, 59.000000, 20.000000, 20.000000, 0,0.00,0.00,66.67,66.67,0.00,0.00,20.40,21.10,31.46,53.06,53.13,53.13,53.14 2, 0.000000, 59.000000, 20.000000, 20.000000, 0,0.00,0.00,66.67,66.67,0.00,0.00,20.38,20.76,20.76,20.88,21.11,42.06,53.12 diff --git a/test/ref/testREGoesTo93CCold_Preset_Rheem2020Build50.csv b/test/ref/testREGoesTo93CCold_Preset_Rheem2020Build50.csv index 87171c9a..e102f8b9 100644 --- a/test/ref/testREGoesTo93CCold_Preset_Rheem2020Build50.csv +++ b/test/ref/testREGoesTo93CCold_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 59.000000, 20.000000, 0.000000, 0,0.00,0.00,75.00,75.00,0.00,0.00,53.15,53.15,53.15,53.15,53.15,53.15, 1, 0.000000, 59.000000, 20.000000, 20.000000, 0,0.00,0.00,75.00,75.00,0.00,0.00,20.92,20.92,31.69,53.13,53.14,53.14,53.15 2, 0.000000, 59.000000, 20.000000, 20.000000, 0,75.00,75.00,0.00,0.00,0.00,0.00,19.99,20.00,20.31,20.91,23.21,42.58,53.14 diff --git a/test/ref/testREGoesTo93CCold_Preset_RheemHB50.csv b/test/ref/testREGoesTo93CCold_Preset_RheemHB50.csv index 48e67b50..cfa331f4 100644 --- a/test/ref/testREGoesTo93CCold_Preset_RheemHB50.csv +++ b/test/ref/testREGoesTo93CCold_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 59.000000, 20.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 0.000000, 59.000000, 20.000000, 20.000000, 0,0.00,0.00,37.50,37.50,0.00,0.00,20.46,20.46,31.14,52.75,52.76,52.76,52.77 2, 0.000000, 59.000000, 20.000000, 20.000000, 0,70.00,70.00,0.00,0.00,0.00,0.00,20.00,20.00,20.15,20.46,22.61,41.87,52.76 diff --git a/test/ref/testREGoesTo93CCold_Preset_Stiebel220e.csv b/test/ref/testREGoesTo93CCold_Preset_Stiebel220e.csv index 93bf9210..58984f95 100644 --- a/test/ref/testREGoesTo93CCold_Preset_Stiebel220e.csv +++ b/test/ref/testREGoesTo93CCold_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 59.000000, 20.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 0.000000, 59.000000, 20.000000, 20.000000, 0,7.75,17.71,0.00,0.00,20.14,20.31,48.06,52.76,52.76,52.76,52.77 2, 0.000000, 59.000000, 20.000000, 20.000000, 0,7.11,18.10,0.00,0.00,20.06,20.12,20.22,20.44,43.42,52.74,52.76 diff --git a/test/ref/testREGoesTo93CCold_Preset_TamScalable_SP.csv b/test/ref/testREGoesTo93CCold_Preset_TamScalable_SP.csv index c6a915c9..1b94669f 100644 --- a/test/ref/testREGoesTo93CCold_Preset_TamScalable_SP.csv +++ b/test/ref/testREGoesTo93CCold_Preset_TamScalable_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 0.000000, 59.000000, 20.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 0.000000, 59.000000, 20.000000, 20.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,49.77,57.22,57.22,57.22,57.22,57.22,57.22 2, 0.000000, 59.000000, 20.000000, 20.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.33,57.21,57.21,57.21,57.21,57.21,57.22 diff --git a/test/ref/testREGoesTo93C_Preset_AOSmithCAHP120.csv b/test/ref/testREGoesTo93C_Preset_AOSmithCAHP120.csv index f43af2c3..e71a8251 100644 --- a/test/ref/testREGoesTo93C_Preset_AOSmithCAHP120.csv +++ b/test/ref/testREGoesTo93C_Preset_AOSmithCAHP120.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,65.55,65.55,65.55,65.55,65.55,65.55, 1, 30.000000, 59.000000, 30.000000, 20.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,30.03,62.90,65.55,65.55,65.55,65.55,65.55 2, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,30.06,62.87,65.55,65.55,65.55,65.55, diff --git a/test/ref/testREGoesTo93C_Preset_AOSmithHPTU80.csv b/test/ref/testREGoesTo93C_Preset_AOSmithHPTU80.csv index 555c1dc7..51bf6b9f 100644 --- a/test/ref/testREGoesTo93C_Preset_AOSmithHPTU80.csv +++ b/test/ref/testREGoesTo93C_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,7.49,21.90,52.84,52.84,52.84,52.84,52.84,52.84, 1, 30.000000, 59.000000, 30.000000, 20.000000, 0,0.00,0.00,0.00,0.00,5.99,25.66,32.13,39.36,52.83,52.84,52.84,52.84,52.84 2, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.02,25.63,32.41,39.52,52.82,52.84,52.84,52.84, diff --git a/test/ref/testREGoesTo93C_Preset_GE502014.csv b/test/ref/testREGoesTo93C_Preset_GE502014.csv index f60f33b1..223460f5 100644 --- a/test/ref/testREGoesTo93C_Preset_GE502014.csv +++ b/test/ref/testREGoesTo93C_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,7.81,22.61,52.89,52.89,52.89,52.89,52.89,52.89, 1, 30.000000, 59.000000, 30.000000, 20.000000, 0,0.00,0.00,0.00,0.00,6.10,25.84,30.31,30.31,37.81,52.88,52.89,52.89,52.89 2, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.13,25.82,30.61,30.61,37.98,52.87,52.89,52.89, diff --git a/test/ref/testREGoesTo93C_Preset_Rheem2020Build50.csv b/test/ref/testREGoesTo93C_Preset_Rheem2020Build50.csv index ca22d185..369717e6 100644 --- a/test/ref/testREGoesTo93C_Preset_Rheem2020Build50.csv +++ b/test/ref/testREGoesTo93C_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,7.44,20.24,52.87,52.88,52.88,52.88,52.88,52.88, 1, 30.000000, 59.000000, 30.000000, 20.000000, 0,0.00,0.00,0.00,0.00,5.58,25.54,30.30,30.30,37.94,52.87,52.88,52.88,52.88 2, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,5.59,25.49,30.59,30.59,38.11,52.86,52.88,52.88, diff --git a/test/ref/testREGoesTo93C_Preset_RheemHB50.csv b/test/ref/testREGoesTo93C_Preset_RheemHB50.csv index 12b20280..0fe3cc1b 100644 --- a/test/ref/testREGoesTo93C_Preset_RheemHB50.csv +++ b/test/ref/testREGoesTo93C_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 30.000000, 59.000000, 30.000000, 20.000000, 0,0.00,0.00,0.00,0.00,12.38,46.43,30.55,30.55,37.90,52.77,52.78,52.78,52.77 2, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,12.47,46.39,31.09,31.09,38.22,52.76,52.78,52.78, diff --git a/test/ref/testREGoesTo93C_Preset_Stiebel220e.csv b/test/ref/testREGoesTo93C_Preset_Stiebel220e.csv index d7e0ecf3..0cc15aaf 100644 --- a/test/ref/testREGoesTo93C_Preset_Stiebel220e.csv +++ b/test/ref/testREGoesTo93C_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.77,52.77,52.77,52.77,52.77,52.77, 1, 30.000000, 59.000000, 30.000000, 20.000000, 0,9.51,38.70,0.00,0.00,30.29,30.60,49.54,52.78,52.78,52.78,52.77 2, 30.000000, 59.000000, 30.000000, 0.000000, 0,9.54,38.58,0.00,0.00,30.59,31.20,49.56,52.79,52.79,52.79, diff --git a/test/ref/testREGoesTo93C_Preset_TamScalable_SP.csv b/test/ref/testREGoesTo93C_Preset_TamScalable_SP.csv index eae05ca8..59d08a84 100644 --- a/test/ref/testREGoesTo93C_Preset_TamScalable_SP.csv +++ b/test/ref/testREGoesTo93C_Preset_TamScalable_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,57.22,57.22,57.22,57.22,57.22,57.22, 1, 30.000000, 59.000000, 30.000000, 20.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,51.78,57.22,57.22,57.22,57.22,57.22,57.22 2, 30.000000, 59.000000, 30.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,51.77,57.22,57.22,57.22,57.22,57.22, diff --git a/test/ref/testSandenCombi_File_AOSmithHPTS50.csv b/test/ref/testSandenCombi_File_AOSmithHPTS50.csv index 7a670b15..cf9542eb 100644 --- a/test/ref/testSandenCombi_File_AOSmithHPTS50.csv +++ b/test/ref/testSandenCombi_File_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.97,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_File_AOSmithHPTU80.csv b/test/ref/testSandenCombi_File_AOSmithHPTU80.csv index 79444dd3..08bed8a2 100644 --- a/test/ref/testSandenCombi_File_AOSmithHPTU80.csv +++ b/test/ref/testSandenCombi_File_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, diff --git a/test/ref/testSandenCombi_File_AOSmithPHPT60.csv b/test/ref/testSandenCombi_File_AOSmithPHPT60.csv index 6f7bd769..2deb19c1 100644 --- a/test/ref/testSandenCombi_File_AOSmithPHPT60.csv +++ b/test/ref/testSandenCombi_File_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_File_GE502014.csv b/test/ref/testSandenCombi_File_GE502014.csv index 1e347237..9e4ec8d7 100644 --- a/test/ref/testSandenCombi_File_GE502014.csv +++ b/test/ref/testSandenCombi_File_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.97,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_File_Rheem2020Build50.csv b/test/ref/testSandenCombi_File_Rheem2020Build50.csv index ece5c13b..647eaa1c 100644 --- a/test/ref/testSandenCombi_File_Rheem2020Build50.csv +++ b/test/ref/testSandenCombi_File_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.98,64.98,64.98,64.98,64.98, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.96,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_File_Rheem2020Prem40.csv b/test/ref/testSandenCombi_File_Rheem2020Prem40.csv index 9f4b830f..3b05a78c 100644 --- a/test/ref/testSandenCombi_File_Rheem2020Prem40.csv +++ b/test/ref/testSandenCombi_File_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.97,64.98,64.98,64.98,64.98,64.98, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.95,64.97,64.97,64.97,64.97,64.97, diff --git a/test/ref/testSandenCombi_File_Rheem2020Prem50.csv b/test/ref/testSandenCombi_File_Rheem2020Prem50.csv index 5ad3e9bf..c8c315e4 100644 --- a/test/ref/testSandenCombi_File_Rheem2020Prem50.csv +++ b/test/ref/testSandenCombi_File_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.98,64.98,64.98,64.98,64.98, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.96,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_File_RheemHB50.csv b/test/ref/testSandenCombi_File_RheemHB50.csv index d21ad26b..a4e95dbb 100644 --- a/test/ref/testSandenCombi_File_RheemHB50.csv +++ b/test/ref/testSandenCombi_File_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.97,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_File_Sanden80.csv b/test/ref/testSandenCombi_File_Sanden80.csv index 9fcbd126..eef4642d 100644 --- a/test/ref/testSandenCombi_File_Sanden80.csv +++ b/test/ref/testSandenCombi_File_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, diff --git a/test/ref/testSandenCombi_File_Stiebel220e.csv b/test/ref/testSandenCombi_File_Stiebel220e.csv index 54f6b631..eda84e79 100644 --- a/test/ref/testSandenCombi_File_Stiebel220e.csv +++ b/test/ref/testSandenCombi_File_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,64.97,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_Preset_AOSmithHPTS50.csv b/test/ref/testSandenCombi_Preset_AOSmithHPTS50.csv index 7a670b15..cf9542eb 100644 --- a/test/ref/testSandenCombi_Preset_AOSmithHPTS50.csv +++ b/test/ref/testSandenCombi_Preset_AOSmithHPTS50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.97,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_Preset_AOSmithHPTU80.csv b/test/ref/testSandenCombi_Preset_AOSmithHPTU80.csv index 79444dd3..08bed8a2 100644 --- a/test/ref/testSandenCombi_Preset_AOSmithHPTU80.csv +++ b/test/ref/testSandenCombi_Preset_AOSmithHPTU80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, diff --git a/test/ref/testSandenCombi_Preset_AOSmithPHPT60.csv b/test/ref/testSandenCombi_Preset_AOSmithPHPT60.csv index 6f7bd769..2deb19c1 100644 --- a/test/ref/testSandenCombi_Preset_AOSmithPHPT60.csv +++ b/test/ref/testSandenCombi_Preset_AOSmithPHPT60.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_Preset_GE502014.csv b/test/ref/testSandenCombi_Preset_GE502014.csv index 1e347237..9e4ec8d7 100644 --- a/test/ref/testSandenCombi_Preset_GE502014.csv +++ b/test/ref/testSandenCombi_Preset_GE502014.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.97,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_Preset_Rheem2020Build50.csv b/test/ref/testSandenCombi_Preset_Rheem2020Build50.csv index ece5c13b..647eaa1c 100644 --- a/test/ref/testSandenCombi_Preset_Rheem2020Build50.csv +++ b/test/ref/testSandenCombi_Preset_Rheem2020Build50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.98,64.98,64.98,64.98,64.98, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.96,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_Preset_Rheem2020Prem40.csv b/test/ref/testSandenCombi_Preset_Rheem2020Prem40.csv index 9f4b830f..3b05a78c 100644 --- a/test/ref/testSandenCombi_Preset_Rheem2020Prem40.csv +++ b/test/ref/testSandenCombi_Preset_Rheem2020Prem40.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.97,64.98,64.98,64.98,64.98,64.98, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.95,64.97,64.97,64.97,64.97,64.97, diff --git a/test/ref/testSandenCombi_Preset_Rheem2020Prem50.csv b/test/ref/testSandenCombi_Preset_Rheem2020Prem50.csv index 5ad3e9bf..c8c315e4 100644 --- a/test/ref/testSandenCombi_Preset_Rheem2020Prem50.csv +++ b/test/ref/testSandenCombi_Preset_Rheem2020Prem50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.98,64.98,64.98,64.98,64.98, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.96,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_Preset_RheemHB50.csv b/test/ref/testSandenCombi_Preset_RheemHB50.csv index d21ad26b..a4e95dbb 100644 --- a/test/ref/testSandenCombi_Preset_RheemHB50.csv +++ b/test/ref/testSandenCombi_Preset_RheemHB50.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,64.97,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSandenCombi_Preset_Sanden80.csv b/test/ref/testSandenCombi_Preset_Sanden80.csv index 9fcbd126..eef4642d 100644 --- a/test/ref/testSandenCombi_Preset_Sanden80.csv +++ b/test/ref/testSandenCombi_Preset_Sanden80.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, diff --git a/test/ref/testSandenCombi_Preset_Stiebel220e.csv b/test/ref/testSandenCombi_Preset_Stiebel220e.csv index 54f6b631..eda84e79 100644 --- a/test/ref/testSandenCombi_Preset_Stiebel220e.csv +++ b/test/ref/testSandenCombi_Preset_Stiebel220e.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 22.000000, 65.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,64.98,64.99,64.99,64.99,64.99,64.99, 2, 22.000000, 65.000000, 0.000000, 0.000000, 0,0.00,0.00,0.00,0.00,64.97,64.98,64.98,64.98,64.98,64.98, diff --git a/test/ref/testSoC70_Preset_NyleC25A_SP.csv b/test/ref/testSoC70_Preset_NyleC25A_SP.csv index 9c608abe..4da2eff5 100644 --- a/test/ref/testSoC70_Preset_NyleC25A_SP.csv +++ b/test/ref/testSoC70_Preset_NyleC25A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.947385, 0,0.00,0.00,50.00,65.00,65.00,65.00,65.00,65.00,65.00 1, 20.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.894996, 0,0.00,0.00,35.00,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.849117, 0,55.43,122.36,20.85,64.98,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/testSoC70_Preset_Sanden120.csv b/test/ref/testSoC70_Preset_Sanden120.csv index 141d6ea0..54285ce1 100644 --- a/test/ref/testSoC70_Preset_Sanden120.csv +++ b/test/ref/testSoC70_Preset_Sanden120.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.915067, 0,0.00,0.00,39.79,65.00,65.00,65.00,65.00,65.00,65.00 1, 20.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.831034, 0,16.23,72.09,16.02,64.38,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.747394, 0,16.23,72.09,15.00,41.03,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/testSoCHighEnteringWater_Preset_NyleC25A_SP.csv b/test/ref/testSoCHighEnteringWater_Preset_NyleC25A_SP.csv index 9dbaec46..2e90d02b 100644 --- a/test/ref/testSoCHighEnteringWater_Preset_NyleC25A_SP.csv +++ b/test/ref/testSoCHighEnteringWater_Preset_NyleC25A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 0.000000, 1.000000, 0.999936, 0,0.00,0.00,65.00,65.00,65.00,65.00,65.00,65.00, 1, 20.000000, 65.000000, 15.000000, 10.000000, 1.000000, 0.947454, 0,55.43,122.36,50.83,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 10.000000, 1.000000, 0.901773, 0,55.43,122.36,36.67,64.99,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/testSoCHighEnteringWater_Preset_Sanden120.csv b/test/ref/testSoCHighEnteringWater_Preset_Sanden120.csv index 86b7f3ec..92c4f22b 100644 --- a/test/ref/testSoCHighEnteringWater_Preset_Sanden120.csv +++ b/test/ref/testSoCHighEnteringWater_Preset_Sanden120.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 0.000000, 1.000000, 0.999923, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 20.000000, 65.000000, 15.000000, 10.000000, 1.000000, 0.915391, 0,16.23,72.09,40.62,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 10.000000, 1.000000, 0.831492, 0,16.23,72.09,16.71,64.52,64.99,64.99,64.99,64.99,64.99 diff --git a/test/ref/testSoCLockout_Preset_NyleC25A_SP.csv b/test/ref/testSoCLockout_Preset_NyleC25A_SP.csv index 6b2421b8..14e66e2e 100644 --- a/test/ref/testSoCLockout_Preset_NyleC25A_SP.csv +++ b/test/ref/testSoCLockout_Preset_NyleC25A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, -40.000000, 65.000000, 15.000000, 0.000000, 0.900000, 0.999850, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, -40.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.947171, 0,0.00,0.00,49.98,64.99,64.99,64.99,64.99,64.99,64.99 2, -40.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.894725, 0,0.00,0.00,34.98,64.98,64.98,64.98,64.98,64.98,64.99 diff --git a/test/ref/testSoCLockout_Preset_Sanden120.csv b/test/ref/testSoCLockout_Preset_Sanden120.csv index d36b2170..5daa3255 100644 --- a/test/ref/testSoCLockout_Preset_Sanden120.csv +++ b/test/ref/testSoCLockout_Preset_Sanden120.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, -40.000000, 65.000000, 15.000000, 0.000000, 0.900000, 0.999820, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99, 1, -40.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.914815, 0,0.00,0.00,39.77,64.98,64.98,64.98,64.98,64.98,64.99 2, -40.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.830043, 0,0.00,0.00,15.37,64.17,64.98,64.98,64.98,64.98,64.98 diff --git a/test/ref/testSoCSetpointChange_Preset_NyleC25A_SP.csv b/test/ref/testSoCSetpointChange_Preset_NyleC25A_SP.csv index c420a5fd..a3b76eee 100644 --- a/test/ref/testSoCSetpointChange_Preset_NyleC25A_SP.csv +++ b/test/ref/testSoCSetpointChange_Preset_NyleC25A_SP.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 50.000000, 15.000000, 0.000000, 0.900000, 0.999937, 0,0.00,0.00,50.00,50.00,50.00,50.00,50.00,50.00, 1, 20.000000, 50.000000, 15.000000, 10.000000, 0.900000, 0.947312, 0,0.00,0.00,39.50,50.00,50.00,50.00,50.00,50.00,50.00 2, 20.000000, 50.000000, 15.000000, 10.000000, 0.900000, 0.894920, 0,0.00,0.00,29.00,49.99,49.99,49.99,49.99,49.99,50.00 diff --git a/test/ref/testSoCSetpointChange_Preset_Sanden120.csv b/test/ref/testSoCSetpointChange_Preset_Sanden120.csv index 2aeb58df..28b43d61 100644 --- a/test/ref/testSoCSetpointChange_Preset_Sanden120.csv +++ b/test/ref/testSoCSetpointChange_Preset_Sanden120.csv @@ -1,4 +1,4 @@ -minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C) +minutes,Ta,Tsetpoint,inletT,draw,targetSoCFract,soCFract,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C) 0, 20.000000, 65.000000, 15.000000, 0.000000, 0.900000, 0.999923, 0,0.00,0.00,64.99,65.00,65.00,65.00,65.00,65.00, 1, 20.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.914996, 0,0.00,0.00,39.79,64.99,64.99,64.99,64.99,64.99,65.00 2, 20.000000, 65.000000, 15.000000, 10.000000, 0.900000, 0.830971, 0,16.23,72.09,16.02,64.38,64.99,64.99,64.99,64.99,64.99 From 4a3e3f95396aef9c069471717b9870881156a825 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 18 Dec 2023 10:57:26 -0700 Subject: [PATCH 22/23] Remove unused fnc. --- src/HPWH.hh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/HPWH.hh b/src/HPWH.hh index 48ae88af..6d7e0437 100644 --- a/src/HPWH.hh +++ b/src/HPWH.hh @@ -712,11 +712,6 @@ public: energy put into the water is positive - should always be positive returns HPWH_ABORT for N out of bounds or incorrect units */ - double getNthHeatSourceExtraEnergyInput(int N,UNITS units = UNITS_KWH) const; - /**< returns the "extra" energy input to the Nth heat source, with the specified units - energy used by the heat source is positive - should always be positive - returns HPWH_ABORT for N out of bounds or incorrect units */ - double getNthHeatSourceRunTime(int N) const; /**< returns the run time for the Nth heat source, in minutes note: they may sum to more than 1 time step for concurrently running heat sources From 31cec6c1578396f77d5ed44d207a51717add19ba Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 18 Dec 2023 15:18:48 -0700 Subject: [PATCH 23/23] Change coil config. --- src/HPWHpresets.cc | 2 +- test/AquaThermAire.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index c3d68c39..a39bb2f3 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3869,7 +3869,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { compressor.minT = F_TO_C(-25); compressor.maxT = F_TO_C(125.); compressor.hysteresis_dC = dF_TO_dC(1); - compressor.configuration = HeatSource::CONFIG_WRAPPED; + compressor.configuration = HeatSource::CONFIG_SUBMERGED; //logic conditions compressor.addTurnOnLogic(HPWH::wholeTank(111,UNITS_F,true)); diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt index 16a7eff4..04f47fa4 100644 --- a/test/AquaThermAire.txt +++ b/test/AquaThermAire.txt @@ -62,7 +62,7 @@ heatsource 0 copT4quad 0.0 heatsource 0 minT -25 F heatsource 0 maxT 125 F heatsource 0 hysteresis 1 F -heatsource 0 coilConfig wrapped +heatsource 0 coilConfig submerged #Turns on when average tank temperature is 111F or colder heatsource 0 onlogic wholeTank absolute < 111 F