diff --git a/src/HPWH.cc b/src/HPWH.cc index fa0ca123..ed79317a 100644 --- a/src/HPWH.cc +++ b/src/HPWH.cc @@ -315,6 +315,8 @@ void HPWH::setAllDefaults() { usesSoCLogic = false; setMinutesPerStep(1.0); hpwhVerbosity = VRB_minuteOut; + hasHeatExchanger = false; + heatExchangerEffectiveness = 0.9; } HPWH::HPWH(const HPWH &hpwh) { @@ -938,7 +940,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"); @@ -1738,6 +1740,12 @@ std::vector HPWH::getNodeWeightRange(double bottomFraction, do return nodeWeights; } +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 = convertTempToC(decisionPoint,units,absolute); + return std::make_shared("whole tank",nodeWeights,decisionPoint_C,this,absolute); +} + std::shared_ptr HPWH::topThird(double decisionPoint) { std::vector nodeWeights = getNodeWeightRange(2./3., 1.); return std::make_shared("top third",nodeWeights,decisionPoint,this); @@ -1745,7 +1753,13 @@ 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::secondThird(double decisionPoint,const UNITS units /* = UNITS_C */, const bool absolute /* = false */) { + std::vector nodeWeights = getNodeWeightRange(1./3., 2./3.); + double decisionPoint_C = convertTempToC(decisionPoint,units,absolute); + return std::make_shared("second third",nodeWeights,decisionPoint_C,this,absolute); } std::shared_ptr HPWH::bottomThird(double decisionPoint) { @@ -2581,38 +2595,56 @@ 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) - 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; - drawVolume_N = 0.; + 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 = C_draw_kJperC * (nodeTemp - outletTemp_C); + double heatExchange_kJ = nodeHeatExchangerEffectiveness * 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) { + //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.; + } + + while(drawVolume_N > 0) { - while(drawVolume_N > 0) { + // Draw one node at a time + double drawFraction = drawVolume_N > 1. ? 1. : drawVolume_N; + double nodeInletTV = 0.; - // Draw one node at a time - double drawFraction = drawVolume_N > 1. ? 1. : drawVolume_N; - double nodeInletTV = 0.; + //add temperature for outletT average + outletTemp_C += drawFraction * tankTemps_C[getNumNodes() - 1]; - //add temperature for outletT average - outletTemp_C += drawFraction * tankTemps_C[getNumNodes() - 1]; + double cumInletFraction = 0.; + for(int i = getNumNodes() - 1; i >= lowInletH; i--) { - double cumInletFraction = 0.; - for(int i = getNumNodes() - 1; i >= lowInletH; i--) { // Reset inlet inputs at this node. double nodeInletFraction = 0.; @@ -2620,38 +2652,36 @@ void HPWH::updateTankTemps(double drawVolume_L,double inletT_C,double tankAmbien // Sum of all inlets Vi*Ti at this node if(i == highInletH) { - nodeInletTV += highInletV * drawFraction / drawVolume_L * highInletT; - nodeInletFraction += highInletV * drawFraction / drawVolume_L; + 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; + 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. } - // 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]; - - cumInletFraction += nodeInletFraction; + // 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 if(tankMixesOnDraw && drawVolume_L > 0.) { @@ -3024,6 +3054,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() { @@ -3141,7 +3174,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; @@ -3194,7 +3226,8 @@ int HPWH::checkInputs() { //check is condensity sums to 1 condensitySum = 0; - for(int j = 0; j < heatSources[i].getCondensitySize(); ++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); @@ -3328,6 +3361,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; } @@ -3515,7 +3556,21 @@ int HPWH::HPWHinit_file(string configFile) { } initalTankT_C = tempDouble; hasInitialTankTemp = true; - + } else if(token == "hasHeatExchanger") { + // false of this model uses heat exchange + line_ss >> tempString; + 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 == "heatExchangerEffectiveness") { + // applies to heat-exchange models only + line_ss >> tempDouble; + heatExchangerEffectiveness = tempDouble; } else if(token == "verbosity") { line_ss >> token; if(token == "silent") { @@ -3668,16 +3723,43 @@ 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") { + heatSources[heatsource].addTurnOnLogic(HPWH::wholeTank(tempDouble,UNITS_C,absolute)); + } 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 a7f773e8..6d7e0437 100644 --- a/src/HPWH.hh +++ b/src/HPWH.hh @@ -216,7 +216,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 @@ -372,8 +374,10 @@ 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,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); @@ -708,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 @@ -939,7 +938,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 */ @@ -1026,6 +1025,15 @@ private: /// Generates a vector of logical nodes std::vector getNodeWeightRange(double bottomFraction,double topFraction); + /// False: water is drawn from the tank itself; True: tank provides heat exchange only + bool hasHeatExchanger; + + /// 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 { @@ -1350,6 +1358,11 @@ 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. +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); bool resample(std::vector &values,const std::vector &sampleValues); diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index bc93bc71..a39bb2f3 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -3812,8 +3812,73 @@ int HPWH::HPWHinit_presets(MODELS presetNum) { heatSources[1].followedByHeatSource = &heatSources[2]; heatSources[0].companionHeatSource = &heatSources[2]; - } + } + else if (presetNum == MODELS_AquaThermAire) { // AquaThermAire + setNumNodes(12); + setpoint_C = 50.; + + initialTankT_C = 49.32; + hasInitialTankTemp = true; + + tankVolume_L = GAL_TO_L(54.4); + tankUA_kJperHrC = 10.35; + + doTempDepression = false; + tankMixesOnDraw = false; + + // heat exchangers only + hasHeatExchanger = true; + heatExchangerEffectiveness = 0.93; + + 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_SUBMERGED; + + //logic conditions + compressor.addTurnOnLogic(HPWH::wholeTank(111,UNITS_F,true)); + 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..04f47fa4 --- /dev/null +++ b/test/AquaThermAire.txt @@ -0,0 +1,72 @@ +verbosity silent +numNodes 12 #number of nodes +setpoint 50 C +volume 54.4 gal +UA 10.35 kJperHrC +depressTemp false +mixOnDraw false +initialTankTemp 49.32 C +hasHeatExchanger true +heatExchangerEffectiveness 0.93 + +#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 submerged + +#Turns on when average tank temperature is 111F or colder +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 +heatsource 0 onlogic standby 14 F \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9062cd59..b87a097e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -187,6 +187,12 @@ set(yearLargeTestsModels TamScalable_SP Scalable_MP ) +set(heatExchangeModelNames + AquaThermAire +) +set(heatExchangeTests + villara_24hr67 +) set(yearLargeTests testCA_36Unit_CTZ12 ) @@ -202,6 +208,10 @@ set(stateOfChargeCompressorNames NyleC25A_SP ) + +list(APPEND extendedModelNames ${modelNames} ${heatExchangeModelNames}) +list(REMOVE_DUPLICATES extendedModelNames) + # Unit tests function( add_TankSizeFixed_test ) set(options) @@ -217,7 +227,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}) @@ -263,12 +273,22 @@ foreach(test ${testNames}) 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}) @@ -277,6 +297,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}) @@ -300,7 +321,6 @@ foreach(test ${yearLargeTests}) endforeach(model) endforeach(test) - # Tests for differences between File and Preset versions function( add_file_test ) set(options) @@ -326,6 +346,13 @@ foreach(test ${testNames}) 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) + # Tests for regression differences against reference results function( add_regression_test ) set(options) diff --git a/test/main.cc b/test/main.cc index 76c1bebe..2444f3eb 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/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 diff --git a/test/testUtilityFcts.cc b/test/testUtilityFcts.cc index e0aafff5..f1a85566 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..bd79ca27 --- /dev/null +++ b/test/villara_24hr67/DRschedule.csv @@ -0,0 +1,2 @@ +default 0, +minutes,OnOff \ No newline at end of file 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..a05c7e54 --- /dev/null +++ b/test/villara_24hr67/testInfo.txt @@ -0,0 +1,3 @@ +setpoint 50 +length_of_test 1441 +initialTankT_C 49.32 \ No newline at end of file